diff --git a/.eslintignore b/.eslintignore
index b1d80557..0aec16d9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,3 @@
 site
-.eslintrc.js
+.eslintrc.cjs
 build_utils
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8bee4e9f..45a22c69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@ node_modules/
 # Coverage
 coverage
 
-# Transpiled files
-build/
-
 # Optional npm cache directory
 .npm
 
diff --git a/build_utils/eslintrc.js b/build_utils/eslintrc.cjs
similarity index 98%
rename from build_utils/eslintrc.js
rename to build_utils/eslintrc.cjs
index dacc41fe..26d254e4 100644
--- a/build_utils/eslintrc.js
+++ b/build_utils/eslintrc.cjs
@@ -40,6 +40,7 @@ module.exports = {
       'single',
       { avoidEscape: true, allowTemplateLiterals: false },
     ],
+    'import/extensions': 'off',
     'dot-location': 'warn',
     'no-trailing-spaces': 'warn',
     'no-multi-spaces': 'warn',
@@ -101,9 +102,6 @@ module.exports = {
       }
     ],
     'jest/valid-describe': ['off'],
-    'import/extensions': ['error', 'never', {
-      'json': 'always',
-    }],
     'no-restricted-imports': ['error', { patterns: ['**/dist/**', 'src/*'] }],
     // copied from https://github.com/airbnb/javascript/blob/master/packages/eslint-config-airbnb-base/rules/style.js#L334
     // removed rule about generators/iterators since es2019 natively supports them
diff --git a/package.json b/package.json
index 60e7c9a4..dddbaa60 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,13 @@
   ],
   "devDependencies": {
     "husky": "^8.0.0",
+    "jest": "29.7.0",
     "lerna": "^6.6.2",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
     "syncpack": "^9.8.4",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "resolutions": {
     "**/@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-10"
diff --git a/packages/cli-common/.eslintignore b/packages/cli-common/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/cli-common/.eslintignore
+++ b/packages/cli-common/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/cli-common/.eslintrc.cjs b/packages/cli-common/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/cli-common/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/cli-common/.eslintrc.js b/packages/cli-common/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/cli-common/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/cli-common/jest.config.cjs b/packages/cli-common/jest.config.cjs
new file mode 100644
index 00000000..d69d187d
--- /dev/null
+++ b/packages/cli-common/jest.config.cjs
@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  testMatch: ['!dist/', '**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.+)\\.js$': '$1',
+  },
+}
diff --git a/packages/cli-common/jest.config.js b/packages/cli-common/jest.config.js
deleted file mode 100644
index 22c3f9f6..00000000
--- a/packages/cli-common/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testMatch: ['!dist/', '**/*.test.ts'],
-}
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index 529909eb..bcbfd29b 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -2,7 +2,11 @@
   "name": "@preevy/cli-common",
   "version": "0.0.58",
   "description": "Common library for the Preevy CLI and plugins",
+  "type": "module",
   "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "files": [
     "dist"
   ],
@@ -12,14 +16,14 @@
     "@preevy/core": "0.0.58",
     "chalk": "^4.1.2",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.27.5",
@@ -30,11 +34,11 @@
     "lint-staged": "^15.2.0",
     "shx": "^0.3.3",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.tsx --cache",
-    "test": "yarn jest",
+    "test": "yarn node --experimental-vm-modules ../../node_modules/.bin/jest",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
     "build": "tsc -b",
     "prepack": "yarn clean && yarn build",
diff --git a/packages/cli-common/src/commands/base-command.ts b/packages/cli-common/src/commands/base-command.ts
index 20b3244b..29e05f0d 100644
--- a/packages/cli-common/src/commands/base-command.ts
+++ b/packages/cli-common/src/commands/base-command.ts
@@ -3,9 +3,10 @@ import {
   LogLevel, Logger, logLevels, ComposeModel, ProcessError, telemetryEmitter,
 } from '@preevy/core'
 import { asyncReduce } from 'iter-tools-es'
-import { ParsingToken } from '@oclif/core/lib/interfaces/parser'
-import { commandLogger } from '../lib/log'
-import { composeFlags, pluginFlags } from '../lib/common-flags'
+import { ParsingToken } from '@oclif/core/lib/interfaces/parser.js'
+import { commandLogger } from '../lib/log.js'
+import { composeFlags, pluginFlags } from '../lib/common-flags/index.js'
+import { PreevyConfig } from '../../../core/src/config.js'
 
 // eslint-disable-next-line no-use-before-define
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof BaseCommand['baseFlags'] & T['flags']>
@@ -68,7 +69,7 @@ abstract class BaseCommand<T extends typeof Command=typeof Command> extends Comm
     )
   }
 
-  protected get preevyConfig() {
+  protected get preevyConfig(): PreevyConfig {
     return this.config.preevyConfig
   }
 
diff --git a/packages/cli-common/src/hooks/init/load-plugins.ts b/packages/cli-common/src/hooks/init/load-plugins.ts
index 9588793e..632585ae 100644
--- a/packages/cli-common/src/hooks/init/load-plugins.ts
+++ b/packages/cli-common/src/hooks/init/load-plugins.ts
@@ -1,10 +1,10 @@
 import { Hook as OclifHook, Command, Flags } from '@oclif/core'
-import { Parser } from '@oclif/core/lib/parser/parse'
+import { Parser } from '@oclif/core/lib/parser/parse.js'
 import { BooleanFlag, Config, Topic } from '@oclif/core/lib/interfaces'
 import { localComposeClient, ComposeModel, resolveComposeFiles, withSpinner, NoComposeFilesError } from '@preevy/core'
-import { cloneDeep } from 'lodash'
-import { composeFlags, pluginFlags } from '../../lib/common-flags'
-import { addPluginFlags, loadPlugins, hooksFromPlugins, addPluginCommands } from '../../lib/plugins'
+import { cloneDeep } from 'lodash-es'
+import { composeFlags, pluginFlags } from '../../lib/common-flags/index.js'
+import { addPluginFlags, loadPlugins, hooksFromPlugins, addPluginCommands } from '../../lib/plugins/index.js'
 
 type InternalConfig = Config & {
   loadCommands: (plugin: { commands: Command.Loadable[]; topics: Topic[] }) => void
diff --git a/packages/cli-common/src/index.ts b/packages/cli-common/src/index.ts
index 5eceef1d..4f483d91 100644
--- a/packages/cli-common/src/index.ts
+++ b/packages/cli-common/src/index.ts
@@ -1,10 +1,10 @@
-export * from './lib/plugins/model'
-export * as text from './lib/text'
-export { HookName, HookFunc, HooksListeners, Hooks } from './lib/hooks'
-export { PluginContext, PluginInitContext } from './lib/plugins/context'
+export * from './lib/plugins/model.js'
+export * as text from './lib/text.js'
+export { HookName, HookFunc, HooksListeners, Hooks } from './lib/hooks.js'
+export { PluginContext, PluginInitContext } from './lib/plugins/context.js'
 export {
   composeFlags, pluginFlags, envIdFlags, tunnelServerFlags, urlFlags, buildFlags, tableFlags, parseBuildFlags,
-} from './lib/common-flags'
-export { formatFlagsToArgs, parseFlags, ParsedFlags } from './lib/flags'
-export { initHook } from './hooks/init/load-plugins'
-export { default as BaseCommand } from './commands/base-command'
+} from './lib/common-flags/index.js'
+export { formatFlagsToArgs, parseFlags, ParsedFlags } from './lib/flags.js'
+export { initHook } from './hooks/init/load-plugins.js'
+export { default as BaseCommand } from './commands/base-command.js'
diff --git a/packages/cli-common/src/lib/common-flags/index.ts b/packages/cli-common/src/lib/common-flags/index.ts
index 57d1e9f4..028ca108 100644
--- a/packages/cli-common/src/lib/common-flags/index.ts
+++ b/packages/cli-common/src/lib/common-flags/index.ts
@@ -1,9 +1,9 @@
 import { Flags, ux } from '@oclif/core'
-import { mapValues } from 'lodash'
+import { mapValues } from 'lodash-es'
 import { EOL } from 'os'
-import { DEFAULT_PLUGINS } from '../plugins/default-plugins'
+import { DEFAULT_PLUGINS } from '../plugins/default-plugins.js'
 
-export * from './build-flags'
+export * from './build-flags.js'
 
 export const tableFlags = mapValues(ux.table.flags(), f => ({ ...f, helpGroup: 'OUTPUT' })) as ReturnType<typeof ux.table['flags']>
 
diff --git a/packages/cli-common/src/lib/flags.test.ts b/packages/cli-common/src/lib/flags.test.ts
index 28dafa97..5902fd8d 100644
--- a/packages/cli-common/src/lib/flags.test.ts
+++ b/packages/cli-common/src/lib/flags.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from '@jest/globals'
-import { formatFlagsToArgs } from './flags'
+import { formatFlagsToArgs } from './flags.js'
 
 describe('formatFlagsToArgs', () => {
   describe('when given accepted characters', () => {
diff --git a/packages/cli-common/src/lib/flags.ts b/packages/cli-common/src/lib/flags.ts
index 10c1f6a9..d07024c1 100644
--- a/packages/cli-common/src/lib/flags.ts
+++ b/packages/cli-common/src/lib/flags.ts
@@ -1,5 +1,5 @@
 import { Flag } from '@oclif/core/lib/interfaces'
-import { Parser } from '@oclif/core/lib/parser/parse'
+import { Parser } from '@oclif/core/lib/parser/parse.js'
 
 type FlagSpec<T> =Pick<Flag<T>, 'type' | 'default'>
 
diff --git a/packages/cli-common/src/lib/hooks.ts b/packages/cli-common/src/lib/hooks.ts
index 07f7ca31..5d038500 100644
--- a/packages/cli-common/src/lib/hooks.ts
+++ b/packages/cli-common/src/lib/hooks.ts
@@ -1,5 +1,5 @@
 import { ComposeModel, FlatTunnel } from '@preevy/core'
-import { PluginContext } from './plugins/context'
+import { PluginContext } from './plugins/context.js'
 
 export type Hooks = {
   filterUrls: {
diff --git a/packages/cli-common/src/lib/log.ts b/packages/cli-common/src/lib/log.ts
index d4965e00..318a856f 100644
--- a/packages/cli-common/src/lib/log.ts
+++ b/packages/cli-common/src/lib/log.ts
@@ -1,6 +1,6 @@
 import { Command } from '@oclif/core'
 import { Logger, LogLevel, logLevels, nullLogFunc } from '@preevy/core'
-import { mapValues } from 'lodash'
+import { mapValues } from 'lodash-es'
 
 export const commandLogger = (
   command: { logLevel: LogLevel },
diff --git a/packages/cli-common/src/lib/plugins/commands.ts b/packages/cli-common/src/lib/plugins/commands.ts
index 4bf48c0f..d4e4598a 100644
--- a/packages/cli-common/src/lib/plugins/commands.ts
+++ b/packages/cli-common/src/lib/plugins/commands.ts
@@ -1,5 +1,5 @@
 import { Command } from '@oclif/core'
-import { LoadedPlugin } from './load'
+import { LoadedPlugin } from './load.js'
 
 const pluginCommands = (loadedPlugins: LoadedPlugin[]) => loadedPlugins
   .flatMap(p => (p.initResults.commands ?? []).map(c => ({ command: c, pluginConfig: p.config })))
diff --git a/packages/cli-common/src/lib/plugins/flags.ts b/packages/cli-common/src/lib/plugins/flags.ts
index ac7db1e5..02990cbc 100644
--- a/packages/cli-common/src/lib/plugins/flags.ts
+++ b/packages/cli-common/src/lib/plugins/flags.ts
@@ -1,7 +1,7 @@
 import { Command } from '@oclif/core'
-import { groupBy } from 'lodash'
-import { CommandFlags } from './model'
-import { LoadedPlugin } from './load'
+import { groupBy } from 'lodash-es'
+import { CommandFlags } from './model.js'
+import { LoadedPlugin } from './load.js'
 
 const addFlags = (
   commands: Command.Loadable[],
diff --git a/packages/cli-common/src/lib/plugins/hooks.ts b/packages/cli-common/src/lib/plugins/hooks.ts
index 358b3b8e..181f5c64 100644
--- a/packages/cli-common/src/lib/plugins/hooks.ts
+++ b/packages/cli-common/src/lib/plugins/hooks.ts
@@ -1,5 +1,5 @@
-import { HookFunc, HookName, hookNames } from '../hooks'
-import { InitResults } from './model'
+import { HookFunc, HookName, hookNames } from '../hooks.js'
+import { InitResults } from './model.js'
 
 export const hooksFromPlugins = (
   initResults: InitResults[],
diff --git a/packages/cli-common/src/lib/plugins/index.ts b/packages/cli-common/src/lib/plugins/index.ts
index f61b2634..33dfbb28 100644
--- a/packages/cli-common/src/lib/plugins/index.ts
+++ b/packages/cli-common/src/lib/plugins/index.ts
@@ -1,5 +1,5 @@
-export { loadPlugins } from './load'
-export { addPluginFlags } from './flags'
-export { addPluginCommands } from './commands'
-export { hooksFromPlugins } from './hooks'
-export { DEFAULT_PLUGINS } from './default-plugins'
+export { loadPlugins } from './load.js'
+export { addPluginFlags } from './flags.js'
+export { addPluginCommands } from './commands.js'
+export { hooksFromPlugins } from './hooks.js'
+export { DEFAULT_PLUGINS } from './default-plugins.js'
diff --git a/packages/cli-common/src/lib/plugins/load.ts b/packages/cli-common/src/lib/plugins/load.ts
index 8ca14dae..9705d218 100644
--- a/packages/cli-common/src/lib/plugins/load.ts
+++ b/packages/cli-common/src/lib/plugins/load.ts
@@ -1,11 +1,11 @@
 import { Config } from '@oclif/core'
 import { InferredFlags } from '@oclif/core/lib/interfaces'
 import { config as coreConfig } from '@preevy/core'
-import { InitResults, PluginModule } from './model'
-import { PluginInitContext } from './context'
+import { InitResults, PluginModule } from './model.js'
+import { PluginInitContext } from './context.js'
 import PreevyPluginConfig = coreConfig.PreevyPluginConfig
-import { pluginFlags } from '../common-flags'
-import { DEFAULT_PLUGINS } from './default-plugins'
+import { pluginFlags } from '../common-flags/index.js'
+import { DEFAULT_PLUGINS } from './default-plugins.js'
 
 export type LoadedPlugin = {
   initResults: InitResults
diff --git a/packages/cli-common/src/lib/plugins/model.ts b/packages/cli-common/src/lib/plugins/model.ts
index 05167ede..89253e72 100644
--- a/packages/cli-common/src/lib/plugins/model.ts
+++ b/packages/cli-common/src/lib/plugins/model.ts
@@ -1,9 +1,9 @@
-import { FlagProps } from '@oclif/core/lib/interfaces/parser'
+import { FlagProps } from '@oclif/core/lib/interfaces/parser.js'
 import { Topic } from '@oclif/core/lib/interfaces'
 import { Command } from '@oclif/core'
 import { ComposeModel, config as coreConfig } from '@preevy/core'
-import { PluginInitContext } from './context'
-import { HookFuncs, HooksListeners } from '../hooks'
+import { PluginInitContext } from './context.js'
+import { HookFuncs, HooksListeners } from '../hooks.js'
 import PreevyConfig = coreConfig.PreevyConfig
 
 export type Flags = Record<string, FlagProps>
@@ -23,7 +23,7 @@ export type PluginModule = {
   preevyPlugin: Plugin
 }
 
-declare module '@oclif/core/lib/config/config' {
+declare module '@oclif/core/lib/config/config.js' {
   export interface Config {
     composeFiles: string[]
     initialUserModel: ComposeModel | Error
diff --git a/packages/cli-common/src/lib/plugins/topics.ts b/packages/cli-common/src/lib/plugins/topics.ts
index c099b247..63381f8e 100644
--- a/packages/cli-common/src/lib/plugins/topics.ts
+++ b/packages/cli-common/src/lib/plugins/topics.ts
@@ -1,5 +1,5 @@
 import { Topic } from '@oclif/core/lib/interfaces'
-import { LoadedPlugin } from './load'
+import { LoadedPlugin } from './load.js'
 
 export const addPluginCommands = (topics: Topic[], loadedPlugins: LoadedPlugin[]) => [
   ...topics,
diff --git a/packages/cli-common/tsconfig.json b/packages/cli-common/tsconfig.json
index 7b87897e..30af1313 100644
--- a/packages/cli-common/tsconfig.json
+++ b/packages/cli-common/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
+    "lib": ["es2022", "ESNext.Disposable"],
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -24,8 +24,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../core" },
   ]
diff --git a/packages/cli/.eslintrc.cjs b/packages/cli/.eslintrc.cjs
new file mode 100644
index 00000000..652c451c
--- /dev/null
+++ b/packages/cli/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
deleted file mode 100644
index 25256f88..00000000
--- a/packages/cli/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore
index 64a06d27..0e2ac517 100644
--- a/packages/cli/.gitignore
+++ b/packages/cli/.gitignore
@@ -11,7 +11,7 @@ node_modules/
 coverage
 
 # Transpiled files
-build/
+/build/
 
 # Optional npm cache directory
 .npm
diff --git a/packages/cli/README.md b/packages/cli/README.md
index c3880a6d..8d5473e1 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -11,6 +11,7 @@ Preevy is a CLI tool for easily creating preview environments for your Docker Co
 <!-- toc -->
 * [Usage](#usage)
 * [Commands](#commands)
+* [Command Topics](#command-topics)
 <!-- tocstop -->
 # Usage
 <!-- usage -->
@@ -28,1015 +29,19 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
-* [`preevy down`](#preevy-down)
-* [`preevy help [COMMANDS]`](#preevy-help-commands)
-* [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
-* [`preevy login`](#preevy-login)
-* [`preevy logs [SERVICES]`](#preevy-logs-services)
-* [`preevy ls`](#preevy-ls)
-* [`preevy profile config update`](#preevy-profile-config-update)
-* [`preevy profile config view`](#preevy-profile-config-view)
-* [`preevy profile cp`](#preevy-profile-cp)
-* [`preevy profile create NAME URL`](#preevy-profile-create-name-url)
-* [`preevy profile current`](#preevy-profile-current)
-* [`preevy profile import LOCATION`](#preevy-profile-import-location)
-* [`preevy profile key [TYPE]`](#preevy-profile-key-type)
-* [`preevy profile link`](#preevy-profile-link)
-* [`preevy profile ls`](#preevy-profile-ls)
-* [`preevy profile rm NAME`](#preevy-profile-rm-name)
-* [`preevy profile use NAME`](#preevy-profile-use-name)
-* [`preevy purge`](#preevy-purge)
-* [`preevy ssh ENVID`](#preevy-ssh-envid)
-* [`preevy up [SERVICE]`](#preevy-up-service)
-* [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
-* [`preevy version`](#preevy-version)
+# Command Topics
+
+* [`preevy down`](docs/down.md) - Delete preview environments
+* [`preevy help`](docs/help.md) - Display help for preevy.
+* [`preevy init`](docs/init.md) - Initialize or import a new profile
+* [`preevy login`](docs/login.md) - Login to the Livecycle SaaS
+* [`preevy logs`](docs/logs.md) - Show logs for an existing environment
+* [`preevy ls`](docs/ls.md) - List preview environments
+* [`preevy profile`](docs/profile.md) - View and update profile configuration
+* [`preevy purge`](docs/purge.md) - Delete all cloud provider machines, and potentially other resources
+* [`preevy ssh`](docs/ssh.md) - Execute a command or start an interactive shell inside an environment
+* [`preevy up`](docs/up.md) - Bring up a preview environment
+* [`preevy urls`](docs/urls.md) - Show urls for an existing environment
+* [`preevy version`](docs/version.md) - Show Preevy version
 
-## `preevy down`
-
-Delete preview environments
-
-```
-USAGE
-  $ preevy down [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region
-    <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>] [--id <value>] [--force] [--wait] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
-    auto|no|always]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --force            Do not error if the environment is not found
-      --id=<value>       Environment id
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-      --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
-                         but not waited for
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-GITHUB INTEGRATION FLAGS
-  --github-add-build-cache                   Add github cache to the build
-  --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
-                                             <options: auto|no|always>
-  --github-pr-comment-template-file=<value>  Path to nunjucks template file
-  --github-pull-request=<value>              GitHub Pull Request number. Will auto-detect if not specified
-  --github-repo=<value>                      GitHub repo name in the format owner/repo. Will auto-detect if not
-                                             specified
-  --github-token=<value>                     GitHub token with write access to the repo
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<value>  AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Delete preview environments
-
-FLAG DESCRIPTIONS
-  --id=<value>  Environment id
-
-    Affects created URLs
-    If not specified, will detect from the current Git context
-```
-
-_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/down.ts)_
-
-## `preevy help [COMMANDS]`
-
-Display help for preevy.
-
-```
-USAGE
-  $ preevy help [COMMANDS] [-n]
-
-ARGUMENTS
-  COMMANDS  Command to show help for.
-
-FLAGS
-  -n, --nested-commands  Include all nested commands in the output.
-
-DESCRIPTION
-  Display help for preevy.
-```
-
-_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/help.ts)_
-
-## `preevy init [PROFILE-ALIAS]`
-
-Initialize or import a new profile
-
-```
-USAGE
-  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
-
-ARGUMENTS
-  PROFILE-ALIAS  Name of the profile
-
-FLAGS
-  --from=<value>  Import profile from existing path
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Initialize or import a new profile
-```
-
-_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/init.ts)_
-
-## `preevy login`
-
-Login to the Livecycle SaaS
-
-```
-USAGE
-  $ preevy login [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>]
-    [--disable-plugin <value>] [--lc-auth-url <value>] [--lc-api-url <value>] [--lc-client-id <value>]
-
-FLAGS
-  --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
-  --lc-auth-url=<value>   [default: https://auth.livecycle.dev] The login URL
-  --lc-client-id=<value>  [default: BHXcVtapfKPEpZtYO3AJ2Livmz6j7xK0] The client ID for the OAuth app
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Login to the Livecycle SaaS
-```
-
-_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/login.ts)_
-
-## `preevy logs [SERVICES]`
-
-Show logs for an existing environment
-
-```
-USAGE
-  $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region
-    <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>] [--id <value>] [--follow] [--tail <value>] [--no-log-prefix] [--timestamps] [--since <value>] [--until
-    <value>]
-
-ARGUMENTS
-  SERVICES  Service name(s). If not specified, will show all services
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --follow           Follow log output
-      --id=<value>       Environment id
-      --no-log-prefix    Don't print log prefix in logs
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-      --since=<value>    Show logs since timestamp
-      --tail=<value>     Number of lines to show from the end of the logs for each container (default: all)
-      --timestamps       Show timestamps
-      --until=<value>    Show logs before timestamp
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<value>  AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Show logs for an existing environment
-
-FLAG DESCRIPTIONS
-  --id=<value>  Environment id
-
-    Affects created URLs
-    If not specified, will detect from the current Git context
-```
-
-_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/logs.ts)_
-
-## `preevy ls`
-
-List preview environments
-
-```
-USAGE
-  $ preevy ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region
-    <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml
-    |  | ] [--sort <value>]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<value>  AWS region in which resources will be provisioned
-
-DESCRIPTION
-  List preview environments
-```
-
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
-
-## `preevy profile config update`
-
-View and update profile configuration
-
-```
-USAGE
-  $ preevy profile config update [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [--lightsail-region <value>] [--gce-project-id <value>]
-    [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>]
-    [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template <value>]
-    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--unset
-    lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-pod-namespace|kube-pod-kubeconfig|k
-    ube-pod-context|kube-pod-template|lightsail-availability-zone|lightsail-bundle-id|gce-machine-type|azure-vm-size|kub
-    e-pod-server-side-apply]
-
-FLAGS
-  -d, --driver=<option>    Machine driver to use
-                           <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context (either an alias or a URL)
-      --unset=<option>...  [default: ] Unset a configuration option
-                           <options: lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-po
-                           d-namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zon
-                           e|lightsail-bundle-id|gce-machine-type|azure-vm-size|kube-pod-server-side-apply>
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          Machine type to be provisioned
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --gce-project-id=<value>    Google Cloud project ID
-  --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>         kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>       Kubernetes namespace in which resources will be provisioned (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<value>             AWS region in which resources will be provisioned
-
-DESCRIPTION
-  View and update profile configuration
-```
-
-_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/update.ts)_
-
-## `preevy profile config view`
-
-View profile configuration
-
-```
-USAGE
-  $ preevy profile config view [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
-
-FLAGS
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  View profile configuration
-```
-
-_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/view.ts)_
-
-## `preevy profile cp`
-
-Copy a profile
-
-```
-USAGE
-  $ preevy profile cp [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [--target-location <value> | --target-storage local|s3|gs]
-    [--target-name <value>] [--use]
-
-FLAGS
-  --profile=<value>          Source profile name, defaults to the current profile
-  --target-location=<value>  Target profile location URL
-  --target-name=<value>      Target profile name
-  --target-storage=<option>  Target profile storage type
-                             <options: local|s3|gs>
-  --use                      Mark the new profile as the current profile
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Copy a profile
-```
-
-_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/cp.ts)_
-
-## `preevy profile create NAME URL`
-
-Create a new profile
-
-```
-USAGE
-  $ preevy profile create NAME URL [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--lightsail-region <value>]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>] [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--use]
-
-ARGUMENTS
-  NAME  Name of the new profile
-  URL   URL of the new profile
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-      --use              Mark the new profile as the current profile
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --gce-project-id=<value>    Google Cloud project ID
-  --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>         kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
-                                     (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<value>             AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Create a new profile
-```
-
-_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/create.ts)_
-
-## `preevy profile current`
-
-Display current profile in use
-
-```
-USAGE
-  $ preevy profile current [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
-
-FLAGS
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Display current profile in use
-```
-
-_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/current.ts)_
-
-## `preevy profile import LOCATION`
-
-Import an existing profile
-
-```
-USAGE
-  $ preevy profile import LOCATION [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--name <value>] [--use]
-
-ARGUMENTS
-  LOCATION  URL of the profile
-
-FLAGS
-  --name=<value>  Name of the profile
-  --use           Mark the new profile as the current profile
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Import an existing profile
-```
-
-_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/import.ts)_
-
-## `preevy profile key [TYPE]`
-
-Show profile key
-
-```
-USAGE
-  $ preevy profile key [TYPE] [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
-
-ARGUMENTS
-  TYPE  (private|public-pem|public-ssh|thumbprint|thumbprint-uri) [default: thumbprint-uri] type of the key to show
-
-FLAGS
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Show profile key
-```
-
-_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/key.ts)_
-
-## `preevy profile link`
-
-Link the profile to the logged in user's organization
-
-```
-USAGE
-  $ preevy profile link [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>]
-    [--disable-plugin <value>] [--profile <value>] [--lc-api-url <value>] [--access-token <value>] [--org <value>]
-
-FLAGS
-  --access-token=<value>  Livecycle's Access Token
-  --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
-  --org=<value>           Target organization slug for linking the profile
-  --profile=<value>       Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Link the profile to the logged in user's organization
-```
-
-_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/link.ts)_
-
-## `preevy profile ls`
-
-Lists profiles
-
-```
-USAGE
-  $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
-    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
-
-FLAGS
-  --json
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Lists profiles
-```
-
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
-
-## `preevy profile rm NAME`
-
-Remove a profile
-
-```
-USAGE
-  $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
-
-ARGUMENTS
-  NAME  name of the profile to remove
-
-FLAGS
-  --force            Do not error if the profile is not found
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Remove a profile
-```
-
-_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/rm.ts)_
-
-## `preevy profile use NAME`
-
-Set current profile
-
-```
-USAGE
-  $ preevy profile use NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>]
-
-ARGUMENTS
-  NAME  name of the profile to use
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Set current profile
-```
-
-_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/use.ts)_
-
-## `preevy purge`
-
-Delete all cloud provider machines, and potentially other resources
-
-```
-USAGE
-  $ preevy purge [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region
-    <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>] [--all] [--type <value>] [--force] [--wait]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --all              Remove all resources types (snapshots, keypairs, and other resource types)
-      --force            Do not ask for confirmation
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-      --type=<value>...  [default: machine] Resource type(s) to delete
-      --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
-                         but not waited for
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<value>  AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Delete all cloud provider machines, and potentially other resources
-```
-
-_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/purge.ts)_
-
-## `preevy ssh ENVID`
-
-Execute a command or start an interactive shell inside an environment
-
-```
-USAGE
-  $ preevy ssh ENVID [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region
-    <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
-    <value>]
-
-ARGUMENTS
-  ENVID  Environment id
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<value>  AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Execute a command or start an interactive shell inside an environment
-
-ALIASES
-  $ preevy ssh
-```
-
-## `preevy up [SERVICE]`
-
-Bring up a preview environment
-
-```
-USAGE
-  $ preevy up [SERVICE] (--access-credentials-type api|browser --include-access-credentials) [-D] [-f
-    <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>] [--disable-plugin <value>]
-    [--profile <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>]
-    [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>]
-    [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template <value>]
-    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--kube-pod-server-side-apply] [--id <value>] [-t <value>] [--tls-hostname <value>]
-    [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
-    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
-    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
-    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
-    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
-    [--github-pr-comment-enabled auto|no|always]
-
-ARGUMENTS
-  SERVICE  Service name(s). If not specified, will deploy all services
-
-FLAGS
-  -d, --driver=<option>                   Machine driver to use
-                                          <options: lightsail|gce|azure|kube-pod>
-  -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
-                                          or ssh+tls://hostname[:port]
-      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                          <options: api|browser>
-      --id=<value>                        Environment id
-      --include-access-credentials        Include access credentials for basic auth for each service URL
-      --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
-      --show-preevy-service-urls          Show URLs for internal Preevy services
-      --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
-      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
-      --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
-
-BUILD FLAGS
-  --builder=<value>               Builder to use
-  --no-build                      Do not build images
-  --no-cache                      Do not use cache when building the images
-  --no-registry-cache             Do not add the registry as a cache source and target
-  --no-registry-single-name       Disable auto-detection for ECR-style registry single name
-  --registry=<value>              Image registry. If this flag is specified, the "build-context" flag defaults to
-                                  "*local"
-  --registry-single-name=<value>  Use single name for image registry, ECR-style. Default: auto-detect from "registry"
-                                  flag
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --gce-project-id=<value>    Google Cloud project ID
-  --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
-
-GITHUB INTEGRATION FLAGS
-  --github-add-build-cache                   Add github cache to the build
-  --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
-                                             <options: auto|no|always>
-  --github-pr-comment-template-file=<value>  Path to nunjucks template file
-  --github-pull-request=<value>              GitHub Pull Request number. Will auto-detect if not specified
-  --github-repo=<value>                      GitHub repo name in the format owner/repo. Will auto-detect if not
-                                             specified
-  --github-token=<value>                     GitHub token with write access to the repo
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-context=<value>         kubeconfig context name (will load config from defaults if not specified)
-  --kube-pod-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
-                                     (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<value>             AWS region in which resources will be provisioned
-
-DESCRIPTION
-  Bring up a preview environment
-
-FLAG DESCRIPTIONS
-  --id=<value>  Environment id
-
-    Affects created URLs
-    If not specified, will detect from the current Git context
-```
-
-_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/up.ts)_
-
-## `preevy urls [SERVICE] [PORT]`
-
-Show urls for an existing environment
-
-```
-USAGE
-  $ preevy urls [SERVICE] [PORT] (--access-credentials-type api|browser --include-access-credentials)
-    [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>] [--disable-plugin
-    <value>] [--profile <value>] [--id <value>] [-t <value>] [--tls-hostname <value>] [--insecure-skip-verify]
-    [--columns <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ]
-    [--sort <value>] [--show-preevy-service-] [--output-urls-to <value>]
-
-ARGUMENTS
-  SERVICE  Service name. If not specified, will show all services
-  PORT     Service port. If not specified, will show all ports for the specified service
-
-FLAGS
-  -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
-                                          or ssh+tls://hostname[:port]
-      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                          <options: api|browser>
-      --id=<value>                        Environment id
-      --include-access-credentials        Include access credentials for basic auth for each service URL
-      --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
-      --show-preevy-service-urls          Show URLs for internal Preevy services
-      --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Show urls for an existing environment
-
-FLAG DESCRIPTIONS
-  --id=<value>  Environment id
-
-    Affects created URLs
-    If not specified, will detect from the current Git context
-```
-
-_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/urls.ts)_
-
-## `preevy version`
-
-Show Preevy version
-
-```
-USAGE
-  $ preevy version [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>]
-
-GLOBAL FLAGS
-  -D, --debug                           Enable debug logging
-  -f, --file=<value>...                 [default: ] Compose configuration file
-  -p, --project=<value>                 Project name. Defaults to the Compose project name
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Show Preevy version
-```
-
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/version.ts)_
 <!-- commandsstop -->
diff --git a/packages/cli/bin/dev b/packages/cli/bin/dev
deleted file mode 100755
index 21908218..00000000
--- a/packages/cli/bin/dev
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-require('disposablestack/auto')
-const oclif = require('@oclif/core')
-
-const path = require('path')
-const project = path.join(__dirname, '..', 'tsconfig.json')
-
-// In dev mode -> use ts-node and dev plugins
-process.env.NODE_ENV = 'development'
-
-if (process.env.PREEVY_DISABLE_TELEMETRY === undefined) {
-  process.env.PREEVY_DISABLE_TELEMETRY = '1'
-}
-
-// Transpile sibling packages from source.
-// This is an alternative to using the "files" option, which causes loading of transpiled files from "dist". See:
-// https://github.com/oclif/oclif/issues/335#issuecomment-1374828342
-// https://github.com/TypeStrong/ts-node#paths-and-baseurl
-require('tsconfig-paths').register({ cwd: project })
-require('ts-node').register({ project })
-
-// In dev mode, always show stack traces
-oclif.settings.debug = true;
-
-// Start the CLI
-oclif.run().then(oclif.flush).catch(oclif.Errors.handle)
diff --git a/packages/cli/bin/dev.cmd b/packages/cli/bin/dev.cmd
index 077b57ae..8d003826 100644
--- a/packages/cli/bin/dev.cmd
+++ b/packages/cli/bin/dev.cmd
@@ -1,3 +1,3 @@
 @echo off
 
-node "%~dp0\dev" %*
\ No newline at end of file
+node "%~dp0\dev.js" %*
\ No newline at end of file
diff --git a/packages/cli/bin/dev.js b/packages/cli/bin/dev.js
new file mode 100755
index 00000000..5d7d9285
--- /dev/null
+++ b/packages/cli/bin/dev.js
@@ -0,0 +1,10 @@
+#!/usr/bin/env -S NODE_OPTIONS=--no-warnings=ExperimentalWarning\_--experimental-specifier-resolution=node ts-node --esm --swc
+// eslint-disable-next-line node/shebang
+async function main() {
+  await import('disposablestack/auto')
+  process.env.NODE_ENV = 'development'
+  const {execute} = await import('@oclif/core')
+  await execute({development: true, dir: import.meta.url})
+}
+
+await main()
diff --git a/packages/cli/bin/run b/packages/cli/bin/run
deleted file mode 100755
index 44a97010..00000000
--- a/packages/cli/bin/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-require('source-map-support').install()
-require('disposablestack/auto')
-
-const oclif = require('@oclif/core')
-
-oclif.settings.debug = !!process.env['DEBUG']
-oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'))
diff --git a/packages/cli/bin/run.cmd b/packages/cli/bin/run.cmd
index 968fc307..fdc38821 100644
--- a/packages/cli/bin/run.cmd
+++ b/packages/cli/bin/run.cmd
@@ -1,3 +1,3 @@
 @echo off
 
-node "%~dp0\run" %*
+node "%~dp0\run.js" %*
diff --git a/packages/cli/bin/run.js b/packages/cli/bin/run.js
new file mode 100755
index 00000000..9865c157
--- /dev/null
+++ b/packages/cli/bin/run.js
@@ -0,0 +1,8 @@
+#!/usr/bin/env -S node --no-warnings=ExperimentalWarning
+async function main() {
+  await import('disposablestack/auto')
+  const {execute} = await import('@oclif/core')
+  await execute({dir: import.meta.url})
+}
+
+await main()
diff --git a/packages/cli/docs/down.md b/packages/cli/docs/down.md
index ae053ecd..26ac9aec 100644
--- a/packages/cli/docs/down.md
+++ b/packages/cli/docs/down.md
@@ -16,14 +16,15 @@ USAGE
     <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
     [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
     <value>] [--id <value>] [--force] [--wait] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
+    auto|no|always]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
       --force            Do not error if the environment is not found
-      --id=<value>       Environment id - affects created URLs. If not specified, will try to detect automatically
-      --profile=<value>  Run in a specific profile context
+      --id=<value>       Environment id
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
@@ -45,6 +46,7 @@ GCE DRIVER FLAGS
   --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -65,6 +67,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Delete preview environments
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/down.ts)_
+_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/down.ts)_
diff --git a/packages/cli/docs/help.md b/packages/cli/docs/help.md
index 3c1a6049..ba8df910 100644
--- a/packages/cli/docs/help.md
+++ b/packages/cli/docs/help.md
@@ -23,4 +23,4 @@ DESCRIPTION
   Display help for preevy.
 ```
 
-_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/help.ts)_
diff --git a/packages/cli/docs/init.md b/packages/cli/docs/init.md
index 2c87fa87..abd197c7 100644
--- a/packages/cli/docs/init.md
+++ b/packages/cli/docs/init.md
@@ -12,13 +12,13 @@ Initialize or import a new profile
 ```
 USAGE
   $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [-f <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
 
 ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
+  PROFILE-ALIAS  Name of the profile
 
 FLAGS
-  -f, --from=<value>  Import profile from existing path
+  --from=<value>  Import profile from existing path
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -32,4 +32,4 @@ DESCRIPTION
   Initialize or import a new profile
 ```
 
-_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/init.ts)_
diff --git a/packages/cli/docs/login.md b/packages/cli/docs/login.md
index e6cfcdb6..5134f064 100644
--- a/packages/cli/docs/login.md
+++ b/packages/cli/docs/login.md
@@ -31,4 +31,4 @@ DESCRIPTION
   Login to the Livecycle SaaS
 ```
 
-_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/login.ts)_
diff --git a/packages/cli/docs/logs.md b/packages/cli/docs/logs.md
index 22158616..230148b2 100644
--- a/packages/cli/docs/logs.md
+++ b/packages/cli/docs/logs.md
@@ -25,9 +25,9 @@ FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
       --follow           Follow log output
-      --id=<value>       Environment id - affects created URLs. If not specified, will try to detect automatically
+      --id=<value>       Environment id
       --no-log-prefix    Don't print log prefix in logs
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --since=<value>    Show logs since timestamp
       --tail=<value>     Number of lines to show from the end of the logs for each container (default: all)
       --timestamps       Show timestamps
@@ -61,6 +61,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Show logs for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/logs.ts)_
diff --git a/packages/cli/docs/ls.md b/packages/cli/docs/ls.md
index 6b6d8960..1c902327 100644
--- a/packages/cli/docs/ls.md
+++ b/packages/cli/docs/ls.md
@@ -21,16 +21,7 @@ USAGE
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --profile=<value>  Run in a specific profile context
-      --sort=<value>     property to sort by (prepend '-' for descending)
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -41,6 +32,17 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
@@ -63,4 +65,4 @@ DESCRIPTION
   List preview environments
 ```
 
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
+_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
diff --git a/packages/cli/docs/profile.md b/packages/cli/docs/profile.md
index 5939fe77..4f1c03ef 100644
--- a/packages/cli/docs/profile.md
+++ b/packages/cli/docs/profile.md
@@ -35,7 +35,7 @@ USAGE
 FLAGS
   -d, --driver=<option>    Machine driver to use
                            <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context
+      --profile=<value>    Run in a specific profile context (either an alias or a URL)
       --unset=<option>...  [default: ] Unset a configuration option
                            <options: lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-po
                            d-namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zon
@@ -78,7 +78,7 @@ DESCRIPTION
   View and update profile configuration
 ```
 
-_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/update.ts)_
+_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/update.ts)_
 
 ## `preevy profile config view`
 
@@ -90,7 +90,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -105,7 +105,7 @@ DESCRIPTION
   View profile configuration
 ```
 
-_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/view.ts)_
+_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/view.ts)_
 
 ## `preevy profile cp`
 
@@ -138,7 +138,7 @@ DESCRIPTION
   Copy a profile
 ```
 
-_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/cp.ts)_
+_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/cp.ts)_
 
 ## `preevy profile create NAME URL`
 
@@ -161,7 +161,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --use              Mark the new profile as the current profile
 
 GLOBAL FLAGS
@@ -202,7 +202,7 @@ DESCRIPTION
   Create a new profile
 ```
 
-_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/create.ts)_
+_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/create.ts)_
 
 ## `preevy profile current`
 
@@ -214,7 +214,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -229,7 +229,7 @@ DESCRIPTION
   Display current profile in use
 ```
 
-_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/current.ts)_
+_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/current.ts)_
 
 ## `preevy profile import LOCATION`
 
@@ -259,7 +259,7 @@ DESCRIPTION
   Import an existing profile
 ```
 
-_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/import.ts)_
+_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/import.ts)_
 
 ## `preevy profile key [TYPE]`
 
@@ -274,7 +274,7 @@ ARGUMENTS
   TYPE  (private|public-pem|public-ssh|thumbprint|thumbprint-uri) [default: thumbprint-uri] type of the key to show
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -289,7 +289,7 @@ DESCRIPTION
   Show profile key
 ```
 
-_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/key.ts)_
+_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/key.ts)_
 
 ## `preevy profile link`
 
@@ -304,7 +304,7 @@ FLAGS
   --access-token=<value>  Livecycle's Access Token
   --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
   --org=<value>           Target organization slug for linking the profile
-  --profile=<value>       Run in a specific profile context
+  --profile=<value>       Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -318,7 +318,7 @@ DESCRIPTION
   Link the profile to the logged in user's organization
 ```
 
-_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/link.ts)_
+_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/link.ts)_
 
 ## `preevy profile ls`
 
@@ -327,10 +327,12 @@ Lists profiles
 ```
 USAGE
   $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
+    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --json
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -338,14 +340,24 @@ GLOBAL FLAGS
   -p, --project=<value>                 Project name. Defaults to the Compose project name
       --disable-plugin=<value>...       Disable plugin with specified package name
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Lists profiles
 ```
 
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
+_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
 
 ## `preevy profile rm NAME`
 
@@ -354,13 +366,14 @@ Remove a profile
 ```
 USAGE
   $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
 
 ARGUMENTS
   NAME  name of the profile to remove
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --force            Do not error if the profile is not found
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -375,7 +388,7 @@ DESCRIPTION
   Remove a profile
 ```
 
-_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/rm.ts)_
+_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/rm.ts)_
 
 ## `preevy profile use NAME`
 
@@ -401,4 +414,4 @@ DESCRIPTION
   Set current profile
 ```
 
-_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/use.ts)_
+_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/use.ts)_
diff --git a/packages/cli/docs/purge.md b/packages/cli/docs/purge.md
index ccb7aa1b..84ee4e01 100644
--- a/packages/cli/docs/purge.md
+++ b/packages/cli/docs/purge.md
@@ -22,7 +22,7 @@ FLAGS
                          <options: lightsail|gce|azure|kube-pod>
       --all              Remove all resources types (snapshots, keypairs, and other resource types)
       --force            Do not ask for confirmation
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --type=<value>...  [default: machine] Resource type(s) to delete
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
@@ -58,4 +58,4 @@ DESCRIPTION
   Delete all cloud provider machines, and potentially other resources
 ```
 
-_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/purge.ts)_
+_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/purge.ts)_
diff --git a/packages/cli/docs/ssh.md b/packages/cli/docs/ssh.md
index 23a52e6a..a4755b86 100644
--- a/packages/cli/docs/ssh.md
+++ b/packages/cli/docs/ssh.md
@@ -23,7 +23,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
diff --git a/packages/cli/docs/up.md b/packages/cli/docs/up.md
index 9d1d5b6b..96028295 100644
--- a/packages/cli/docs/up.md
+++ b/packages/cli/docs/up.md
@@ -19,10 +19,12 @@ USAGE
     [--lightsail-availability-zone <value>] [--lightsail-bundle-id
     nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
     [--azure-vm-size <value>] [--kube-pod-server-side-apply] [--id <value>] [-t <value>] [--tls-hostname <value>]
-    [--insecure-skip-verify] [--skip-unchanged-files] [--show-preevy-service-urls] [--output-urls-to <value>] [--columns
-    <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort
-    <value>] [--github-token <value>] [--github-repo <value>] [--github-pull-request <value>]
-    [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
+    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
+    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
+    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
+    [--github-pr-comment-enabled auto|no|always]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
@@ -32,25 +34,16 @@ FLAGS
                                           <options: lightsail|gce|azure|kube-pod>
   -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
                                           or ssh+tls://hostname[:port]
-  -x, --extended                          show extra columns
-      --access-credentials-type=<option>  (required) [default: browser]
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
                                           <options: api|browser>
-      --columns=<value>                   only show provided columns (comma-separated)
-      --csv                               output is csv format [alias: --output=csv]
-      --filter=<value>                    filter property by partial string matching, ex: name=foo
-      --id=<value>                        Environment id - affects created URLs. If not specified, will try to detect
-                                          automatically
+      --id=<value>                        Environment id
       --include-access-credentials        Include access credentials for basic auth for each service URL
       --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --no-header                         hide table header from output
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --show-preevy-service-urls          Show URLs for internal Preevy services
       --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
-      --sort=<value>                      property to sort by (prepend '-' for descending)
+      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -61,17 +54,40 @@ GLOBAL FLAGS
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
   --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
 
+BUILD FLAGS
+  --builder=<value>               Builder to use
+  --no-build                      Do not build images
+  --no-cache                      Do not use cache when building the images
+  --no-registry-cache             Do not add the registry as a cache source and target
+  --no-registry-single-name       Disable auto-detection for ECR-style registry single name
+  --registry=<value>              Image registry. If this flag is specified, the "build-context" flag defaults to
+                                  "*local"
+  --registry-single-name=<value>  Use single name for image registry, ECR-style. Default: auto-detect from "registry"
+                                  flag
+
 GCE DRIVER FLAGS
   --gce-machine-type=<value>  Machine type to be provisioned
   --gce-project-id=<value>    Google Cloud project ID
   --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -97,6 +113,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Bring up a preview environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/up.ts)_
+_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/up.ts)_
diff --git a/packages/cli/docs/urls.md b/packages/cli/docs/urls.md
index 398c3a98..c720bab0 100644
--- a/packages/cli/docs/urls.md
+++ b/packages/cli/docs/urls.md
@@ -24,24 +24,14 @@ ARGUMENTS
 FLAGS
   -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
                                           or ssh+tls://hostname[:port]
-  -x, --extended                          show extra columns
-      --access-credentials-type=<option>  (required) [default: browser]
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
                                           <options: api|browser>
-      --columns=<value>                   only show provided columns (comma-separated)
-      --csv                               output is csv format [alias: --output=csv]
-      --filter=<value>                    filter property by partial string matching, ex: name=foo
-      --id=<value>                        Environment id - affects created URLs. If not specified, will try to detect
-                                          automatically
+      --id=<value>                        Environment id
       --include-access-credentials        Include access credentials for basic auth for each service URL
       --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --no-header                         hide table header from output
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --show-preevy-service-urls          Show URLs for internal Preevy services
-      --sort=<value>                      property to sort by (prepend '-' for descending)
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -53,8 +43,25 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Show urls for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/urls.ts)_
+_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/urls.ts)_
diff --git a/packages/cli/docs/version.md b/packages/cli/docs/version.md
index f237b71e..28b8abac 100644
--- a/packages/cli/docs/version.md
+++ b/packages/cli/docs/version.md
@@ -27,4 +27,4 @@ DESCRIPTION
   Show Preevy version
 ```
 
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_
+_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/version.ts)_
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4422be67..cffd9172 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -3,12 +3,16 @@
   "version": "0.0.58",
   "description": "Quickly deploy preview environments to the cloud!",
   "author": "Livecycle",
+  "type": "module",
   "bin": {
-    "preevy": "./bin/run"
+    "preevy": "./bin/run.js"
   },
   "homepage": "https://github.com/livecycle/preevy",
   "license": "Apache-2.0",
   "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "repository": "livecycle/preevy",
   "files": [
     "/bin",
@@ -31,22 +35,24 @@
     "@preevy/driver-lightsail": "0.0.58",
     "@preevy/plugin-github": "0.0.58",
     "disposablestack": "^1.1.2",
-    "inquirer": "^8.0.0",
-    "inquirer-autocomplete-prompt": "^2.0.0",
+    "@inquirer/prompts": "^3.3.0",
+    "inquirer-autocomplete-standalone": "^0.8.1",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "shell-escape": "^0.2.0",
     "yaml": "^2.3.2"
   },
   "devDependencies": {
+    "@swc/core": "^1.3.100",
+    "@swc/helpers": "^0.5.3",
     "@types/cli-progress": "^3.11.5",
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/shell-escape": "^0.2.1",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-oclif": "^4",
@@ -63,24 +69,24 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "oclif": {
     "bin": "preevy",
     "dirname": "preevy",
     "commands": "./dist/commands",
-    "helpClass": "./dist/help",
+    "helpClass": "./dist/help.js",
     "hooks": {
       "init": [
-        "./dist/hooks/init/sync-logging",
-        "./dist/hooks/init/telemetry",
-        "./dist/hooks/init/load-plugins"
+        "./dist/hooks/init/sync-logging.js",
+        "./dist/hooks/init/telemetry.js",
+        "./dist/hooks/init/load-plugins.js"
       ],
       "prerun": [
-        "./dist/hooks/prerun/telemetry"
+        "./dist/hooks/prerun/telemetry.js"
       ],
       "postrun": [
-        "./dist/hooks/postrun/telemetry"
+        "./dist/hooks/postrun/telemetry.js"
       ]
     },
     "topicSeparator": " "
@@ -104,7 +110,7 @@
     "lint": "eslint . --ext .ts --cache",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "yarn lint",
-    "prepack": "yarn build && ./scripts/validate-tsconfig && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
+    "prepack": "yarn build && ./scripts/validate-tsconfig.cjs && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
     "cli": "./bin/dev",
     "version": "oclif readme && git add README.md"
   },
diff --git a/packages/cli/scripts/validate-tsconfig b/packages/cli/scripts/validate-tsconfig.cjs
similarity index 100%
rename from packages/cli/scripts/validate-tsconfig
rename to packages/cli/scripts/validate-tsconfig.cjs
diff --git a/packages/cli/src/commands/down.ts b/packages/cli/src/commands/down.ts
index 2555afb3..1cc32caa 100644
--- a/packages/cli/src/commands/down.ts
+++ b/packages/cli/src/commands/down.ts
@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core'
 import { findEnvId, machineResourceType, withSpinner } from '@preevy/core'
-import DriverCommand from '../driver-command'
-import { envIdFlags } from '../common-flags'
+import DriverCommand from '../driver-command.js'
+import { envIdFlags } from '../common-flags.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Down extends DriverCommand<typeof Down> {
diff --git a/packages/cli/src/commands/help.ts b/packages/cli/src/commands/help.ts
index 682f57e6..c01bcd6e 100644
--- a/packages/cli/src/commands/help.ts
+++ b/packages/cli/src/commands/help.ts
@@ -1,7 +1,7 @@
 // Taken from: https://github.com/oclif/plugin-help/blob/main/src/commands/help.ts (MIT License)
 // The only change is that we're using our own Help class, which displays global files on topics.
 import { Args, Command, Flags } from '@oclif/core'
-import Help from '../help'
+import Help from '../help.js'
 
 export default class HelpCommand extends Command {
   static args = {
diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
index a1b7e0ba..934ff50e 100644
--- a/packages/cli/src/commands/init.ts
+++ b/packages/cli/src/commands/init.ts
@@ -1,37 +1,29 @@
 import { Flags, Args, ux } from '@oclif/core'
-import inquirer from 'inquirer'
+import * as inquirer from '@inquirer/prompts'
 import confirm from '@inquirer/confirm'
 import { BaseCommand, text } from '@preevy/cli-common'
 import { Flag } from '@oclif/core/lib/interfaces'
 import { nextAvailableAlias } from '@preevy/core'
-import { DriverName, formatDriverFlagsToArgs, machineDrivers } from '../drivers'
-import { loadProfileConfig } from '../profile-command'
-import { chooseFs, chooseFsType } from '../fs'
-
-const chooseDriver = async () => (await inquirer.prompt<{ driver: DriverName }>([
-  {
-    type: 'list',
-    name: 'driver',
-    message: 'Which cloud provider do you want to use?',
-    choices: [
-      { value: 'lightsail', name: 'AWS Lightsail' },
-      { value: 'gce', name: 'Google Compute Engine' },
-      { value: 'azure', name: 'Microsoft Azure Virtual Machines' },
-      { value: 'kube-pod', name: 'Kubernetes' },
-    ],
-  },
-])).driver
-
-const chooseAlias = async (aliases: string[]) => (await inquirer.prompt<{ alias: string }>([
-  {
-    type: 'input',
-    name: 'alias',
-    message: 'Name of the profile',
-    default: async () => nextAvailableAlias(aliases),
-    filter: input => input.trim(),
-    validate: async input => (aliases.includes(input) ? 'This name already exists' : true),
-  },
-])).alias
+import { DriverName, formatDriverFlagsToArgs, machineDrivers } from '../drivers.js'
+import { loadProfileConfig } from '../profile-command.js'
+import { chooseFs, chooseFsType } from '../fs.js'
+
+const chooseDriver = async () => await inquirer.select<DriverName>({
+  message: 'Which cloud provider do you want to use?',
+  choices: [
+    { value: 'lightsail', name: 'AWS Lightsail' },
+    { value: 'gce', name: 'Google Compute Engine' },
+    { value: 'azure', name: 'Microsoft Azure Virtual Machines' },
+    { value: 'kube-pod', name: 'Kubernetes' },
+  ],
+})
+
+const chooseAlias = async (aliases: string[]) => (await inquirer.input({
+  message: 'Name of the profile',
+  default: nextAvailableAlias(aliases),
+  transformer: s => s.trim(),
+  validate: async input => (aliases.includes(input) ? 'This name already exists' : true),
+})).trim()
 
 export default class Init extends BaseCommand {
   static description = 'Initialize or import a new profile'
@@ -63,8 +55,7 @@ export default class Init extends BaseCommand {
 
     const driver = await chooseDriver()
     const driverStatic = machineDrivers[driver]
-    const driverAnswers = await inquirer.prompt<Record<string, unknown>>(await driverStatic.questions())
-    const driverFlags = await driverStatic.flagsFromAnswers(driverAnswers) as Record<string, unknown>
+    const driverFlags = await driverStatic.inquireFlags()
 
     ux.info(text.recommendation('To use Preevy in a CI flow, select a remote storage for your profile.'))
     const locationType = await chooseFsType(({ driver }))
diff --git a/packages/cli/src/commands/login.ts b/packages/cli/src/commands/login.ts
index ab10f749..3d0d28b5 100644
--- a/packages/cli/src/commands/login.ts
+++ b/packages/cli/src/commands/login.ts
@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core'
 import { BaseCommand } from '@preevy/cli-common'
 import { login } from '@preevy/core'
-import { LC_API_URL, LC_AUTH_URL, LC_CLIENT_ID } from '../defaults'
+import { LC_API_URL, LC_AUTH_URL, LC_CLIENT_ID } from '../defaults.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Login extends BaseCommand<typeof Login> {
diff --git a/packages/cli/src/commands/logs.ts b/packages/cli/src/commands/logs.ts
index 95f3879b..2f96314d 100644
--- a/packages/cli/src/commands/logs.ts
+++ b/packages/cli/src/commands/logs.ts
@@ -5,8 +5,8 @@ import {
   localComposeClient, findEnvId, MachineConnection, ComposeModel, remoteUserModel, dockerEnvContext,
 } from '@preevy/core'
 import { COMPOSE_TUNNEL_AGENT_SERVICE_NAME } from '@preevy/common'
-import DriverCommand from '../driver-command'
-import { envIdFlags } from '../common-flags'
+import DriverCommand from '../driver-command.js'
+import { envIdFlags } from '../common-flags.js'
 
 const validateServices = (
   specifiedServices: string[],
diff --git a/packages/cli/src/commands/ls.ts b/packages/cli/src/commands/ls.ts
index d443eabd..2bd47d67 100644
--- a/packages/cli/src/commands/ls.ts
+++ b/packages/cli/src/commands/ls.ts
@@ -2,7 +2,7 @@ import { ux } from '@oclif/core'
 import { asyncMap, asyncToArray } from 'iter-tools-es'
 import { commands } from '@preevy/core'
 import { tableFlags } from '@preevy/cli-common'
-import DriverCommand from '../driver-command'
+import DriverCommand from '../driver-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Ls extends DriverCommand<typeof Ls> {
diff --git a/packages/cli/src/commands/profile/config/update.ts b/packages/cli/src/commands/profile/config/update.ts
index 29b09a81..1ba78e85 100644
--- a/packages/cli/src/commands/profile/config/update.ts
+++ b/packages/cli/src/commands/profile/config/update.ts
@@ -1,6 +1,6 @@
 import { profileStore } from '@preevy/core'
 import { Flags, ux } from '@oclif/core'
-import { mapValues, omit, pickBy } from 'lodash'
+import { mapValues, omit, pickBy } from 'lodash-es'
 import { text } from '@preevy/cli-common'
 import {
   removeDriverFlagPrefix,
@@ -10,9 +10,9 @@ import {
   DriverName,
   driverFlags,
   machineCreationDriverFlags,
-} from '../../../drivers'
-import ProfileCommand from '../../../profile-command'
-import DriverCommand from '../../../driver-command'
+} from '../../../drivers.js'
+import ProfileCommand from '../../../profile-command.js'
+import DriverCommand from '../../../driver-command.js'
 
 const removeDefaultValues = <T extends Record<string, { default?: unknown }>>(
   flags: T
diff --git a/packages/cli/src/commands/profile/config/view.ts b/packages/cli/src/commands/profile/config/view.ts
index 34042403..0085815a 100644
--- a/packages/cli/src/commands/profile/config/view.ts
+++ b/packages/cli/src/commands/profile/config/view.ts
@@ -2,8 +2,8 @@ import { profileStore } from '@preevy/core'
 import { ux } from '@oclif/core'
 import { EOL } from 'os'
 import { text } from '@preevy/cli-common'
-import { DriverName } from '../../../drivers'
-import ProfileCommand from '../../../profile-command'
+import { DriverName } from '../../../drivers.js'
+import ProfileCommand from '../../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class ViewProfileConfig extends ProfileCommand<typeof ViewProfileConfig> {
diff --git a/packages/cli/src/commands/profile/cp.ts b/packages/cli/src/commands/profile/cp.ts
index 14d924a4..9d9b51d2 100644
--- a/packages/cli/src/commands/profile/cp.ts
+++ b/packages/cli/src/commands/profile/cp.ts
@@ -1,10 +1,10 @@
 import { Flags, ux } from '@oclif/core'
-import inquirer from 'inquirer'
+import * as inquirer from '@inquirer/prompts'
 import { BaseCommand, text } from '@preevy/cli-common'
 import { LocalProfilesConfig } from '@preevy/core'
-import { loadProfileConfig } from '../../profile-command'
-import { FsType, chooseFs, chooseFsType, fsTypes, isFsType } from '../../fs'
-import { machineDrivers } from '../../drivers'
+import { loadProfileConfig } from '../../profile-command.js'
+import { FsType, chooseFs, chooseFsType, fsTypes, isFsType } from '../../fs.js'
+import { machineDrivers } from '../../drivers.js'
 
 const validateFsType = (fsType: string) => {
   if (!isFsType(fsType)) {
@@ -13,16 +13,10 @@ const validateFsType = (fsType: string) => {
   return fsType
 }
 
-const chooseTargetAlias = async (defaultAlias: string) => (
-  await inquirer.prompt<{ targetAlias: string }>([
-    {
-      type: 'input',
-      name: 'targetAlias',
-      message: 'Target profile name',
-      default: defaultAlias,
-    },
-  ])
-).targetAlias
+const chooseTargetAlias = async (defaultAlias: string) => await inquirer.input({
+  message: 'Target profile name',
+  default: defaultAlias,
+})
 
 // eslint-disable-next-line no-use-before-define
 export default class CopyProfile extends BaseCommand<typeof CopyProfile> {
diff --git a/packages/cli/src/commands/profile/create.ts b/packages/cli/src/commands/profile/create.ts
index b090f66e..91d78c71 100644
--- a/packages/cli/src/commands/profile/create.ts
+++ b/packages/cli/src/commands/profile/create.ts
@@ -6,9 +6,9 @@ import {
   extractDriverFlags,
   flagsForAllDrivers,
   machineCreationflagsForAllDrivers,
-} from '../../drivers'
-import ProfileCommand from '../../profile-command'
-import DriverCommand from '../../driver-command'
+} from '../../drivers.js'
+import ProfileCommand from '../../profile-command.js'
+import DriverCommand from '../../driver-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class CreateProfile extends ProfileCommand<typeof CreateProfile> {
diff --git a/packages/cli/src/commands/profile/current.ts b/packages/cli/src/commands/profile/current.ts
index 3a8e4ad9..af95ff18 100644
--- a/packages/cli/src/commands/profile/current.ts
+++ b/packages/cli/src/commands/profile/current.ts
@@ -1,5 +1,5 @@
 import { ux } from '@oclif/core'
-import ProfileCommand from '../../profile-command'
+import ProfileCommand from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class CurrentProfile extends ProfileCommand<typeof CurrentProfile> {
diff --git a/packages/cli/src/commands/profile/import.ts b/packages/cli/src/commands/profile/import.ts
index 5e655dac..405300dc 100644
--- a/packages/cli/src/commands/profile/import.ts
+++ b/packages/cli/src/commands/profile/import.ts
@@ -2,7 +2,7 @@ import { Args, Flags, ux } from '@oclif/core'
 import { fsTypeFromUrl, nextAvailableAlias } from '@preevy/core'
 import { BaseCommand, text } from '@preevy/cli-common'
 import { EOL } from 'os'
-import { loadProfileConfig, onProfileChange } from '../../profile-command'
+import { loadProfileConfig, onProfileChange } from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class ImportProfile extends BaseCommand<typeof ImportProfile> {
diff --git a/packages/cli/src/commands/profile/key.ts b/packages/cli/src/commands/profile/key.ts
index d1349f20..f3453291 100644
--- a/packages/cli/src/commands/profile/key.ts
+++ b/packages/cli/src/commands/profile/key.ts
@@ -1,7 +1,7 @@
 import { Args, ux } from '@oclif/core'
 import { jwkThumbprint, jwkThumbprintUri, parseKey, profileStore } from '@preevy/core'
 import { formatPublicKey } from '@preevy/common'
-import ProfileCommand from '../../profile-command'
+import ProfileCommand from '../../profile-command.js'
 
 const keyTypes = ['private', 'public-pem', 'public-ssh', 'thumbprint', 'thumbprint-uri'] as const
 type KeyType = typeof keyTypes[number]
diff --git a/packages/cli/src/commands/profile/link.ts b/packages/cli/src/commands/profile/link.ts
index 187c7d0e..8ccfa18d 100644
--- a/packages/cli/src/commands/profile/link.ts
+++ b/packages/cli/src/commands/profile/link.ts
@@ -1,8 +1,8 @@
 import { link, Org, localFs, profileStore, TokenExpiredError, getLivecycleTokensFromLocalFs } from '@preevy/core'
 import { Flags, ux } from '@oclif/core'
-import inquirer from 'inquirer'
-import ProfileCommand from '../../profile-command'
-import { LC_API_URL } from '../../defaults'
+import * as inquirer from '@inquirer/prompts'
+import ProfileCommand from '../../profile-command.js'
+import { LC_API_URL } from '../../defaults.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Link extends ProfileCommand<typeof Link> {
@@ -43,14 +43,13 @@ export default class Link extends ProfileCommand<typeof Link> {
           if (orgs.length === 1) {
             return orgs[0]
           }
-          const selection = await inquirer.prompt<{org: string}>({ type: 'list',
-            name: 'org',
+          org = await inquirer.select({
             message: 'Choose the organization to link the profile to',
             choices: orgs.map(o => ({
               name: o.name,
               value: o.slug,
-            })) })
-          org = selection.org
+            })),
+          })
         }
         const orgInfo = orgs.find(o => o.slug === org)
         if (!orgInfo) {
diff --git a/packages/cli/src/commands/profile/ls.ts b/packages/cli/src/commands/profile/ls.ts
index 38a7d937..ce349e29 100644
--- a/packages/cli/src/commands/profile/ls.ts
+++ b/packages/cli/src/commands/profile/ls.ts
@@ -1,6 +1,6 @@
 import { Flags, ux } from '@oclif/core'
 import { tableFlags } from '@preevy/cli-common'
-import ProfileCommand from '../../profile-command'
+import ProfileCommand from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class ListProfile extends ProfileCommand<typeof ListProfile> {
diff --git a/packages/cli/src/commands/profile/rm.ts b/packages/cli/src/commands/profile/rm.ts
index c80d8d0d..4bf42cfc 100644
--- a/packages/cli/src/commands/profile/rm.ts
+++ b/packages/cli/src/commands/profile/rm.ts
@@ -1,6 +1,6 @@
 import { Args, Flags, ux } from '@oclif/core'
 import { text } from '@preevy/cli-common'
-import ProfileCommand from '../../profile-command'
+import ProfileCommand from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class RemoveProfile extends ProfileCommand<typeof RemoveProfile> {
diff --git a/packages/cli/src/commands/profile/use.ts b/packages/cli/src/commands/profile/use.ts
index 2ebb8b7b..f0d50cd3 100644
--- a/packages/cli/src/commands/profile/use.ts
+++ b/packages/cli/src/commands/profile/use.ts
@@ -1,6 +1,6 @@
 import { Args, ux } from '@oclif/core'
 import { BaseCommand, text } from '@preevy/cli-common'
-import { loadProfileConfig } from '../../profile-command'
+import { loadProfileConfig } from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class UseProfile extends BaseCommand<typeof UseProfile> {
diff --git a/packages/cli/src/commands/proxy/connect.ts b/packages/cli/src/commands/proxy/connect.ts
index 104314b4..78be2fc0 100644
--- a/packages/cli/src/commands/proxy/connect.ts
+++ b/packages/cli/src/commands/proxy/connect.ts
@@ -4,9 +4,9 @@ import { tableFlags, text, tunnelServerFlags, urlFlags } from '@preevy/cli-commo
 import { inspect } from 'util'
 import { formatPublicKey } from '@preevy/common'
 import { spawn } from 'child_process'
-import { connectToTunnelServerSsh } from '../../tunnel-server-client'
-import ProfileCommand from '../../profile-command'
-import { filterUrls, printUrls, writeUrlsToFile } from '../urls'
+import { connectToTunnelServerSsh } from '../../tunnel-server-client.js'
+import ProfileCommand from '../../profile-command.js'
+import { filterUrls, printUrls, writeUrlsToFile } from '../urls.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Connect extends ProfileCommand<typeof Connect> {
diff --git a/packages/cli/src/commands/proxy/disconnect.ts b/packages/cli/src/commands/proxy/disconnect.ts
index 8b4bda1c..1a66b7e9 100644
--- a/packages/cli/src/commands/proxy/disconnect.ts
+++ b/packages/cli/src/commands/proxy/disconnect.ts
@@ -1,7 +1,7 @@
 import { Args } from '@oclif/core'
 import { commands, execPromiseStdout } from '@preevy/core'
 import { tableFlags } from '@preevy/cli-common'
-import ProfileCommand from '../../profile-command'
+import ProfileCommand from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Disconnect extends ProfileCommand<typeof Disconnect> {
diff --git a/packages/cli/src/commands/proxy/urls.ts b/packages/cli/src/commands/proxy/urls.ts
index b3f97c69..71d7af31 100644
--- a/packages/cli/src/commands/proxy/urls.ts
+++ b/packages/cli/src/commands/proxy/urls.ts
@@ -1,9 +1,9 @@
 import { Args } from '@oclif/core'
 import { tunnelServerFlags, urlFlags, formatFlagsToArgs, tableFlags } from '@preevy/cli-common'
 import { commands } from '@preevy/core'
-import { pick } from 'lodash'
-import PreevyUrlsCmd from '../urls'
-import ProfileCommand from '../../profile-command'
+import { pick } from 'lodash-es'
+import PreevyUrlsCmd from '../urls.js'
+import ProfileCommand from '../../profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Urls extends ProfileCommand<typeof Urls> {
diff --git a/packages/cli/src/commands/purge.ts b/packages/cli/src/commands/purge.ts
index 5fb6f084..bbc7e0d5 100644
--- a/packages/cli/src/commands/purge.ts
+++ b/packages/cli/src/commands/purge.ts
@@ -1,10 +1,10 @@
 import os from 'os'
 import { Flags, ux } from '@oclif/core'
 import { asyncFilter, asyncToArray } from 'iter-tools-es'
-import { groupBy, partition } from 'lodash'
+import { groupBy, partition } from 'lodash-es'
 import { MachineResource, isPartialMachine, machineResourceType } from '@preevy/core'
-import DriverCommand from '../driver-command'
-import { carefulBooleanPrompt } from '../prompt'
+import DriverCommand from '../driver-command.js'
+import { carefulBooleanPrompt } from '../prompt.js'
 
 const isMachineResource = (r: { type: string }): r is MachineResource => r.type === machineResourceType
 
diff --git a/packages/cli/src/commands/shell.ts b/packages/cli/src/commands/shell.ts
index 12729f0e..cd7161d5 100644
--- a/packages/cli/src/commands/shell.ts
+++ b/packages/cli/src/commands/shell.ts
@@ -1,6 +1,6 @@
 import { Args } from '@oclif/core'
 import { commands } from '@preevy/core'
-import DriverCommand from '../driver-command'
+import DriverCommand from '../driver-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export default class Shell extends DriverCommand<typeof Shell> {
diff --git a/packages/cli/src/commands/up.ts b/packages/cli/src/commands/up.ts
index 10d1ef94..5570a017 100644
--- a/packages/cli/src/commands/up.ts
+++ b/packages/cli/src/commands/up.ts
@@ -14,10 +14,10 @@ import {
 import { buildFlags, parseBuildFlags, tableFlags, text, tunnelServerFlags } from '@preevy/cli-common'
 import { inspect } from 'util'
 import { editUrl, tunnelNameResolver } from '@preevy/common'
-import MachineCreationDriverCommand from '../machine-creation-driver-command'
-import { envIdFlags, urlFlags } from '../common-flags'
-import { filterUrls, printUrls, writeUrlsToFile } from './urls'
-import { connectToTunnelServerSsh } from '../tunnel-server-client'
+import MachineCreationDriverCommand from '../machine-creation-driver-command.js'
+import { envIdFlags, urlFlags } from '../common-flags.js'
+import { filterUrls, printUrls, writeUrlsToFile } from './urls.js'
+import { connectToTunnelServerSsh } from '../tunnel-server-client.js'
 
 const fetchTunnelServerDetails = async ({
   log,
diff --git a/packages/cli/src/commands/urls.ts b/packages/cli/src/commands/urls.ts
index 6dfeb2af..c295f301 100644
--- a/packages/cli/src/commands/urls.ts
+++ b/packages/cli/src/commands/urls.ts
@@ -5,9 +5,9 @@ import { FlatTunnel, Logger, TunnelOpts, addBaseComposeTunnelAgentService, comma
 import { HooksListeners, PluginContext, tableFlags, text, tunnelServerFlags } from '@preevy/cli-common'
 import { asyncReduce } from 'iter-tools-es'
 import { tunnelNameResolver } from '@preevy/common'
-import { connectToTunnelServerSsh } from '../tunnel-server-client'
-import ProfileCommand from '../profile-command'
-import { envIdFlags, urlFlags } from '../common-flags'
+import { connectToTunnelServerSsh } from '../tunnel-server-client.js'
+import ProfileCommand from '../profile-command.js'
+import { envIdFlags, urlFlags } from '../common-flags.js'
 
 export const writeUrlsToFile = async (
   { log }: { log: Logger },
diff --git a/packages/cli/src/driver-command.ts b/packages/cli/src/driver-command.ts
index 732258e2..06c6d236 100644
--- a/packages/cli/src/driver-command.ts
+++ b/packages/cli/src/driver-command.ts
@@ -1,8 +1,8 @@
 import { Command, Flags, Interfaces } from '@oclif/core'
 import { MachineConnection, MachineDriver, isPartialMachine, profileStore } from '@preevy/core'
-import { pickBy } from 'lodash'
-import { DriverFlags, DriverName, FlagType, flagsForAllDrivers, machineDrivers, removeDriverPrefix } from './drivers'
-import ProfileCommand from './profile-command'
+import { pickBy } from 'lodash-es'
+import { DriverFlags, DriverName, FlagType, flagsForAllDrivers, machineDrivers, removeDriverPrefix } from './drivers.js'
+import ProfileCommand from './profile-command.js'
 
 // eslint-disable-next-line no-use-before-define
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof DriverCommand['baseFlags'] & T['flags']>
diff --git a/packages/cli/src/drivers.ts b/packages/cli/src/drivers.ts
index 38fe1912..901552b9 100644
--- a/packages/cli/src/drivers.ts
+++ b/packages/cli/src/drivers.ts
@@ -1,4 +1,4 @@
-import { map, mapKeys, pickBy } from 'lodash'
+import { map, mapKeys, pickBy } from 'lodash-es'
 import lightsail from '@preevy/driver-lightsail'
 import gce from '@preevy/driver-gce'
 import azure from '@preevy/driver-azure'
@@ -8,7 +8,6 @@ import { Interfaces } from '@oclif/core'
 import { formatFlagsToArgs } from '@preevy/cli-common'
 
 export const machineDrivers = {
-
   lightsail,
   gce,
   azure,
diff --git a/packages/cli/src/fs.ts b/packages/cli/src/fs.ts
index 74af78d6..237c748f 100644
--- a/packages/cli/src/fs.ts
+++ b/packages/cli/src/fs.ts
@@ -1,13 +1,11 @@
 import { fsTypeFromUrl, localFsFromUrl } from '@preevy/core'
 import { googleCloudStorageFs, defaultBucketName as gsDefaultBucketName, defaultProjectId as defaultGceProjectId } from '@preevy/driver-gce'
 import { s3fs, defaultBucketName as s3DefaultBucketName, awsUtils, S3_REGIONS } from '@preevy/driver-lightsail'
-import inquirer from 'inquirer'
-import inquirerAutoComplete from 'inquirer-autocomplete-prompt'
-import { DriverName } from './drivers'
+import * as inquirer from '@inquirer/prompts'
+import inquirerAutoComplete from 'inquirer-autocomplete-standalone'
+import { DriverName } from './drivers.js'
 import ambientAwsAccountId = awsUtils.ambientAccountId
 
-inquirer.registerPrompt('autocomplete', inquirerAutoComplete)
-
 export const fsFromUrl = async (url: string, localBaseDir: string) => {
   const fsType = fsTypeFromUrl(url)
   if (fsType === 'local') {
@@ -40,21 +38,15 @@ const defaultFsType = (driver?: string): FsType => {
   return 'local'
 }
 
-export const chooseFsType = async ({ driver }: { driver?: string }) => (
-  await inquirer.prompt<{ locationType: FsType }>([
-    {
-      type: 'list',
-      name: 'locationType',
-      message: 'Where do you want to store the profile?',
-      default: defaultFsType(driver),
-      choices: [
-        { value: 'local', name: 'local file' },
-        { value: 's3', name: 'AWS S3' },
-        { value: 'gs', name: 'Google Cloud Storage' },
-      ],
-    },
-  ])
-).locationType
+export const chooseFsType = async ({ driver }: { driver?: string }) => await inquirer.select({
+  message: 'Where do you want to store the profile?',
+  default: defaultFsType(driver),
+  choices: [
+    { value: 'local', name: 'local file' },
+    { value: 's3', name: 'AWS S3' },
+    { value: 'gs', name: 'Google Cloud Storage' },
+  ],
+}) as FsType
 
 type URL = `${string}://${string}`
 
@@ -69,31 +61,20 @@ export const chooseFs: Record<FsType, FsChooser> = {
     profileAlias: string
     driver?: { name: DriverName; flags: Record<string, unknown> }
   }) => {
-    // eslint-disable-next-line no-use-before-define
-    const { region, bucket } = await inquirer.prompt<{ region: string; bucket: string }>([
-      {
-        type: 'autocomplete',
-        name: 'region',
-        message: 'S3 bucket region',
-        source: async (_opts, input) => S3_REGIONS.filter(r => !input || r.includes(input.toLowerCase())),
-        default: driver?.name === 'lightsail' && S3_REGIONS.includes(driver.flags.region as string)
-          ? driver.flags.region as string
-          : 'us-east-1',
-        suggestOnly: true,
-        filter: i => i.toLowerCase(),
-      } as inquirerAutoComplete.AutocompleteQuestionOptions,
-      {
-        type: 'input',
-        name: 'bucket',
-        message: 'Bucket name',
-        default: async (
-          answers: Record<string, unknown>
-        ) => {
-          const accountId = await ambientAwsAccountId(answers.region as string)
-          return accountId ? s3DefaultBucketName({ profileAlias, accountId }) : undefined
-        },
-      },
-    ])
+    const region = await inquirerAutoComplete<string>({
+      message: 'S3 bucket region',
+      source: async input => S3_REGIONS
+        .filter(r => !input || r.includes(input.toLowerCase()))
+        .map(value => ({ value })),
+      default: driver?.name === 'lightsail' && S3_REGIONS.includes(driver.flags.region as string)
+        ? driver.flags.region as string
+        : 'us-east-1',
+      suggestOnly: true,
+      transformer: i => i.toLowerCase(),
+    })
+    const accountId = await ambientAwsAccountId(region)
+    const defaultBucket = accountId ? s3DefaultBucketName({ profileAlias, accountId }) : undefined
+    const bucket = await inquirer.input({ message: 'Bucket name', default: defaultBucket })
 
     return `s3://${bucket}?region=${region}`
   },
@@ -101,23 +82,21 @@ export const chooseFs: Record<FsType, FsChooser> = {
     profileAlias: string
     driver?: { name: DriverName; flags: Record<string, unknown> }
   }) => {
-    // eslint-disable-next-line no-use-before-define
-    const { project, bucket } = await inquirer.prompt<{ project: string; bucket: string }>([
-      {
-        type: 'input',
-        name: 'project',
-        message: 'Google Cloud project',
-        default: driver?.name === 'gce' ? driver.flags['project-id'] : defaultGceProjectId(),
-      },
-      {
-        type: 'input',
-        name: 'bucket',
-        message: 'Bucket name',
-        default: (
-          answers: Record<string, unknown>,
-        ) => gsDefaultBucketName({ profileAlias, project: answers.project as string }),
-      },
-    ])
+    const defaultProject: string | undefined = driver?.name === 'gce'
+      ? driver.flags['project-id'] as string | undefined
+      : await defaultGceProjectId()
+
+    const project = await inquirer.input({
+      message: 'Google Cloud project',
+      default: defaultProject,
+    })
+
+    const defaultBucket = gsDefaultBucketName({ profileAlias, project })
+
+    const bucket = await inquirer.input({
+      message: 'Bucket name',
+      default: defaultBucket,
+    })
 
     return `gs://${bucket}?project=${project}`
   },
diff --git a/packages/cli/src/machine-creation-driver-command.ts b/packages/cli/src/machine-creation-driver-command.ts
index a5a5d3c1..353724c4 100644
--- a/packages/cli/src/machine-creation-driver-command.ts
+++ b/packages/cli/src/machine-creation-driver-command.ts
@@ -1,8 +1,8 @@
 import { Command, Flags, Interfaces } from '@oclif/core'
 import { MachineCreationDriver } from '@preevy/core'
 import { BaseCommand } from '@preevy/cli-common'
-import DriverCommand from './driver-command'
-import { machineCreationflagsForAllDrivers, machineDrivers } from './drivers'
+import DriverCommand from './driver-command.js'
+import { machineCreationflagsForAllDrivers, machineDrivers } from './drivers.js'
 
 // eslint-disable-next-line no-use-before-define
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof MachineCreationDriverCommand['baseFlags'] & T['flags']>
diff --git a/packages/cli/src/profile-command.ts b/packages/cli/src/profile-command.ts
index 53b3ed28..cca3bb0f 100644
--- a/packages/cli/src/profile-command.ts
+++ b/packages/cli/src/profile-command.ts
@@ -5,7 +5,7 @@ import {
   localProfilesConfig, telemetryEmitter, LocalProfilesConfigGetResult,
 } from '@preevy/core'
 import { BaseCommand, text } from '@preevy/cli-common'
-import { fsFromUrl } from './fs'
+import { fsFromUrl } from './fs.js'
 
 export const onProfileChange = (profile: Profile, profileStoreType: string) => {
   const ciProvider = detectCiProvider()
diff --git a/packages/cli/src/tunnel-server-client.ts b/packages/cli/src/tunnel-server-client.ts
index cf26ff2a..43204705 100644
--- a/packages/cli/src/tunnel-server-client.ts
+++ b/packages/cli/src/tunnel-server-client.ts
@@ -9,7 +9,7 @@ import {
 import os from 'os'
 import { ux } from '@oclif/core'
 import { parseSshUrl } from '@preevy/common'
-import { carefulBooleanPrompt } from './prompt'
+import { carefulBooleanPrompt } from './prompt.js'
 
 const confirmHostFingerprint = async (
   { hostKeyFingerprint: hostKeySignature, hostname, port }: Parameters<HostKeySignatureConfirmer>[0],
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index d079a6d1..4ca511e7 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,17 +1,22 @@
 {
   "compilerOptions": {
     "declaration": true,
+    "skipLibCheck": true,
     "importHelpers": true,
-    "module": "commonjs",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "outDir": "dist",
     "rootDir": "src",
     "strict": true,
-    "target": "es2019",
+    "target": "ES2020",
     "lib": ["es2022", "ESNext.Disposable"],
     "esModuleInterop": true,
     "sourceMap": true,
     "baseUrl": "."
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/packages/common/.eslintignore b/packages/common/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/common/.eslintignore
+++ b/packages/common/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/common/.eslintrc.cjs b/packages/common/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/common/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/common/.eslintrc.js b/packages/common/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/common/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/common/index.ts b/packages/common/index.ts
index 8597902d..1be4f7fd 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -6,23 +6,23 @@ export {
   formatSshConnectionConfig,
   SshConnectionConfig, HelloResponse,
   baseSshClient, BaseSshClient, SshClientOpts,
-} from './src/ssh'
+} from './src/ssh/index.js'
 
 export {
   simpleEmitter,
   stateEmitter,
   SimpleEmitter, StateEmitter, EmitterConsumer, StateEmitterConsumer,
-} from './src/emitter'
+} from './src/emitter/index.js'
 export {
   readOrUndefined, isNotFoundError,
-} from './src/files'
-export { hasPropertyDefined, RequiredProperties } from './src/ts-utils'
-export { tryParseJson, dateReplacer } from './src/json'
-export { tryParseYaml } from './src/yaml'
-export { Logger } from './src/log'
-export { requiredEnv, numberFromEnv } from './src/env'
-export { tunnelNameResolver, TunnelNameResolver } from './src/tunnel-name'
-export { editUrl } from './src/url'
+} from './src/files.js'
+export { hasPropertyDefined, RequiredProperties } from './src/ts-utils.js'
+export { tryParseJson, dateReplacer } from './src/json.js'
+export { tryParseYaml } from './src/yaml.js'
+export { Logger } from './src/log.js'
+export { requiredEnv, numberFromEnv } from './src/env.js'
+export { tunnelNameResolver, TunnelNameResolver } from './src/tunnel-name.js'
+export { editUrl } from './src/url.js'
 export {
   ScriptInjection,
   parseScriptInjectionLabels,
@@ -30,6 +30,6 @@ export {
   COMPOSE_TUNNEL_AGENT_PORT,
   COMPOSE_TUNNEL_AGENT_SERVICE_LABELS,
   COMPOSE_TUNNEL_AGENT_SERVICE_NAME,
-} from './src/compose-tunnel-agent'
-export { MachineStatusCommand, DockerMachineStatusCommandRecipe } from './src/machine-status-command'
-export { ProcessOutputBuffers, orderedOutput, OrderedOutput } from './src/process-output-buffers'
+} from './src/compose-tunnel-agent/index.js'
+export { MachineStatusCommand, DockerMachineStatusCommandRecipe } from './src/machine-status-command.js'
+export { ProcessOutputBuffers, orderedOutput, OrderedOutput } from './src/process-output-buffers.js'
diff --git a/packages/common/jest.config.cjs b/packages/common/jest.config.cjs
new file mode 100644
index 00000000..d69d187d
--- /dev/null
+++ b/packages/common/jest.config.cjs
@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  testMatch: ['!dist/', '**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.+)\\.js$': '$1',
+  },
+}
diff --git a/packages/common/jest.config.js b/packages/common/jest.config.js
deleted file mode 100644
index 1fd541c2..00000000
--- a/packages/common/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testMatch: ['!dist/', '**/*.test.ts'],
-};
\ No newline at end of file
diff --git a/packages/common/package.json b/packages/common/package.json
index f46dc4c2..f0938e45 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/common",
   "version": "0.0.58",
   "description": "",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "files": [
     "dist",
     "tsconfig.json"
@@ -11,33 +14,33 @@
   "dependencies": {
     "dockerode": "^3.3.4",
     "http-proxy": "^1.18.1",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "p-limit": "^3.1.0",
     "pino": "^8.11.0",
-    "pino-pretty": "^9.4.0",
+    "pino-pretty": "^10.2.3",
     "ssh2": "^1.12.0"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@types/dockerode": "^3.3.14",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/shell-escape": "^0.2.1",
     "@types/ssh2": "^1.11.8",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
-    "esbuild": "^0.17.14",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
+    "esbuild": "^0.19.9",
     "eslint": "^8.36.0",
     "husky": "^8.0.0",
     "jest": "29.7.0",
     "lint-staged": "^15.2.0",
     "ts-jest": "29.1.1",
     "tsx": "^3.12.3",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "yaml": "^2.3.2"
   },
   "scripts": {
-    "test": "yarn jest",
+    "test": "yarn node --experimental-vm-modules ../../node_modules/.bin/jest",
     "lint": "eslint . --ext .ts,.tsx --cache",
     "build": "tsc -b",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
diff --git a/packages/common/src/compose-tunnel-agent/index.ts b/packages/common/src/compose-tunnel-agent/index.ts
index 39e0d91a..96f039b8 100644
--- a/packages/common/src/compose-tunnel-agent/index.ts
+++ b/packages/common/src/compose-tunnel-agent/index.ts
@@ -1,5 +1,5 @@
-export { COMPOSE_TUNNEL_AGENT_SERVICE_LABELS } from './labels'
-export { ScriptInjection, parseScriptInjectionLabels, scriptInjectionsToLabels } from './script-injection'
+export { COMPOSE_TUNNEL_AGENT_SERVICE_LABELS } from './labels.js'
+export { ScriptInjection, parseScriptInjectionLabels, scriptInjectionsToLabels } from './script-injection.js'
 
 export const COMPOSE_TUNNEL_AGENT_SERVICE_NAME = 'preevy_proxy'
 export const COMPOSE_TUNNEL_AGENT_PORT = 3000
diff --git a/packages/common/src/compose-tunnel-agent/script-injection.test.ts b/packages/common/src/compose-tunnel-agent/script-injection.test.ts
index 6386057b..258c7e60 100644
--- a/packages/common/src/compose-tunnel-agent/script-injection.test.ts
+++ b/packages/common/src/compose-tunnel-agent/script-injection.test.ts
@@ -1,5 +1,5 @@
 import { describe, test, expect, it } from '@jest/globals'
-import { ScriptInjection, parseScriptInjectionLabels, scriptInjectionsToLabels } from './script-injection'
+import { ScriptInjection, parseScriptInjectionLabels, scriptInjectionsToLabels } from './script-injection.js'
 
 describe('script injection labels', () => {
   describe('parseScriptInjectionLabels', () => {
diff --git a/packages/common/src/compose-tunnel-agent/script-injection.ts b/packages/common/src/compose-tunnel-agent/script-injection.ts
index 33fd6258..7e83dec1 100644
--- a/packages/common/src/compose-tunnel-agent/script-injection.ts
+++ b/packages/common/src/compose-tunnel-agent/script-injection.ts
@@ -1,6 +1,6 @@
-import { groupBy, mapKeys, partition } from 'lodash'
+import { groupBy, mapKeys, partition } from 'lodash-es'
 import { inspect } from 'util'
-import { COMPOSE_TUNNEL_AGENT_SERVICE_LABELS } from './labels'
+import { COMPOSE_TUNNEL_AGENT_SERVICE_LABELS } from './labels.js'
 
 export type ScriptInjection = {
   pathRegex?: RegExp
diff --git a/packages/common/src/emitter/index.ts b/packages/common/src/emitter/index.ts
index de4b6fdd..d432516c 100644
--- a/packages/common/src/emitter/index.ts
+++ b/packages/common/src/emitter/index.ts
@@ -1,2 +1,2 @@
-export { simpleEmitter, SimpleEmitter, EmitterConsumer } from './simple'
-export { stateEmitter, StateEmitter, StateEmitterConsumer } from './state'
+export { simpleEmitter, SimpleEmitter, EmitterConsumer } from './simple.js'
+export { stateEmitter, StateEmitter, StateEmitterConsumer } from './state.js'
diff --git a/packages/common/src/emitter/state.ts b/packages/common/src/emitter/state.ts
index 9f6d3388..f4e5856d 100644
--- a/packages/common/src/emitter/state.ts
+++ b/packages/common/src/emitter/state.ts
@@ -1,4 +1,4 @@
-import { simpleEmitter } from './simple'
+import { simpleEmitter } from './simple.js'
 
 const EVENT = 'state'
 
diff --git a/packages/common/src/ssh/base-client.ts b/packages/common/src/ssh/base-client.ts
index 1d9b1027..a0ec8aac 100644
--- a/packages/common/src/ssh/base-client.ts
+++ b/packages/common/src/ssh/base-client.ts
@@ -2,9 +2,9 @@ import events from 'events'
 import tls, { TLSSocket } from 'tls'
 import ssh2, { ParsedKey } from 'ssh2'
 import { promisify } from 'util'
-import { tryParseJson } from '../json'
-import { Logger } from '../log'
-import { formatPublicKey, parseKey } from './keys'
+import { tryParseJson } from '../json.js'
+import { Logger } from '../log.js'
+import { formatPublicKey, parseKey } from './keys.js'
 
 export type SshBaseConnectionConfig = {
   hostname: string
diff --git a/packages/common/src/ssh/index.ts b/packages/common/src/ssh/index.ts
index afc24c22..825d9777 100644
--- a/packages/common/src/ssh/index.ts
+++ b/packages/common/src/ssh/index.ts
@@ -1,4 +1,4 @@
-export { parseKey, formatPublicKey, keyFingerprint } from './keys'
+export { parseKey, formatPublicKey, keyFingerprint } from './keys.js'
 export {
   parseSshUrl,
   formatSshConnectionConfig,
@@ -7,4 +7,4 @@ export {
   SshConnectionConfig,
   SshClientOpts,
   HelloResponse,
-} from './base-client'
+} from './base-client.js'
diff --git a/packages/common/src/url.test.ts b/packages/common/src/url.test.ts
index a3ef444f..1e4dcd4e 100644
--- a/packages/common/src/url.test.ts
+++ b/packages/common/src/url.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach } from '@jest/globals'
-import { editUrl } from './url'
+import { editUrl } from './url.js'
 
 describe('url', () => {
   describe('editUrl', () => {
diff --git a/packages/common/src/url.ts b/packages/common/src/url.ts
index 7cc826e9..dd673625 100644
--- a/packages/common/src/url.ts
+++ b/packages/common/src/url.ts
@@ -1,4 +1,4 @@
-import { defaults } from 'lodash'
+import { defaults } from 'lodash-es'
 
 export const editUrl = (
   url: URL | string,
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
index 86d760e1..df13a9ff 100644
--- a/packages/common/tsconfig.json
+++ b/packages/common/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -22,6 +22,9 @@
     "composite": true,
     "outDir": "dist",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["index.ts", "src/**/*"],
   "exclude": ["lint-staged.config.cjs"]
 }
diff --git a/packages/compose-tunnel-agent/.eslintignore b/packages/compose-tunnel-agent/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/compose-tunnel-agent/.eslintignore
+++ b/packages/compose-tunnel-agent/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/compose-tunnel-agent/.eslintrc.cjs b/packages/compose-tunnel-agent/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/compose-tunnel-agent/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/compose-tunnel-agent/.eslintrc.js b/packages/compose-tunnel-agent/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/compose-tunnel-agent/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/compose-tunnel-agent/Dockerfile b/packages/compose-tunnel-agent/Dockerfile
index b77c2f4c..9684697c 100644
--- a/packages/compose-tunnel-agent/Dockerfile
+++ b/packages/compose-tunnel-agent/Dockerfile
@@ -3,4 +3,4 @@ WORKDIR /app
 
 FROM base as production
 COPY out /app/
-CMD [ "node", "/app/index.js" ]
+CMD [ "node", "/app/index.mjs" ]
diff --git a/packages/compose-tunnel-agent/build.mjs b/packages/compose-tunnel-agent/build.mjs
index 6759856f..6e3bebe4 100644
--- a/packages/compose-tunnel-agent/build.mjs
+++ b/packages/compose-tunnel-agent/build.mjs
@@ -1,15 +1,41 @@
 import * as esbuild from 'esbuild'
 
+const ESM_REQUIRE_SHIM = `
+await (async () => {
+  const { dirname } = await import("path");
+  const { fileURLToPath } = await import("url");
+
+  /**
+   * Shim entry-point related paths.
+   */
+  if (typeof globalThis.__filename === "undefined") {
+    globalThis.__filename = fileURLToPath(import.meta.url);
+  }
+  if (typeof globalThis.__dirname === "undefined") {
+    globalThis.__dirname = dirname(globalThis.__filename);
+  }
+  /**
+   * Shim require if needed.
+   */
+  if (typeof globalThis.require === "undefined") {
+    const { default: module } = await import("module");
+    globalThis.require = module.createRequire(import.meta.url);
+  }
+})();
+`;
+
 await esbuild.build({
   entryPoints: ['index.ts'],
   bundle: true,
   treeShaking: true,
   outdir: './out',
+  outExtension: { '.js': '.mjs' },
   platform: 'node',
   target: 'es2020',
-  format: 'cjs',
+  format: 'esm',
   loader: {
     '.node': 'file',
   },
   sourcemap: true,
+  banner: { js: ESM_REQUIRE_SHIM },
 })
diff --git a/packages/compose-tunnel-agent/index.ts b/packages/compose-tunnel-agent/index.ts
index e152405e..7e737c29 100644
--- a/packages/compose-tunnel-agent/index.ts
+++ b/packages/compose-tunnel-agent/index.ts
@@ -2,8 +2,8 @@ import fs from 'fs'
 import path from 'path'
 import Docker from 'dockerode'
 import { rimraf } from 'rimraf'
-import pino from 'pino'
-import pinoPretty from 'pino-pretty'
+import { pino } from 'pino'
+import pinoPrettyModule from 'pino-pretty'
 import {
   requiredEnv,
   formatPublicKey,
@@ -14,12 +14,14 @@ import {
   COMPOSE_TUNNEL_AGENT_PORT,
 } from '@preevy/common'
 import { inspect } from 'util'
-import { createApp } from './src/api-server'
-import { sshClient as createSshClient } from './src/ssh'
-import { runMachineStatusCommand } from './src/machine-status'
-import { envMetadata } from './src/metadata'
-import { readAllFiles } from './src/files'
-import { eventsClient as dockerEventsClient, filteredClient as dockerFilteredClient } from './src/docker'
+import { createApp } from './src/api-server/index.js'
+import { sshClient as createSshClient } from './src/ssh/index.js'
+import { runMachineStatusCommand } from './src/machine-status.js'
+import { envMetadata } from './src/metadata.js'
+import { readAllFiles } from './src/files.js'
+import { eventsClient as dockerEventsClient, filteredClient as dockerFilteredClient } from './src/docker/index.js'
+
+const PinoPretty = pinoPrettyModule.default
 
 const homeDir = process.env.HOME || '/root'
 const dockerSocket = '/var/run/docker.sock'
@@ -67,7 +69,7 @@ const machineStatusCommand = process.env.MACHINE_STATUS_COMMAND
 
 const log = pino({
   level: process.env.DEBUG || process.env.DOCKER_PROXY_DEBUG ? 'debug' : 'info',
-}, pinoPretty({ destination: pino.destination(process.stderr) }))
+}, PinoPretty({ destination: pino.destination(process.stderr) }))
 
 const main = async () => {
   let endRequested = false
diff --git a/packages/compose-tunnel-agent/jest.config.cjs b/packages/compose-tunnel-agent/jest.config.cjs
new file mode 100644
index 00000000..d69d187d
--- /dev/null
+++ b/packages/compose-tunnel-agent/jest.config.cjs
@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  testMatch: ['!dist/', '**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.+)\\.js$': '$1',
+  },
+}
diff --git a/packages/compose-tunnel-agent/jest.config.js b/packages/compose-tunnel-agent/jest.config.js
deleted file mode 100644
index 1fd541c2..00000000
--- a/packages/compose-tunnel-agent/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testMatch: ['!dist/', '**/*.test.ts'],
-};
\ No newline at end of file
diff --git a/packages/compose-tunnel-agent/package.json b/packages/compose-tunnel-agent/package.json
index dd9eb220..12703bbb 100644
--- a/packages/compose-tunnel-agent/package.json
+++ b/packages/compose-tunnel-agent/package.json
@@ -2,7 +2,11 @@
   "name": "@preevy/compose-tunnel-agent",
   "version": "0.0.58",
   "description": "",
-  "main": "out/index.js",
+  "main": "out/index.mjs",
+  "exports": {
+    ".": "./out/index.mjs"
+  },
+  "type": "module",
   "files": [
     "out",
     "Dockerfile"
@@ -20,11 +24,11 @@
     "fastify": "^4.22.2",
     "fastify-type-provider-zod": "^1.1.9",
     "http-proxy": "^1.18.1",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "p-limit": "^3.1.0",
     "pino": "^8.11.0",
-    "pino-pretty": "^9.4.0",
-    "rimraf": "^5.0.0",
+    "pino-pretty": "^10.2.3",
+    "rimraf": "^5.0.5",
     "ssh2": "^1.12.0",
     "ws": "^8.13.0",
     "zod": "^3.21.4"
@@ -33,33 +37,32 @@
     "@jest/globals": "29.7.0",
     "@types/dockerode": "^3.3.14",
     "@types/http-proxy": "^1.17.9",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/node-fetch": "^2.6.3",
     "@types/shell-escape": "^0.2.1",
     "@types/ssh2": "^1.11.8",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
-    "esbuild": "^0.17.14",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
+    "esbuild": "^0.19.9",
     "eslint": "^8.36.0",
     "husky": "^8.0.0",
     "jest": "29.7.0",
     "lint-staged": "^15.2.0",
-    "node-fetch": "2.6.9",
     "shx": "^0.3.3",
     "strip-ansi": "6.0.0",
     "tsx": "^3.12.3",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "wait-for-expect": "^3.0.2"
   },
   "scripts": {
-    "start": "node out/index.js",
+    "start": "node out/index.mjs",
     "dev": "tsx watch ./index.ts",
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist out",
     "build": "yarn tsc --noEmit && node build.mjs",
     "prepack": "yarn build",
     "prepare": "cd ../.. && husky install",
-    "test": "yarn jest"
+    "test": "yarn node --experimental-vm-modules ../../node_modules/.bin/jest"
   }
 }
diff --git a/packages/compose-tunnel-agent/src/api-server/containers/errors.ts b/packages/compose-tunnel-agent/src/api-server/containers/errors.ts
index a9f510b8..a96423f8 100644
--- a/packages/compose-tunnel-agent/src/api-server/containers/errors.ts
+++ b/packages/compose-tunnel-agent/src/api-server/containers/errors.ts
@@ -1,4 +1,4 @@
-import { NotFoundError } from '../http-errors'
+import { NotFoundError } from '../http-errors.js'
 
 export class ContainerNotFoundError extends NotFoundError {
   constructor(containerId: string) {
diff --git a/packages/compose-tunnel-agent/src/api-server/containers/exec.ts b/packages/compose-tunnel-agent/src/api-server/containers/exec.ts
index 0bbe44c2..a17ac812 100644
--- a/packages/compose-tunnel-agent/src/api-server/containers/exec.ts
+++ b/packages/compose-tunnel-agent/src/api-server/containers/exec.ts
@@ -3,9 +3,9 @@ import { createWebSocketStream } from 'ws'
 import z from 'zod'
 import { FastifyPluginAsync } from 'fastify'
 import Dockerode from 'dockerode'
-import { DockerFilterClient } from '../../docker'
-import { containerIdSchema, execQueryString } from './schema'
-import { inspectFilteredContainer } from './filter'
+import { DockerFilterClient } from '../../docker/index.js'
+import { containerIdSchema, execQueryString } from './schema.js'
+import { inspectFilteredContainer } from './filter.js'
 
 const handler: FastifyPluginAsync<{
   docker: Dockerode
diff --git a/packages/compose-tunnel-agent/src/api-server/containers/filter.ts b/packages/compose-tunnel-agent/src/api-server/containers/filter.ts
index e99a0b64..5bf77d14 100644
--- a/packages/compose-tunnel-agent/src/api-server/containers/filter.ts
+++ b/packages/compose-tunnel-agent/src/api-server/containers/filter.ts
@@ -1,5 +1,5 @@
-import { DockerFilterClient } from '../../docker'
-import { ContainerNotFoundError } from './errors'
+import { DockerFilterClient } from '../../docker/index.js'
+import { ContainerNotFoundError } from './errors.js'
 
 export const inspectFilteredContainer = async (dockerFilter: DockerFilterClient, containerId: string) => {
   const container = await dockerFilter.inspectContainer(containerId)
diff --git a/packages/compose-tunnel-agent/src/api-server/containers/index.ts b/packages/compose-tunnel-agent/src/api-server/containers/index.ts
index a310dfcf..875935ef 100644
--- a/packages/compose-tunnel-agent/src/api-server/containers/index.ts
+++ b/packages/compose-tunnel-agent/src/api-server/containers/index.ts
@@ -2,11 +2,11 @@ import Dockerode from 'dockerode'
 import { FastifyPluginAsync } from 'fastify'
 import z from 'zod'
 import fastifyWebsocket from '@fastify/websocket'
-import { DockerFilterClient } from '../../docker'
-import { containerIdSchema } from './schema'
-import exec from './exec'
-import logs from './logs'
-import { inspectFilteredContainer } from './filter'
+import { DockerFilterClient } from '../../docker/index.js'
+import { containerIdSchema } from './schema.js'
+import exec from './exec.js'
+import logs from './logs.js'
+import { inspectFilteredContainer } from './filter.js'
 
 const containerIdActionSchema = z.object({
   containerId: z.string(),
diff --git a/packages/compose-tunnel-agent/src/api-server/containers/logs.ts b/packages/compose-tunnel-agent/src/api-server/containers/logs.ts
index b3e814e2..9aa69d2a 100644
--- a/packages/compose-tunnel-agent/src/api-server/containers/logs.ts
+++ b/packages/compose-tunnel-agent/src/api-server/containers/logs.ts
@@ -3,9 +3,9 @@ import { createWebSocketStream } from 'ws'
 import z from 'zod'
 import { FastifyPluginAsync } from 'fastify'
 import Dockerode from 'dockerode'
-import { DockerFilterClient } from '../../docker'
-import { containerIdSchema, logsQueryString } from './schema'
-import { inspectFilteredContainer } from './filter'
+import { DockerFilterClient } from '../../docker/index.js'
+import { containerIdSchema, logsQueryString } from './schema.js'
+import { inspectFilteredContainer } from './filter.js'
 
 const handler: FastifyPluginAsync<{
   docker: Dockerode
diff --git a/packages/compose-tunnel-agent/src/api-server/env.ts b/packages/compose-tunnel-agent/src/api-server/env.ts
index cbee3e5c..b283004f 100644
--- a/packages/compose-tunnel-agent/src/api-server/env.ts
+++ b/packages/compose-tunnel-agent/src/api-server/env.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import { FastifyPluginAsync } from 'fastify'
-import { SshState } from '../ssh'
+import { SshState } from '../ssh/index.js'
 
 export const env: FastifyPluginAsync<{
   currentSshState: () => Promise<SshState>
diff --git a/packages/compose-tunnel-agent/src/api-server/index.test.ts b/packages/compose-tunnel-agent/src/api-server/index.test.ts
index 31da9da5..34b450ee 100644
--- a/packages/compose-tunnel-agent/src/api-server/index.test.ts
+++ b/packages/compose-tunnel-agent/src/api-server/index.test.ts
@@ -1,19 +1,21 @@
 import { AddressInfo } from 'node:net'
 import { describe, expect, beforeAll, afterAll, jest, it } from '@jest/globals'
 import { ChildProcess, spawn, exec } from 'child_process'
-import pino from 'pino'
-import pinoPretty from 'pino-pretty'
+import { pino } from 'pino'
+import pinoPrettyModule from 'pino-pretty'
 import Dockerode from 'dockerode'
-import fetch from 'node-fetch'
 import { inspect, promisify } from 'node:util'
-import waitForExpect from 'wait-for-expect'
+import waitForExpectModule from 'wait-for-expect'
 import WebSocket from 'ws'
 import stripAnsi from 'strip-ansi'
-import { createApp } from '.'
-import { filteredClient } from '../docker'
-import { SshState } from '../ssh'
-import { COMPOSE_PROJECT_LABEL } from '../docker/labels'
+import { createApp } from './index.js'
+import { filteredClient } from '../docker/index.js'
+import { SshState } from '../ssh/index.js'
+import { COMPOSE_PROJECT_LABEL } from '../docker/labels.js'
 
+const PinoPretty = pinoPrettyModule.default
+
+const waitForExpect = waitForExpectModule.default
 const TEST_COMPOSE_PROJECT = 'my-project'
 
 const setupDockerContainer = () => {
@@ -57,7 +59,7 @@ const setupDockerContainer = () => {
 const setupApiServer = () => {
   const log = pino({
     level: 'debug',
-  }, pinoPretty({ destination: pino.destination(process.stderr) }))
+  }, PinoPretty({ destination: pino.destination(process.stderr) }))
 
   let app: Awaited<ReturnType<typeof createApp>>
   let serverBaseUrl: string
diff --git a/packages/compose-tunnel-agent/src/api-server/index.ts b/packages/compose-tunnel-agent/src/api-server/index.ts
index 88981110..1d674928 100644
--- a/packages/compose-tunnel-agent/src/api-server/index.ts
+++ b/packages/compose-tunnel-agent/src/api-server/index.ts
@@ -3,10 +3,10 @@ import Dockerode from 'dockerode'
 import fastify from 'fastify'
 import cors from '@fastify/cors'
 import { validatorCompiler, serializerCompiler, ZodTypeProvider } from 'fastify-type-provider-zod'
-import { SshState } from '../ssh'
-import { DockerFilterClient } from '../docker'
-import { containers } from './containers'
-import { env } from './env'
+import { SshState } from '../ssh/index.js'
+import { DockerFilterClient } from '../docker/index.js'
+import { containers } from './containers/index.js'
+import { env } from './env.js'
 
 export const createApp = async ({
   log,
diff --git a/packages/compose-tunnel-agent/src/docker/events-client.ts b/packages/compose-tunnel-agent/src/docker/events-client.ts
index db59524b..e4e290b7 100644
--- a/packages/compose-tunnel-agent/src/docker/events-client.ts
+++ b/packages/compose-tunnel-agent/src/docker/events-client.ts
@@ -1,9 +1,9 @@
 import Docker from 'dockerode'
 import { tryParseJson, Logger, ScriptInjection } from '@preevy/common'
-import { throttle } from 'lodash'
+import { throttle } from 'lodash-es'
 import { inspect } from 'util'
-import { filters } from './filters'
-import { containerToService } from './services'
+import { filters } from './filters.js'
+import { containerToService } from './services.js'
 
 export type RunningService = {
   project: string
diff --git a/packages/compose-tunnel-agent/src/docker/filtered-client.ts b/packages/compose-tunnel-agent/src/docker/filtered-client.ts
index 730f6825..64c0de30 100644
--- a/packages/compose-tunnel-agent/src/docker/filtered-client.ts
+++ b/packages/compose-tunnel-agent/src/docker/filtered-client.ts
@@ -1,5 +1,5 @@
 import Docker from 'dockerode'
-import { filters } from './filters'
+import { filters } from './filters.js'
 
 export const filteredClient = ({
   docker,
diff --git a/packages/compose-tunnel-agent/src/docker/filters.ts b/packages/compose-tunnel-agent/src/docker/filters.ts
index 0c871d5a..8959818f 100644
--- a/packages/compose-tunnel-agent/src/docker/filters.ts
+++ b/packages/compose-tunnel-agent/src/docker/filters.ts
@@ -1,6 +1,6 @@
 import Docker from 'dockerode'
 import { COMPOSE_TUNNEL_AGENT_SERVICE_LABELS } from '@preevy/common'
-import { COMPOSE_PROJECT_LABEL } from './labels'
+import { COMPOSE_PROJECT_LABEL } from './labels.js'
 
 export type RunningService = {
   project: string
diff --git a/packages/compose-tunnel-agent/src/docker/index.ts b/packages/compose-tunnel-agent/src/docker/index.ts
index cedb8df3..c5b44619 100644
--- a/packages/compose-tunnel-agent/src/docker/index.ts
+++ b/packages/compose-tunnel-agent/src/docker/index.ts
@@ -1,2 +1,2 @@
-export * from './events-client'
-export * from './filtered-client'
+export * from './events-client.js'
+export * from './filtered-client.js'
diff --git a/packages/compose-tunnel-agent/src/docker/services.ts b/packages/compose-tunnel-agent/src/docker/services.ts
index 3b9ee502..25189464 100644
--- a/packages/compose-tunnel-agent/src/docker/services.ts
+++ b/packages/compose-tunnel-agent/src/docker/services.ts
@@ -1,7 +1,7 @@
 import { ScriptInjection, COMPOSE_TUNNEL_AGENT_SERVICE_LABELS as PREEVY_LABELS, parseScriptInjectionLabels } from '@preevy/common'
 import Docker from 'dockerode'
-import { portFilter } from './filters'
-import { COMPOSE_PROJECT_LABEL, COMPOSE_SERVICE_LABEL } from './labels'
+import { portFilter } from './filters.js'
+import { COMPOSE_PROJECT_LABEL, COMPOSE_SERVICE_LABEL } from './labels.js'
 
 export type RunningService = {
   project: string
diff --git a/packages/compose-tunnel-agent/src/metadata.ts b/packages/compose-tunnel-agent/src/metadata.ts
index bd80c1f3..36ec10c8 100644
--- a/packages/compose-tunnel-agent/src/metadata.ts
+++ b/packages/compose-tunnel-agent/src/metadata.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { Logger } from '@preevy/common'
-import { merge } from 'lodash'
+import { merge } from 'lodash-es'
 import { inspect } from 'util'
 
 const parseMetadataFileLis = (s?: string): string[] => {
diff --git a/packages/compose-tunnel-agent/src/ssh/index.ts b/packages/compose-tunnel-agent/src/ssh/index.ts
index 2d9cb0eb..258be2cf 100644
--- a/packages/compose-tunnel-agent/src/ssh/index.ts
+++ b/packages/compose-tunnel-agent/src/ssh/index.ts
@@ -1,2 +1,2 @@
-export { sshClient } from './tunnel-client'
-export type { SshState } from './tunnel-client'
+export { sshClient } from './tunnel-client.js'
+export type { SshState } from './tunnel-client.js'
diff --git a/packages/compose-tunnel-agent/src/ssh/tunnel-client.ts b/packages/compose-tunnel-agent/src/ssh/tunnel-client.ts
index dc0f34d3..1bdee76c 100644
--- a/packages/compose-tunnel-agent/src/ssh/tunnel-client.ts
+++ b/packages/compose-tunnel-agent/src/ssh/tunnel-client.ts
@@ -2,8 +2,8 @@ import { baseSshClient, HelloResponse, ScriptInjection, SshClientOpts, TunnelNam
 import net from 'net'
 import plimit from 'p-limit'
 import { inspect } from 'util'
-import { RunningService } from '../docker'
-import { difference } from '../maps'
+import { RunningService } from '../docker/index.js'
+import { difference } from '../maps.js'
 
 type Forward = {
   service: RunningService
diff --git a/packages/compose-tunnel-agent/tsconfig.json b/packages/compose-tunnel-agent/tsconfig.json
index 18fd308b..93fe7106 100644
--- a/packages/compose-tunnel-agent/tsconfig.json
+++ b/packages/compose-tunnel-agent/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2022"],
-    "module": "CommonJS",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
     "target": "ES2022",
-    "moduleResolution": "node",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -22,6 +22,9 @@
     "composite": true,
     "outDir": "dist",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["index.ts", "src/**/*" ],
   "exclude": ["lint-staged.config.cjs"],
   "references": [
diff --git a/packages/core/.eslintignore b/packages/core/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/core/.eslintignore
+++ b/packages/core/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/core/.eslintrc.cjs b/packages/core/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/core/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/core/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/core/jest.config.cjs b/packages/core/jest.config.cjs
new file mode 100644
index 00000000..d69d187d
--- /dev/null
+++ b/packages/core/jest.config.cjs
@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  testMatch: ['!dist/', '**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.+)\\.js$': '$1',
+  },
+}
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
deleted file mode 100644
index 1fd541c2..00000000
--- a/packages/core/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testMatch: ['!dist/', '**/*.test.ts'],
-};
\ No newline at end of file
diff --git a/packages/core/package.json b/packages/core/package.json
index 0bd2f0cd..4fc31b12 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/core",
   "version": "0.0.58",
   "description": "Core functionality for Preevy",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "types": "dist/index.d.ts",
   "files": [
     "dist"
@@ -13,14 +16,13 @@
     "@preevy/compose-tunnel-agent": "0.0.58",
     "chalk": "^4.1.2",
     "fast-safe-stringify": "^2.1.1",
-    "inquirer": "^8.0.0",
+    "@inquirer/prompts": "^3.3.0",
     "is-stream": "^2.0.1",
     "iter-tools-es": "^7.5.3",
     "jose": "^4.14.4",
     "jsonwebtoken": "^9.0.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "minimatch": "^9.0.3",
-    "node-fetch": "2.6.9",
     "node-forge": "^1.3.1",
     "open": "^8.4.2",
     "ora": "5.4.1",
@@ -28,7 +30,7 @@
     "p-memoize": "^4",
     "p-queue": "^6.6.2",
     "p-retry": "^4.6.2",
-    "rimraf": "^5.0.0",
+    "rimraf": "^5.0.5",
     "shell-escape": "^0.2.0",
     "shell-quote-word": "^1.0.1",
     "source-map-support": "^0.5.21",
@@ -44,7 +46,7 @@
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
     "@types/is-stream": "^2.0.0",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/node-fetch": "^2.6.3",
     "@types/node-forge": "^1.3.1",
@@ -54,8 +56,8 @@
     "@types/sshpk": "^1.17.1",
     "@types/tar": "^6.1.4",
     "@types/tar-stream": "^2.2.2",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.27.5",
@@ -68,10 +70,10 @@
     "ts-jest": "29.1.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
-    "test": "yarn jest",
+    "test": "yarn node --experimental-vm-modules ../../node_modules/.bin/jest",
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
     "build": "tsc -b",
diff --git a/packages/core/src/build/image-tag.test.ts b/packages/core/src/build/image-tag.test.ts
new file mode 100644
index 00000000..fc7ad283
--- /dev/null
+++ b/packages/core/src/build/image-tag.test.ts
@@ -0,0 +1,96 @@
+import { beforeEach, describe, it, expect } from '@jest/globals'
+import { GitContext } from '../git.js'
+import { FsReader } from '../store/index.js'
+import { MockFunctions, mockFunction } from '../test-helpers.js'
+import { ImageTagCalculator, imageTagCalculator } from './image-tag.js'
+
+describe('imageTagCalculator', () => {
+  const dockerfileContents = 'FROM my-image'
+
+  type PartialGitContext = Pick<GitContext, 'commit' | 'localChanges'>
+
+  let mockReader: MockFunctions<FsReader>
+  beforeEach(() => {
+    mockReader = { read: mockFunction<FsReader['read']>() }
+  })
+
+  let mockGitContextCreator: () => PartialGitContext
+  let mockGitContext: MockFunctions<PartialGitContext>
+  beforeEach(() => {
+    mockGitContext = {
+      commit: mockFunction<GitContext['commit']>(async () => 'abcdef'),
+      localChanges: mockFunction<GitContext['localChanges']>(async () => ''),
+    }
+    mockGitContextCreator = mockFunction<() => PartialGitContext>(() => mockGitContext)
+  })
+
+  describe('sanity', () => {
+    let c: ImageTagCalculator
+    let tag: string
+
+    beforeEach(async () => {
+      c = imageTagCalculator({
+        gitContext: mockGitContextCreator,
+        fsReader: mockReader,
+      })
+
+      tag = await c({
+        context: '/context',
+        dockerfile: 'Dockerfile',
+      })
+    })
+
+    it('should call the commit function correctly', async () => {
+      expect(mockGitContext.commit).toHaveBeenCalledWith({ short: true })
+    })
+
+    it('should generate a tag', async () => {
+      expect(tag).toMatch(/^[a-z0-9-]+$/)
+    })
+
+    it('should generate the same tag for the same build', async () => {
+      expect(await c({
+        context: '/context',
+        dockerfile: 'Dockerfile',
+      })).toEqual(tag)
+    })
+
+    it('should generate the same tag if the dockerfile path changed', async () => {
+      expect(await c({
+        context: '/context',
+        dockerfile: 'Dockerfile.a',
+      })).toEqual(tag)
+    })
+
+    it('should generate a different tag if the context changed', async () => {
+      expect(await c({
+        context: '/context/a',
+        dockerfile: 'Dockerfile',
+      })).not.toEqual(tag)
+    })
+
+    it('should generate a different tag if the dockerfile contents changed', async () => {
+      mockReader.read.mockResolvedValue(Buffer.from(`${dockerfileContents}a`))
+      expect(await c({
+        context: '/context/a',
+        dockerfile: 'Dockerfile',
+      })).not.toEqual(tag)
+    })
+
+    it('should generate a different tag if the build args changed', async () => {
+      expect(await c({
+        context: '/context/a',
+        dockerfile: 'Dockerfile',
+        args: { foo: 'bar' },
+      })).not.toEqual(tag)
+    })
+
+    it('should generate a different tag if the build target changed', async () => {
+      expect(await c({
+        context: '/context/a',
+        dockerfile: 'Dockerfile',
+        target: 'dev',
+      })).not.toEqual(tag)
+    })
+  })
+})
diff --git a/packages/core/src/build/image-tag.ts b/packages/core/src/build/image-tag.ts
new file mode 100644
index 00000000..2b742e5c
--- /dev/null
+++ b/packages/core/src/build/image-tag.ts
@@ -0,0 +1,68 @@
+import crypto from 'crypto'
+import path from 'path'
+import url from 'url'
+import { memoize } from 'lodash-es'
+import { ComposeBuild } from '../compose/index.js'
+import { GitContext } from '../git.js'
+import { FsReader } from '../store/index.js'
+import { tryParseUrl } from '../url.js'
+import { randomString } from '../strings.js'
+
+export type ImageTagCalculator = (build: ComposeBuild) => Promise<string>
+
+export const imageTagCalculator = ({ gitContext, fsReader }: {
+  gitContext: (dir: string) => Pick<GitContext, 'commit' | 'localChanges'>
+  fsReader: FsReader
+}) => {
+  const calcGitHash = async (dir: string) => {
+    const gitCtx = gitContext(dir)
+    const commitHash = await gitCtx.commit({ short: true })
+    if (!commitHash) {
+      return undefined
+    }
+    const localChanges = await gitCtx.localChanges()
+    return localChanges
+      ? [commitHash, crypto.createHash('sha1').update(localChanges).digest('hex').substring(0, 8)].join('-')
+      : commitHash
+  }
+
+  const memoizedCalcGitHash = memoize(calcGitHash)
+
+  const readDockerfileContents = async ({ context, ...build }: ComposeBuild) => {
+    if ('dockerfile_inline' in build) {
+      return build.dockerfile_inline
+    }
+
+    const { dockerfile } = build
+
+    const contextUrl = tryParseUrl(context)
+
+    if (!contextUrl) {
+      return await fsReader.read(path.resolve(context, dockerfile))
+    }
+
+    if (contextUrl.protocol.startsWith('file:')) {
+      return await fsReader.read(path.resolve(url.fileURLToPath(context), dockerfile))
+    }
+
+    return undefined // TODO: attempt to fetch remote URL
+  }
+
+  return async (build: ComposeBuild) => {
+    const contextGitHash = await memoizedCalcGitHash(build.context)
+    if (!contextGitHash) {
+      return randomString.lowercaseNumeric(8)
+    }
+
+    const hash = crypto.createHash('sha1').update(build.context).update(build.target ?? '')
+
+    const dockerfileContents = await readDockerfileContents(build)
+    hash.update(dockerfileContents ?? '')
+
+    if (build.args) {
+      hash.update(JSON.stringify(build.args))
+    }
+
+    return [contextGitHash, hash.digest().toString('hex').substring(0, 8)].join('-')
+  }
+}
diff --git a/packages/core/src/build.test.ts b/packages/core/src/build/index.test.ts
similarity index 76%
rename from packages/core/src/build.test.ts
rename to packages/core/src/build/index.test.ts
index 4c887016..9814310c 100644
--- a/packages/core/src/build.test.ts
+++ b/packages/core/src/build/index.test.ts
@@ -1,6 +1,8 @@
-import { describe, it, expect, beforeEach } from '@jest/globals'
-import { ImageRegistry, generateBuild, parseRegistry } from './build'
-import { ComposeModel, ComposeService } from './compose'
+import { describe, it, expect, beforeEach, jest } from '@jest/globals'
+import { ImageRegistry, generateBuild, parseRegistry } from './index.js'
+import { ComposeModel, ComposeService } from '../compose/index.js'
+import { ImageTagCalculator } from './image-tag.js'
+import { mockFunction } from '../test-helpers.js'
 
 describe('build', () => {
   const ECR_BASE_REGISTRY = '123456789.dkr.ecr.us-east-1.amazonaws.com'
@@ -84,18 +86,25 @@ describe('build', () => {
   })
 
   describe('generateBuild', () => {
-    let result: ReturnType<typeof generateBuild>
+    let result: Awaited<ReturnType<typeof generateBuild>>
     let bakeArgs: string[]
 
+    let mockTagCalculator: jest.MockedFunction<ImageTagCalculator>
+    beforeEach(() => {
+      mockTagCalculator = mockFunction<ImageTagCalculator>(async () => 'abcdef')
+    })
+
     describe('sanity', () => {
-      beforeEach(() => {
-        result = generateBuild({
+      beforeEach(async () => {
+        result = await generateBuild({
+          imageTagCalculator: mockTagCalculator,
           composeModel: {
             name: 'my-project',
             services: {
               frontend: {
                 build: {
-                  context: '.',
+                  context: '/context',
+                  dockerfile: 'x/Dockerfile',
                   target: 'dev',
                 },
                 environment: {
@@ -114,7 +123,6 @@ describe('build', () => {
             registry: { registry: 'my-registry' },
           },
           machineDockerPlatform: 'linux/amd64',
-          gitHash: 'abcdef',
         })
 
         bakeArgs = result.createBakeArgs('my-file.yaml')
@@ -126,7 +134,8 @@ describe('build', () => {
           services: {
             frontend: {
               build: {
-                context: '.',
+                context: '/context',
+                dockerfile: 'x/Dockerfile',
                 target: 'dev',
                 cache_from: [
                   'my-registry/preevy-my-project-frontend:latest',
@@ -161,7 +170,8 @@ describe('build', () => {
           services: {
             frontend: {
               build: {
-                context: '.',
+                context: '/context',
+                dockerfile: 'x/Dockerfile',
                 target: 'dev',
               },
               image: 'my-registry/preevy-my-project-frontend:abcdef',
@@ -178,14 +188,16 @@ describe('build', () => {
     })
 
     describe('ECR-style registry', () => {
-      beforeEach(() => {
-        result = generateBuild({
+      beforeEach(async () => {
+        result = await generateBuild({
+          imageTagCalculator: mockTagCalculator,
           composeModel: {
             name: 'my-project',
             services: {
               frontend: {
                 build: {
-                  context: '.',
+                  context: '/context',
+                  dockerfile_inline: 'bla',
                   target: 'dev',
                 },
                 environment: {
@@ -204,7 +216,6 @@ describe('build', () => {
             registry: { registry: 'my-registry', singleName: 'my-repo' },
           },
           machineDockerPlatform: 'linux/amd64',
-          gitHash: 'abcdef',
         })
       })
 
@@ -235,14 +246,16 @@ describe('build', () => {
     })
 
     describe('when no registry is given', () => {
-      beforeEach(() => {
-        result = generateBuild({
+      beforeEach(async () => {
+        result = await generateBuild({
+          imageTagCalculator: mockTagCalculator,
           composeModel: {
             name: 'my-project',
             services: {
               frontend: {
                 build: {
-                  context: '.',
+                  context: '/context',
+                  dockerfile: 'x/Dockerfile',
                   target: 'dev',
                 },
                 environment: {
@@ -261,7 +274,6 @@ describe('build', () => {
             registry: undefined,
           },
           machineDockerPlatform: 'linux/amd64',
-          gitHash: 'abcdef',
         })
 
         bakeArgs = result.createBakeArgs('my-file.yaml')
@@ -291,81 +303,17 @@ describe('build', () => {
       })
     })
 
-    describe('when no git hash is given', () => {
-      beforeEach(() => {
-        result = generateBuild({
-          composeModel: {
-            name: 'my-project',
-            services: {
-              frontend: {
-                build: {
-                  context: '.',
-                  target: 'dev',
-                },
-                environment: {
-                  FOO: 'bar',
-                },
-              },
-              backend: {
-                build: { context: '.' },
-              },
-              db: {
-                image: 'mydb',
-              },
-            },
-          },
-          buildSpec: {
-            builder: 'my-builder',
-            cacheFromRegistry: true,
-            noCache: false,
-            registry: { registry: 'my-registry' },
-          },
-          machineDockerPlatform: 'linux/amd64',
-          gitHash: undefined,
-        })
-
-        bakeArgs = result.createBakeArgs('my-file.yaml')
-      })
-
-      describe('build model', () => {
-        it('should contain a random tag', () => {
-          expect(result.buildModel.services?.frontend).toMatchObject({
-            build: {
-              tags: [
-                'my-registry/preevy-my-project-frontend:latest',
-                expect.stringMatching(/^my-registry\/preevy-my-project-frontend:[a-z0-9]{8}$/),
-              ],
-            },
-            image: expect.stringMatching(/^my-registry\/preevy-my-project-frontend:[a-z0-9]{8}$/),
-          })
-        })
-
-        it('should match the image', () => {
-          expect(result.buildModel.services?.frontend?.build?.tags).toContain(
-            result.buildModel.services?.frontend?.image,
-          )
-          expect(result.deployModel.services?.frontend?.image).toEqual(
-            result.buildModel.services?.frontend?.image,
-          )
-        })
-
-        it('should match the random tag of the other service', () => {
-          const backendRandomTag = result.buildModel.services?.backend?.image?.split?.(':')?.[1] as string
-          expect(backendRandomTag).toMatch(/^[a-z0-9]{8}$/)
-          expect(backendRandomTag).toEqual(result.buildModel.services?.backend?.image?.split?.(':')?.[1])
-        })
-      })
-    })
-
     describe('when buildSpec.cacheFromRegistry=false and an image is given', () => {
-      beforeEach(() => {
-        result = generateBuild({
+      beforeEach(async () => {
+        result = await generateBuild({
+          imageTagCalculator: mockTagCalculator,
           composeModel: {
             name: 'my-project',
             services: {
               frontend: {
                 build: {
-                  context: '.',
+                  context: '/context',
+                  dockerfile: 'x/Dockerfile',
                   target: 'dev',
                   cache_from: ['cf1', 'cf2'],
                   cache_to: ['ct1'],
@@ -387,7 +335,6 @@ describe('build', () => {
             registry: { registry: 'my-registry' },
           },
           machineDockerPlatform: 'linux/amd64',
-          gitHash: 'abcdef',
         })
 
         bakeArgs = result.createBakeArgs('my-file.yaml')
@@ -396,7 +343,8 @@ describe('build', () => {
       it('should return a correct build model', () => {
         expect(result.buildModel.services?.frontend).toMatchObject({
           build: {
-            context: '.',
+            context: '/context',
+            dockerfile: 'x/Dockerfile',
             target: 'dev',
             tags: [
               'my-registry/preevy-my-project-frontend:latest',
diff --git a/packages/core/src/build.ts b/packages/core/src/build/index.ts
similarity index 84%
rename from packages/core/src/build.ts
rename to packages/core/src/build/index.ts
index c20d962f..260564fd 100644
--- a/packages/core/src/build.ts
+++ b/packages/core/src/build/index.ts
@@ -1,7 +1,8 @@
-import { mapValues, pickBy } from 'lodash'
-import { ComposeModel } from './compose'
-import { randomString } from './strings'
-import { hasProp } from './nulls'
+import { mapValues, pickBy } from 'lodash-es'
+import { ComposeModel } from '../compose/index.js'
+import { hasProp } from '../nulls.js'
+import { asyncMapValues } from '../async.js'
+import { ImageTagCalculator } from './image-tag.js'
 
 export type ImageRegistry = { registry: string; singleName?: string }
 
@@ -36,19 +37,17 @@ const registryImageRefFactory = ({ registry, singleName }: ImageRegistry): Image
     : ({ image, tag }) => `${registry}/${image}:${tag}`
 )
 
-export const generateBuild = ({
+export const generateBuild = async ({
   composeModel,
   buildSpec,
   machineDockerPlatform,
-  gitHash,
+  imageTagCalculator,
 }: {
   composeModel: ComposeModel
   buildSpec: BuildSpec
   machineDockerPlatform: string
-  gitHash: string | undefined
+  imageTagCalculator: ImageTagCalculator
 }) => {
-  const tagSuffix = gitHash ?? randomString.lowercaseNumeric(8)
-
   const imageRef = buildSpec.registry
     ? registryImageRefFactory(buildSpec.registry)
     : plainImageRefFactory
@@ -58,11 +57,12 @@ export const generateBuild = ({
     tag,
   })
 
-  const services = mapValues(
+  const services = await asyncMapValues(
     pickBy(composeModel.services ?? {}, hasProp('build')),
-    ({ build, image }, serviceName) => {
+    async ({ build, image }, serviceName) => {
       const latestImage = imageRefForService(serviceName, 'latest')
-      const thisImage = imageRefForService(serviceName, tagSuffix)
+      const serviceTagSuffix = await imageTagCalculator(build)
+      const thisImage = imageRefForService(serviceName, serviceTagSuffix)
 
       const cacheFrom = build.cache_from ?? []
       const cacheTo = build.cache_to ?? []
diff --git a/packages/core/src/ci-providers/azure-pipelines.ts b/packages/core/src/ci-providers/azure-pipelines.ts
index 272207f1..e1c59ba6 100644
--- a/packages/core/src/ci-providers/azure-pipelines.ts
+++ b/packages/core/src/ci-providers/azure-pipelines.ts
@@ -1,5 +1,5 @@
-import { CiProvider } from './base'
-import { stringOrUndefinedToNumber } from './common'
+import { CiProvider } from './base.js'
+import { stringOrUndefinedToNumber } from './common.js'
 
 // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml
 export const azurePipelinesCiProvider = (): CiProvider => ({
diff --git a/packages/core/src/ci-providers/circle.ts b/packages/core/src/ci-providers/circle.ts
index d76ede2d..4f820e0d 100644
--- a/packages/core/src/ci-providers/circle.ts
+++ b/packages/core/src/ci-providers/circle.ts
@@ -1,5 +1,5 @@
-import { CiProvider } from './base'
-import { extractPrNumberFromUrlPath, stringOrUndefinedToNumber } from './common'
+import { CiProvider } from './base.js'
+import { extractPrNumberFromUrlPath, stringOrUndefinedToNumber } from './common.js'
 
 // https://circleci.com/docs/variables/#built-in-environment-variables
 export const circleCiProvider = (): CiProvider => ({
diff --git a/packages/core/src/ci-providers/common.ts b/packages/core/src/ci-providers/common.ts
index 49cbb6a9..10d3866b 100644
--- a/packages/core/src/ci-providers/common.ts
+++ b/packages/core/src/ci-providers/common.ts
@@ -1,4 +1,4 @@
-import { tryParseUrl } from '../url'
+import { tryParseUrl } from '../url.js'
 
 export const nanToUndefined = (value: number) => (Number.isNaN(value) ? undefined : value)
 
diff --git a/packages/core/src/ci-providers/github-actions.ts b/packages/core/src/ci-providers/github-actions.ts
index bc04d612..d967f0d7 100644
--- a/packages/core/src/ci-providers/github-actions.ts
+++ b/packages/core/src/ci-providers/github-actions.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
-import { CiProvider } from './base'
-import { stringOrUndefinedToNumber } from './common'
+import { CiProvider } from './base.js'
+import { stringOrUndefinedToNumber } from './common.js'
 
 const readEventPayload = () => (
   process.env.GITHUB_EVENT_PATH
diff --git a/packages/core/src/ci-providers/gitlab.ts b/packages/core/src/ci-providers/gitlab.ts
index 6797d781..83d9ff40 100644
--- a/packages/core/src/ci-providers/gitlab.ts
+++ b/packages/core/src/ci-providers/gitlab.ts
@@ -1,5 +1,5 @@
-import { CiProvider } from './base'
-import { stringOrUndefinedToNumber } from './common'
+import { CiProvider } from './base.js'
+import { stringOrUndefinedToNumber } from './common.js'
 
 // https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
 export const gitlabActionsCiProvider = (): CiProvider => ({
diff --git a/packages/core/src/ci-providers/index.ts b/packages/core/src/ci-providers/index.ts
index 67312470..57398aec 100644
--- a/packages/core/src/ci-providers/index.ts
+++ b/packages/core/src/ci-providers/index.ts
@@ -1,9 +1,9 @@
-import { azurePipelinesCiProvider } from './azure-pipelines'
-import { CiProvider } from './base'
-import { circleCiProvider } from './circle'
-import { githubActionsCiProvider } from './github-actions'
-import { gitlabActionsCiProvider } from './gitlab'
-import { travisCiProvider } from './travis'
+import { azurePipelinesCiProvider } from './azure-pipelines.js'
+import { CiProvider } from './base.js'
+import { circleCiProvider } from './circle.js'
+import { githubActionsCiProvider } from './github-actions.js'
+import { gitlabActionsCiProvider } from './gitlab.js'
+import { travisCiProvider } from './travis.js'
 
 export const ciProviders = {
   githubActions: githubActionsCiProvider(),
@@ -16,4 +16,4 @@ export const ciProviders = {
 export const detectCiProvider = (): CiProvider | undefined => Object.values(ciProviders)
   .find(p => p.currentlyRunningInProvider())
 
-export { CiProvider } from './base'
+export { CiProvider } from './base.js'
diff --git a/packages/core/src/ci-providers/travis.ts b/packages/core/src/ci-providers/travis.ts
index 6d11400c..1627b7cb 100644
--- a/packages/core/src/ci-providers/travis.ts
+++ b/packages/core/src/ci-providers/travis.ts
@@ -1,5 +1,5 @@
-import { CiProvider } from './base'
-import { nanToUndefined } from './common'
+import { CiProvider } from './base.js'
+import { nanToUndefined } from './common.js'
 
 // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
 export const travisCiProvider = (): CiProvider => ({
diff --git a/packages/core/src/commands/build.ts b/packages/core/src/commands/build.ts
index cf829633..9acd847b 100644
--- a/packages/core/src/commands/build.ts
+++ b/packages/core/src/commands/build.ts
@@ -2,13 +2,13 @@ import fs from 'fs'
 import path from 'path'
 import yaml from 'yaml'
 import { spawn } from 'child_process'
-import { ComposeModel } from '../compose'
-import { Logger } from '../log'
-import { BuildSpec, generateBuild } from '../build'
-import { gitContext } from '../git'
-import { childProcessPromise } from '../child-process'
-import { telemetryEmitter } from '../telemetry'
-import { measureTime } from '../timing'
+import { ComposeModel } from '../compose/index.js'
+import { Logger } from '../log.js'
+import { BuildSpec, generateBuild } from '../build/index.js'
+import { childProcessPromise } from '../child-process.js'
+import { telemetryEmitter } from '../telemetry/index.js'
+import { measureTime } from '../timing.js'
+import { ImageTagCalculator } from '../build/image-tag.js'
 
 const buildCommand = async ({
   log,
@@ -18,6 +18,7 @@ const buildCommand = async ({
   buildSpec,
   machineDockerPlatform,
   env,
+  imageTagCalculator,
 }: {
   log: Logger
   composeModel: ComposeModel
@@ -26,12 +27,13 @@ const buildCommand = async ({
   buildSpec: BuildSpec
   machineDockerPlatform: string
   env?: Record<string, string>
+  imageTagCalculator: ImageTagCalculator
 }) => {
-  const { buildModel, createBakeArgs, deployModel } = generateBuild({
+  const { buildModel, createBakeArgs, deployModel } = await generateBuild({
     composeModel,
     buildSpec,
-    gitHash: await gitContext(cwd)?.commit({ short: true }),
     machineDockerPlatform,
+    imageTagCalculator,
   })
 
   const modelStr = yaml.stringify(buildModel)
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 59b95d9c..d6ca702c 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -1,6 +1,6 @@
-export { default as up } from './up'
-export { default as ls } from './ls'
-export { default as shell } from './shell'
+export { default as up } from './up.js'
+export { default as ls } from './ls.js'
+export { default as shell } from './shell.js'
 
-export { urls } from './urls'
-export * as proxy from './proxy'
+export { urls } from './urls.js'
+export * as proxy from './proxy.js'
diff --git a/packages/core/src/commands/ls.ts b/packages/core/src/commands/ls.ts
index b2dc0c40..e43fc0c7 100644
--- a/packages/core/src/commands/ls.ts
+++ b/packages/core/src/commands/ls.ts
@@ -1,5 +1,5 @@
-import { Logger } from '../log'
-import { MachineDriver } from '../driver/driver'
+import { Logger } from '../log.js'
+import { MachineDriver } from '../driver/driver.js'
 
 const ls = async ({
   machineDriver,
diff --git a/packages/core/src/commands/model.ts b/packages/core/src/commands/model.ts
index 771456b1..85a0865d 100644
--- a/packages/core/src/commands/model.ts
+++ b/packages/core/src/commands/model.ts
@@ -1,11 +1,11 @@
 import { MachineStatusCommand, ScriptInjection } from '@preevy/common'
 import path from 'path'
 import { rimraf } from 'rimraf'
-import { TunnelOpts } from '../ssh'
-import { ComposeModel, remoteComposeModel } from '../compose'
-import { createCopiedFileInDataDir } from '../remote-files'
-import { Logger } from '../log'
-import { EnvId } from '../env-id'
+import { TunnelOpts } from '../ssh/index.js'
+import { ComposeModel, remoteComposeModel } from '../compose/index.js'
+import { createCopiedFileInDataDir } from '../remote-files.js'
+import { Logger } from '../log.js'
+import { EnvId } from '../env-id.js'
 
 const composeModel = async ({
   debug,
diff --git a/packages/core/src/commands/proxy.ts b/packages/core/src/commands/proxy.ts
index bca659a6..57ff930e 100644
--- a/packages/core/src/commands/proxy.ts
+++ b/packages/core/src/commands/proxy.ts
@@ -2,14 +2,14 @@ import { COMPOSE_TUNNEL_AGENT_PORT, COMPOSE_TUNNEL_AGENT_SERVICE_NAME, tunnelNam
 import { mkdtemp, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { tmpdir } from 'node:os'
-import { set } from 'lodash'
-import { Connection } from '../tunneling'
-import { execPromiseStdout } from '../child-process'
-import { addComposeTunnelAgentService } from '../compose-tunnel-agent-client'
-import { ComposeModel } from '../compose'
-import { TunnelOpts } from '../ssh'
-import { EnvId } from '../env-id'
-import { EnvMetadata, detectGitMetadata } from '../env-metadata'
+import { set } from 'lodash-es'
+import { Connection } from '../tunneling/index.js'
+import { execPromiseStdout } from '../child-process.js'
+import { addComposeTunnelAgentService } from '../compose-tunnel-agent-client.js'
+import { ComposeModel } from '../compose/index.js'
+import { TunnelOpts } from '../ssh/index.js'
+import { EnvId } from '../env-id.js'
+import { EnvMetadata, detectGitMetadata } from '../env-metadata.js'
 
 export const agentServiceName = COMPOSE_TUNNEL_AGENT_SERVICE_NAME
 
diff --git a/packages/core/src/commands/shell.ts b/packages/core/src/commands/shell.ts
index c3721229..82c0ea76 100644
--- a/packages/core/src/commands/shell.ts
+++ b/packages/core/src/commands/shell.ts
@@ -1,5 +1,5 @@
-import { MachineDriver, isPartialMachine } from '../driver'
-import { Logger } from '../log'
+import { MachineDriver, isPartialMachine } from '../driver/index.js'
+import { Logger } from '../log.js'
 
 const shell = async ({
   envId,
diff --git a/packages/core/src/commands/up.ts b/packages/core/src/commands/up.ts
index 331b7d48..e9cbf190 100644
--- a/packages/core/src/commands/up.ts
+++ b/packages/core/src/commands/up.ts
@@ -1,19 +1,22 @@
 import { MachineStatusCommand, ScriptInjection } from '@preevy/common'
 import yaml from 'yaml'
-import { TunnelOpts } from '../ssh'
-import { ComposeModel, composeModelFilename, localComposeClient } from '../compose'
-import { dockerEnvContext } from '../docker'
-import { MachineConnection } from '../driver'
-import { remoteProjectDir } from '../remote-files'
-import { Logger } from '../log'
-import { FileToCopy, uploadWithSpinner } from '../upload-files'
-import { EnvId } from '../env-id'
-import { BuildSpec } from '../build'
-import modelCommand from './model'
-import buildCommand from './build'
-import { CommandExecuter } from '../command-executer'
-import { telemetryEmitter } from '../telemetry'
-import { measureTime } from '../timing'
+import { TunnelOpts } from '../ssh/index.js'
+import { ComposeModel, composeModelFilename, localComposeClient } from '../compose/index.js'
+import { dockerEnvContext } from '../docker.js'
+import { MachineConnection } from '../driver/index.js'
+import { remoteProjectDir } from '../remote-files.js'
+import { Logger } from '../log.js'
+import { FileToCopy, uploadWithSpinner } from '../upload-files/index.js'
+import { EnvId } from '../env-id.js'
+import { BuildSpec } from '../build/index.js'
+import modelCommand from './model.js'
+import buildCommand from './build.js'
+import { CommandExecuter } from '../command-executer.js'
+import { telemetryEmitter } from '../telemetry/index.js'
+import { measureTime } from '../timing.js'
+import { imageTagCalculator } from '../build/image-tag.js'
+import { gitContext } from '../git.js'
+import { localFs } from '../index.js'
 
 const uploadFiles = async ({
   log,
@@ -120,7 +123,6 @@ const up = async ({
 
   if (buildSpec) {
     await using dockerContext = await dockerEnvContext({ connection, log })
-
     composeModel = (await buildCommand({
       log,
       buildSpec,
@@ -129,6 +131,10 @@ const up = async ({
       projectLocalDataDir,
       machineDockerPlatform: dockerPlatform,
       env: dockerContext.env,
+      imageTagCalculator: imageTagCalculator({
+        gitContext,
+        fsReader: localFs('/'),
+      }),
     })).deployModel
   }
 
diff --git a/packages/core/src/commands/urls.ts b/packages/core/src/commands/urls.ts
index f9b4c901..6107229b 100644
--- a/packages/core/src/commands/urls.ts
+++ b/packages/core/src/commands/urls.ts
@@ -1,8 +1,8 @@
 import retry from 'p-retry'
 import { COMPOSE_TUNNEL_AGENT_SERVICE_NAME } from '@preevy/common'
-import { generateBasicAuthCredentials, jwtGenerator } from '../credentials'
-import { queryTunnels } from '../compose-tunnel-agent-client'
-import { FlatTunnel, flattenTunnels } from '../tunneling'
+import { generateBasicAuthCredentials, jwtGenerator } from '../credentials/index.js'
+import { queryTunnels } from '../compose-tunnel-agent-client.js'
+import { FlatTunnel, flattenTunnels } from '../tunneling/index.js'
 
 const tunnelFilter = ({ serviceAndPort, showPreevyService }: {
   serviceAndPort?: { service: string; port?: number }
diff --git a/packages/core/src/compose-tunnel-agent-client.ts b/packages/core/src/compose-tunnel-agent-client.ts
index 426d0c8c..4ca62817 100644
--- a/packages/core/src/compose-tunnel-agent-client.ts
+++ b/packages/core/src/compose-tunnel-agent-client.ts
@@ -1,26 +1,28 @@
 import path from 'path'
-import fetch from 'node-fetch'
 import retry from 'p-retry'
 import util from 'util'
-import { mapValues, merge } from 'lodash'
+import { createRequire } from 'module'
+import { mapValues, merge } from 'lodash-es'
 import { COMPOSE_TUNNEL_AGENT_PORT, COMPOSE_TUNNEL_AGENT_SERVICE_LABELS, COMPOSE_TUNNEL_AGENT_SERVICE_NAME, MachineStatusCommand, ScriptInjection, dateReplacer } from '@preevy/common'
-import { ComposeModel, ComposeService, composeModelFilename } from './compose/model'
-import { TunnelOpts } from './ssh/url'
-import { Tunnel } from './tunneling'
-import { withBasicAuthCredentials } from './credentials'
-import { EnvMetadata, driverMetadataFilename } from './env-metadata'
-import { REMOTE_DIR_BASE } from './remote-files'
-import { isPacked, pkgSnapshotDir } from './pkg'
-import { EnvId } from './env-id'
-import { addScriptInjectionsToServices } from './compose/script-injection'
+import { ComposeModel, ComposeService, composeModelFilename } from './compose/model.js'
+import { TunnelOpts } from './ssh/url.js'
+import { Tunnel } from './tunneling/index.js'
+import { withBasicAuthCredentials } from './credentials/index.js'
+import { EnvMetadata, driverMetadataFilename } from './env-metadata.js'
+import { REMOTE_DIR_BASE } from './remote-files.js'
+import { isPacked, pkgSnapshotDir } from './pkg.js'
+import { EnvId } from './env-id.js'
+import { addScriptInjectionsToServices } from './compose/script-injection.js'
 
+const require = createRequire(import.meta.url)
 const COMPOSE_TUNNEL_AGENT_DIR = path.join(path.dirname(require.resolve('@preevy/compose-tunnel-agent')), '..')
 
 const baseDockerProxyService = () => {
-  const contextDir = isPacked() ? pkgSnapshotDir(path.join(__dirname, '../../compose-tunnel-agent')) : COMPOSE_TUNNEL_AGENT_DIR
+  const contextDir = isPacked() ? pkgSnapshotDir(path.join(import.meta.url, '../../compose-tunnel-agent')) : COMPOSE_TUNNEL_AGENT_DIR
   return {
     build: {
       context: contextDir,
+      dockerfile: path.join(contextDir, 'Dockerfile'),
     },
     ports: [
       {
@@ -175,7 +177,7 @@ export const queryTunnels = async ({
   const { tunnels } = await retry(async () => {
     const r = await fetch(
       `${composeTunnelServiceUrl}/tunnels`,
-      { timeout: 2500, headers: { Authorization: `Bearer ${credentials.password}` } }
+      { signal: AbortSignal.timeout(2500), headers: { Authorization: `Bearer ${credentials.password}` } }
     )
     if (!r.ok) {
       throw new Error(`Failed to connect to docker proxy at ${composeTunnelServiceUrl}: ${r.status}: ${r.statusText}`)
diff --git a/packages/core/src/compose/client.ts b/packages/core/src/compose/client.ts
index 8706dbac..34dab1e5 100644
--- a/packages/core/src/compose/client.ts
+++ b/packages/core/src/compose/client.ts
@@ -2,8 +2,8 @@ import { ChildProcess, spawn, StdioOptions } from 'child_process'
 import yaml from 'yaml'
 import { WriteStream } from 'fs'
 import { RequiredProperties, hasPropertyDefined } from '@preevy/common'
-import { ComposeModel, ComposeService } from './model'
-import { childProcessPromise, childProcessStdoutPromise, ProcessError } from '../child-process'
+import { ComposeModel, ComposeService } from './model.js'
+import { childProcessPromise, childProcessStdoutPromise, ProcessError } from '../child-process.js'
 
 const DOCKER_COMPOSE_NO_CONFIGURATION_FILE_ERROR_CODE = 14
 
diff --git a/packages/core/src/compose/index.ts b/packages/core/src/compose/index.ts
index 2758584a..23eee98a 100644
--- a/packages/core/src/compose/index.ts
+++ b/packages/core/src/compose/index.ts
@@ -1,5 +1,5 @@
-export * from './client'
-export * from './model'
-export { resolveComposeFiles } from './files'
-export * from './remote'
-export * from './script-injection'
+export * from './client.js'
+export * from './model.js'
+export { resolveComposeFiles } from './files.js'
+export * from './remote.js'
+export * from './script-injection.js'
diff --git a/packages/core/src/compose/model.ts b/packages/core/src/compose/model.ts
index b9553e46..0e052412 100644
--- a/packages/core/src/compose/model.ts
+++ b/packages/core/src/compose/model.ts
@@ -1,4 +1,4 @@
-import { PreevyConfig } from '../config'
+import { PreevyConfig } from '../config.js'
 
 export type ComposeSecretOrConfig = {
   name: string
@@ -23,14 +23,14 @@ export type ComposeVolume = { type: 'volume' | 'tmpfs' | 'npipe' } | ComposeBind
 
 export type ComposeBuild = {
   context: string
+  args?: Record<string, string> | string[]
   target?: string
-  dockerfile?: string
   tags?: string[]
   cache_from?: string[]
   cache_to?: string[]
   platforms?: string[]
   no_cache?: boolean
-}
+} & ({ dockerfile: string } | { dockerfile_inline: string })
 
 type ComposePort = {
   mode: 'ingress'
diff --git a/packages/core/src/compose/remote.ts b/packages/core/src/compose/remote.ts
index 39f85ba7..f9f4bb23 100644
--- a/packages/core/src/compose/remote.ts
+++ b/packages/core/src/compose/remote.ts
@@ -1,21 +1,21 @@
 import yaml from 'yaml'
 import path from 'path'
-import { mapValues } from 'lodash'
+import { mapValues } from 'lodash-es'
 import { MMRegExp, makeRe } from 'minimatch'
 import { asyncMap, asyncToArray } from 'iter-tools-es'
 import { COMPOSE_TUNNEL_AGENT_SERVICE_NAME, MachineStatusCommand, ScriptInjection, formatPublicKey } from '@preevy/common'
-import { MachineConnection } from '../driver'
-import { ComposeBindVolume, ComposeModel, ComposeSecretOrConfig, composeModelFilename } from './model'
-import { REMOTE_DIR_BASE, remoteProjectDir } from '../remote-files'
-import { TunnelOpts } from '../ssh'
-import { addComposeTunnelAgentService } from '../compose-tunnel-agent-client'
-import { Logger } from '../log'
-import { FileToCopy } from '../upload-files'
-import { envMetadata } from '../env-metadata'
-import { EnvId } from '../env-id'
-import { asyncMapValues } from '../async'
-import { lstatOrUndefined } from '../files'
-import { localComposeClient } from './client'
+import { MachineConnection } from '../driver/index.js'
+import { ComposeModel, ComposeSecretOrConfig, composeModelFilename } from './model.js'
+import { REMOTE_DIR_BASE, remoteProjectDir } from '../remote-files.js'
+import { TunnelOpts } from '../ssh/index.js'
+import { addComposeTunnelAgentService } from '../compose-tunnel-agent-client.js'
+import { Logger } from '../log.js'
+import { FileToCopy } from '../upload-files/index.js'
+import { envMetadata } from '../env-metadata.js'
+import { EnvId } from '../env-id.js'
+import { asyncMapValues } from '../async.js'
+import { lstatOrUndefined } from '../files.js'
+import { localComposeClient } from './client.js'
 
 export const fetchRemoteUserModel = async (connection: MachineConnection) => {
   const userModelStr = (await connection.exec(`cat ${REMOTE_DIR_BASE}/projects/*/${composeModelFilename}`)).stdout
@@ -108,7 +108,11 @@ const fixModelForRemote = async (
         }
         const matchingVolumeSkipIndex = volumeSkipRes.findIndex(re => re.test(volume.source))
         if (matchingVolumeSkipIndex !== -1) {
-          skippedVolumes.push({ service: serviceName, source: volume.source, matchingRule: volumeSkipList[matchingVolumeSkipIndex] })
+          skippedVolumes.push({
+            service: serviceName,
+            source: volume.source,
+            matchingRule: volumeSkipList[matchingVolumeSkipIndex],
+          })
           return volume
         }
 
diff --git a/packages/core/src/compose/script-injection.test.ts b/packages/core/src/compose/script-injection.test.ts
index b5cc7e73..c158b068 100644
--- a/packages/core/src/compose/script-injection.test.ts
+++ b/packages/core/src/compose/script-injection.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, jest, beforeEach, it } from '@jest/globals'
 import { ScriptInjection } from '@preevy/common'
-import { ComposeModel } from './model'
-import { addScriptInjectionsToServices } from './script-injection'
+import { ComposeModel } from './model.js'
+import { addScriptInjectionsToServices } from './script-injection.js'
 
 describe('addScriptInjectionsToModel', () => {
   const model: ComposeModel['services'] = Object.freeze({
diff --git a/packages/core/src/compose/script-injection.ts b/packages/core/src/compose/script-injection.ts
index 9de6177d..874d1738 100644
--- a/packages/core/src/compose/script-injection.ts
+++ b/packages/core/src/compose/script-injection.ts
@@ -1,6 +1,6 @@
 import { ScriptInjection, scriptInjectionsToLabels } from '@preevy/common'
-import { mapValues } from 'lodash'
-import { ComposeModel, ComposeService } from './model'
+import { mapValues } from 'lodash-es'
+import { ComposeModel, ComposeService } from './model.js'
 
 const addScriptInjectionsToService = (
   service: ComposeService,
diff --git a/packages/core/src/docker.ts b/packages/core/src/docker.ts
index 1848a3d7..a646de51 100644
--- a/packages/core/src/docker.ts
+++ b/packages/core/src/docker.ts
@@ -1,7 +1,7 @@
-import { omitBy } from 'lodash'
-import { Logger } from './log'
-import { MachineConnection, ForwardSocket } from './driver'
-import { withSpinner } from './spinner'
+import { omitBy } from 'lodash-es'
+import { Logger } from './log.js'
+import { MachineConnection, ForwardSocket } from './driver/index.js'
+import { withSpinner } from './spinner.js'
 
 // export type FuncWrapper = <Return, Args extends unknown[] = []>(
 //   f: (...args: Args) => Promise<Return>,
diff --git a/packages/core/src/driver/driver.ts b/packages/core/src/driver/driver.ts
index 7f469a1a..5cd7d2dc 100644
--- a/packages/core/src/driver/driver.ts
+++ b/packages/core/src/driver/driver.ts
@@ -1,10 +1,10 @@
 import { MachineStatusCommand } from '@preevy/common'
-import { PartialStdioOptions } from '../child-process'
-import { CommandExecuter } from '../command-executer'
-import { Profile } from '../profile'
-import { MachineBase, PartialMachine, Resource, SpecDiffItem } from './machine-model'
-import { Store } from '../store'
-import { Logger } from '../log'
+import { PartialStdioOptions } from '../child-process.js'
+import { CommandExecuter } from '../command-executer.js'
+import { Profile } from '../profile/index.js'
+import { MachineBase, PartialMachine, Resource, SpecDiffItem } from './machine-model.js'
+import { Store } from '../store/index.js'
+import { Logger } from '../log.js'
 
 export type ForwardSocket = AsyncDisposable & {
   address: { host: string; port: number }
diff --git a/packages/core/src/driver/index.ts b/packages/core/src/driver/index.ts
index 6a9373c0..5f207b98 100644
--- a/packages/core/src/driver/index.ts
+++ b/packages/core/src/driver/index.ts
@@ -6,10 +6,10 @@ export {
   Resource,
   MachineResource,
   machineResourceType,
-} from './machine-model'
-export * from './machine-operations'
-export { SshMachine, sshDriver, getStoredKey, getStoredKeyOrUndefined } from './ssh'
-export { machineStatusNodeExporterCommand } from './machine-status-node-exporter'
+} from './machine-model.js'
+export * from './machine-operations.js'
+export { SshMachine, sshDriver, getStoredKey, getStoredKeyOrUndefined } from './ssh.js'
+export { machineStatusNodeExporterCommand } from './machine-status-node-exporter.js'
 export {
   MachineDriver,
   MachineCreationResult,
@@ -18,4 +18,4 @@ export {
   MachineDriverFactory,
   MachineConnection,
   ForwardSocket,
-} from './driver'
+} from './driver.js'
diff --git a/packages/core/src/driver/machine-operations.ts b/packages/core/src/driver/machine-operations.ts
index 26e4f75c..dad3ac29 100644
--- a/packages/core/src/driver/machine-operations.ts
+++ b/packages/core/src/driver/machine-operations.ts
@@ -1,14 +1,14 @@
 import { EOL } from 'os'
 import retry from 'p-retry'
 import { dateReplacer } from '@preevy/common'
-import { withSpinner } from '../spinner'
-import { telemetryEmitter } from '../telemetry'
-import { Logger } from '../log'
-import { scriptExecuter } from '../remote-script-executer'
-import { EnvMetadata, driverMetadataFilename } from '../env-metadata'
-import { REMOTE_DIR_BASE } from '../remote-files'
-import { MachineBase, SpecDiffItem, isPartialMachine, machineResourceType } from './machine-model'
-import { MachineConnection, MachineCreationDriver, MachineDriver } from './driver'
+import { withSpinner } from '../spinner.js'
+import { telemetryEmitter } from '../telemetry/index.js'
+import { Logger } from '../log.js'
+import { scriptExecuter } from '../remote-script-executer.js'
+import { EnvMetadata, driverMetadataFilename } from '../env-metadata.js'
+import { REMOTE_DIR_BASE } from '../remote-files.js'
+import { MachineBase, SpecDiffItem, isPartialMachine, machineResourceType } from './machine-model.js'
+import { MachineConnection, MachineCreationDriver, MachineDriver } from './driver.js'
 
 const machineDiffText = (diff: SpecDiffItem[]) => diff
   .map(({ name, old, new: n }) => `* ${name}: ${old} -> ${n}`).join(EOL)
diff --git a/packages/core/src/driver/ssh.ts b/packages/core/src/driver/ssh.ts
index 6d258386..5d3fb1a6 100644
--- a/packages/core/src/driver/ssh.ts
+++ b/packages/core/src/driver/ssh.ts
@@ -6,12 +6,12 @@ import { rimraf } from 'rimraf'
 import { inspect } from 'util'
 import { AddressInfo } from 'net'
 import retry, { Options as RetryOptions } from 'p-retry'
-import { Store } from '../store'
-import { SshKeyPair, connectSshClient } from '../ssh'
-import { MachineConnection, MachineDriver } from './driver'
-import { MachineBase } from './machine-model'
-import { sshKeysStore } from '../state'
-import { Logger } from '../log'
+import { Store } from '../store/index.js'
+import { SshKeyPair, connectSshClient } from '../ssh/index.js'
+import { MachineConnection, MachineDriver } from './driver.js'
+import { MachineBase } from './machine-model.js'
+import { sshKeysStore } from '../state/index.js'
+import { Logger } from '../log.js'
 
 export type SshMachine = MachineBase & {
   version: string
diff --git a/packages/core/src/env-id.ts b/packages/core/src/env-id.ts
index 4f87561d..e2ed8be6 100644
--- a/packages/core/src/env-id.ts
+++ b/packages/core/src/env-id.ts
@@ -1,7 +1,7 @@
-import { detectCiProvider } from './ci-providers'
-import { gitContext } from './git'
-import { ComposeModel } from './compose/model'
-import { Logger } from './log'
+import { detectCiProvider } from './ci-providers/index.js'
+import { gitContext } from './git.js'
+import { ComposeModel } from './compose/model.js'
+import { Logger } from './log.js'
 
 export type EnvId = string & {
   __tag: 'EnvId'
diff --git a/packages/core/src/env-metadata.ts b/packages/core/src/env-metadata.ts
index bf662124..cbe4d4e0 100644
--- a/packages/core/src/env-metadata.ts
+++ b/packages/core/src/env-metadata.ts
@@ -1,5 +1,5 @@
-import { gitContext } from './git'
-import { detectCiProvider } from './ci-providers'
+import { gitContext } from './git.js'
+import { detectCiProvider } from './ci-providers/index.js'
 
 export type GitAuthor = { name: string; email: string }
 
diff --git a/packages/core/src/func-log.ts b/packages/core/src/func-log.ts
index 56bbe88e..e13fc545 100644
--- a/packages/core/src/func-log.ts
+++ b/packages/core/src/func-log.ts
@@ -1,5 +1,5 @@
 import { isPromise } from 'util/types'
-import { LogFunc } from './log'
+import { LogFunc } from './log.js'
 
 export const logFunc = <Args extends unknown[], Return>(
   f: (...args: Args) => Return,
diff --git a/packages/core/src/git.ts b/packages/core/src/git.ts
index 65bd64d0..a18cb650 100644
--- a/packages/core/src/git.ts
+++ b/packages/core/src/git.ts
@@ -1,4 +1,4 @@
-import { execPromiseStdout } from './child-process'
+import { execPromiseStdout } from './child-process.js'
 
 export function gitContext(cwd: string = process.cwd()) {
   const execGit = async (command: string) => await execPromiseStdout(`git ${command}`, { cwd })
@@ -27,11 +27,14 @@ export function gitContext(cwd: string = process.cwd()) {
     return await execGit(`config remote.${trackingRemote}.url`)
   }
 
+  const localChanges = async () => await execGit('diff-index HEAD --').catch(() => '')
+
   return {
     branchName,
     commit: head,
     author,
     remoteTrackingBranchUrl,
+    localChanges,
   }
 }
 
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index bc9e64ea..6f8c6d05 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,5 +1,5 @@
-export { Logger, LogFunc, nullLogFunc, LogLevel, logLevels } from './log'
-export { LocalProfilesConfig, localProfilesConfig, nextAvailableAlias } from './profile'
+export { Logger, LogFunc, nullLogFunc, LogLevel, logLevels } from './log.js'
+export { LocalProfilesConfig, localProfilesConfig, nextAvailableAlias } from './profile/index.js'
 export {
   SshMachine,
   MachineBase,
@@ -19,25 +19,25 @@ export {
   ForwardSocket,
   machineStatusNodeExporterCommand,
   ensureMachine,
-} from './driver'
+} from './driver/index.js'
 export {
   profileStore, Profile, ProfileStore, ProfileStoreRef, ProfileStoreTransaction, ProfileEditor,
   ProfileEditorOp,
   link, Org, LocalProfilesConfigGetResult,
-} from './profile'
-export { telemetryEmitter, registerEmitter, wireProcessExit, createTelemetryEmitter, machineId } from './telemetry'
-export { fsTypeFromUrl, Store, VirtualFS, localFsFromUrl, localFs } from './store'
+} from './profile/index.js'
+export { telemetryEmitter, registerEmitter, wireProcessExit, createTelemetryEmitter, machineId } from './telemetry/index.js'
+export { fsTypeFromUrl, Store, VirtualFS, FsReader, localFsFromUrl, localFs } from './store/index.js'
 export {
   localComposeClient, ComposeModel, resolveComposeFiles, getExposedTcpServicePorts,
   fetchRemoteUserModel as remoteUserModel, NoComposeFilesError,
   addScriptInjectionsToServices as addScriptInjectionsToModel,
   defaultVolumeSkipList,
-} from './compose'
-export { withSpinner } from './spinner'
-export { findEnvId, findProjectName, findEnvIdByProjectName, validateEnvId, normalize as normalizeEnvId, EnvId } from './env-id'
-export { sshKeysStore } from './state'
-export { truncateWithHash, truncatePrefix, randomString, alphabets } from './strings'
-export { connectSshClient, generateSshKeyPair, SshKeyPairType } from './ssh'
+} from './compose/index.js'
+export { withSpinner } from './spinner.js'
+export { findEnvId, findProjectName, findEnvIdByProjectName, validateEnvId, normalize as normalizeEnvId, EnvId } from './env-id.js'
+export { sshKeysStore } from './state/index.js'
+export { truncateWithHash, truncatePrefix, randomString, alphabets } from './strings.js'
+export { connectSshClient, generateSshKeyPair, SshKeyPairType } from './ssh/index.js'
 export {
   ProcessError,
   spawnPromise,
@@ -45,18 +45,18 @@ export {
   childProcessStdoutPromise,
   execPromiseStdout,
   expandStdioOptions,
-} from './child-process'
+} from './child-process.js'
 export {
   CommandError, CommandExecuter, checkResult, commandWith, execResultFromOrderedOutput, ExecResult,
-} from './command-executer'
+} from './command-executer.js'
 export {
   addBaseComposeTunnelAgentService,
   queryTunnels,
   findComposeTunnelAgentUrl,
-} from './compose-tunnel-agent-client'
-export * as commands from './commands'
-export { BuildSpec, ImageRegistry, parseRegistry } from './build'
-export { dockerEnvContext } from './docker'
+} from './compose-tunnel-agent-client.js'
+export * as commands from './commands/index.js'
+export { BuildSpec, ImageRegistry, parseRegistry } from './build/index.js'
+export { dockerEnvContext } from './docker.js'
 export {
   FlatTunnel,
   flattenTunnels,
@@ -65,15 +65,15 @@ export {
   connectToTunnelServerSsh,
   getTunnelNamesToServicePorts,
   Connection as SshConnection,
-} from './tunneling'
-export { tryParseUrl } from './url'
-export { TunnelOpts } from './ssh'
-export { Spinner } from './spinner'
-export { generateBasicAuthCredentials as getUserCredentials, jwtGenerator, jwkThumbprint, jwkThumbprintUri, parseKey } from './credentials'
-export { ciProviders, detectCiProvider, CiProvider } from './ci-providers'
-export { paginationIterator } from './pagination'
-export { ensureDefined, extractDefined, HasRequired } from './nulls'
-export { pSeries } from './p-series'
-export { gitContext, GitContext } from './git'
-export * as config from './config'
-export { login, getTokensFromLocalFs as getLivecycleTokensFromLocalFs, TokenExpiredError } from './login'
+} from './tunneling/index.js'
+export { tryParseUrl } from './url.js'
+export { TunnelOpts } from './ssh/index.js'
+export { Spinner } from './spinner.js'
+export { generateBasicAuthCredentials as getUserCredentials, jwtGenerator, jwkThumbprint, jwkThumbprintUri, parseKey } from './credentials/index.js'
+export { ciProviders, detectCiProvider, CiProvider } from './ci-providers/index.js'
+export { paginationIterator } from './pagination.js'
+export { ensureDefined, extractDefined, HasRequired } from './nulls.js'
+export { pSeries } from './p-series.js'
+export { gitContext, GitContext } from './git.js'
+export * as config from './config.js'
+export { login, getTokensFromLocalFs as getLivecycleTokensFromLocalFs, TokenExpiredError } from './login.js'
diff --git a/packages/core/src/login.ts b/packages/core/src/login.ts
index 2e4a17e9..0ea8e44c 100644
--- a/packages/core/src/login.ts
+++ b/packages/core/src/login.ts
@@ -1,12 +1,11 @@
 /* eslint-disable no-await-in-loop */
-import fetch from 'node-fetch'
 import * as jose from 'jose'
 import { z } from 'zod'
 import open from 'open'
-import inquirer from 'inquirer'
-import { VirtualFS, localFs } from './store'
-import { Logger } from './log'
-import { withSpinner } from './spinner'
+import * as inquirer from '@inquirer/prompts'
+import { VirtualFS, localFs } from './store/index.js'
+import { Logger } from './log.js'
+import { withSpinner } from './spinner.js'
 
 export class TokenExpiredError extends Error {
   constructor() {
@@ -164,26 +163,16 @@ export const login = async (dataDir: string, loginUrl: string, lcUrl: string, cl
   )
 
   if (postLoginResponse.ok) {
-    const postLoginData: PostLoginResult = await postLoginResponse.json()
+    const postLoginData = await postLoginResponse.json() as PostLoginResult
     if (!('currentOrg' in postLoginData)) {
-      const {
-        orgName,
-        associateDomain,
-        // eslint-disable-next-line no-use-before-define
-      } = await inquirer.prompt<{ orgName: string; associateDomain: string }>([
-        {
-          type: 'input',
-          name: 'orgName',
-          message: 'Select a name for your organization',
-          default: postLoginData.organizationDomainDetails.name,
-        },
-        {
-          type: 'confirm',
-          name: 'associateDomain',
-          message: `Allow anyone with @${postLoginData.organizationDomainDetails.domain} email domain to join your organization as viewers`,
-          default: true,
-        },
-      ])
+      const orgName = await inquirer.input({
+        message: 'Select a name for your organization',
+        default: postLoginData.organizationDomainDetails.name,
+      })
+      const associateDomain = await inquirer.confirm({
+        message: `Allow anyone with @${postLoginData.organizationDomainDetails.domain} email domain to join your organization as viewers`,
+        default: true,
+      })
 
       const createOrganizationResponse = await withSpinner(
         () => fetch(
diff --git a/packages/core/src/pkg.ts b/packages/core/src/pkg.ts
index 375585fb..35d8f20e 100644
--- a/packages/core/src/pkg.ts
+++ b/packages/core/src/pkg.ts
@@ -1,5 +1,5 @@
 import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readdirSync, statSync } from 'fs'
-import { memoize } from 'lodash'
+import { memoize } from 'lodash-es'
 import { tmpdir } from 'os'
 import path from 'path'
 
diff --git a/packages/core/src/profile/config.ts b/packages/core/src/profile/config.ts
index 4eaa2206..cd85d7d1 100644
--- a/packages/core/src/profile/config.ts
+++ b/packages/core/src/profile/config.ts
@@ -1,11 +1,11 @@
 import path from 'path'
 import { rimraf } from 'rimraf'
-import { isEmpty, mapValues } from 'lodash'
+import { isEmpty, mapValues } from 'lodash-es'
 import { find, range, map } from 'iter-tools-es'
-import { localFs } from '../store/fs/local'
-import { Store, VirtualFS, store, tarSnapshot } from '../store'
-import { ProfileEditor, profileStore } from './store'
-import { Profile } from './profile'
+import { localFs } from '../store/fs/local.js'
+import { Store, VirtualFS, store, tarSnapshot } from '../store/index.js'
+import { ProfileEditor, profileStore } from './store.js'
+import { Profile } from './profile.js'
 
 type ProfileListEntry = {
   alias: string
diff --git a/packages/core/src/profile/index.ts b/packages/core/src/profile/index.ts
index bbd850a3..7cca4a10 100644
--- a/packages/core/src/profile/index.ts
+++ b/packages/core/src/profile/index.ts
@@ -1,4 +1,4 @@
-export * from './store'
-export * from './profile'
-export * from './config'
-export * from './link'
+export * from './store.js'
+export * from './profile.js'
+export * from './config.js'
+export * from './link.js'
diff --git a/packages/core/src/profile/link.ts b/packages/core/src/profile/link.ts
index c9d61621..534a7109 100644
--- a/packages/core/src/profile/link.ts
+++ b/packages/core/src/profile/link.ts
@@ -1,8 +1,7 @@
 import { parseKey } from '@preevy/common'
 import crypto from 'crypto'
-import fetch from 'node-fetch'
-import { Logger } from '../log'
-import { jwtGenerator } from '../credentials'
+import { Logger } from '../log.js'
+import { jwtGenerator } from '../credentials/index.js'
 
 export type Org = {id: string; name: string; role: string; slug: string}
 
diff --git a/packages/core/src/profile/store.ts b/packages/core/src/profile/store.ts
index 2797718d..f4092102 100644
--- a/packages/core/src/profile/store.ts
+++ b/packages/core/src/profile/store.ts
@@ -1,9 +1,9 @@
 import path from 'path'
 import { formatPublicKey } from '@preevy/common'
-import { Profile } from './profile'
-import { Store, TransactionOp, jsonReader } from '../store'
-import { FsReader } from '../store/fs/base'
-import { Snapshot } from '../store/snapshot'
+import { Profile } from './profile.js'
+import { Store, TransactionOp, jsonReader } from '../store/index.js'
+import { FsReader } from '../store/fs/base.js'
+import { Snapshot } from '../store/snapshot.js'
 
 const filenames = {
   info: 'info.json',
diff --git a/packages/core/src/remote-script-executer.ts b/packages/core/src/remote-script-executer.ts
index 1291d888..ac05b99d 100644
--- a/packages/core/src/remote-script-executer.ts
+++ b/packages/core/src/remote-script-executer.ts
@@ -1,8 +1,8 @@
 import path from 'path'
 import { randomBytes } from 'crypto'
-import { CommandExecuter, ExecResult, mkdir } from './command-executer'
-import { Logger } from './log'
-import { upload } from './upload-files'
+import { CommandExecuter, ExecResult, mkdir } from './command-executer.js'
+import { Logger } from './log.js'
+import { upload } from './upload-files/index.js'
 
 export type RemoteScriptExecuter = (
   script: string,
diff --git a/packages/core/src/shell-quote-word.d.ts b/packages/core/src/shell-quote-word.d.ts
new file mode 100644
index 00000000..01d3b86d
--- /dev/null
+++ b/packages/core/src/shell-quote-word.d.ts
@@ -0,0 +1,3 @@
+declare module 'shell-quote-word' {
+  export default function parse(s: string): string[]
+}
diff --git a/packages/core/src/spinner.ts b/packages/core/src/spinner.ts
index 6024366f..a378c834 100644
--- a/packages/core/src/spinner.ts
+++ b/packages/core/src/spinner.ts
@@ -1,5 +1,5 @@
 import ora from 'ora'
-import { overrideGetterSetter } from './object'
+import { overrideGetterSetter } from './object.js'
 
 export type SpinnerOptions = ora.Options & {
   opPrefix?: string
diff --git a/packages/core/src/ssh/client/exec.ts b/packages/core/src/ssh/client/exec.ts
index 3e719daa..42e95202 100644
--- a/packages/core/src/ssh/client/exec.ts
+++ b/packages/core/src/ssh/client/exec.ts
@@ -1,8 +1,10 @@
 import ssh2 from 'ssh2'
-import { readable as isReadableStream } from 'is-stream'
+import isStreamModule from 'is-stream'
 import { orderedOutput } from '@preevy/common'
-import { ExecResult, CommandExecuter, commandWith, checkResult, execResultFromOrderedOutput } from '../../command-executer'
-import { outputFromStdio } from '../../child-process'
+import { ExecResult, CommandExecuter, commandWith, checkResult, execResultFromOrderedOutput } from '../../command-executer.js'
+import { outputFromStdio } from '../../child-process.js'
+
+const { readable: isReadableStream } = isStreamModule
 
 export const execCommand = (
   ssh: ssh2.Client,
diff --git a/packages/core/src/ssh/client/files.ts b/packages/core/src/ssh/client/files.ts
index 3fb0dfac..ac585850 100644
--- a/packages/core/src/ssh/client/files.ts
+++ b/packages/core/src/ssh/client/files.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { sumArray } from '../../array'
+import { sumArray } from '../../array.js'
 
 export type FileInfo = { path: string; stats: fs.Stats; symlinkTarget?: string }
 
diff --git a/packages/core/src/ssh/client/forward-out.ts b/packages/core/src/ssh/client/forward-out.ts
index da0b003f..9f79e036 100644
--- a/packages/core/src/ssh/client/forward-out.ts
+++ b/packages/core/src/ssh/client/forward-out.ts
@@ -1,7 +1,7 @@
 import util from 'util'
 import net, { AddressInfo, ListenOptions } from 'net'
 import ssh2 from 'ssh2'
-import { Logger } from '../../log'
+import { Logger } from '../../log.js'
 
 export type ForwardOutStreamLocal = AsyncDisposable & {
   localSocket: string | AddressInfo
diff --git a/packages/core/src/ssh/client/index.ts b/packages/core/src/ssh/client/index.ts
index 73d0ddd8..1448f4df 100644
--- a/packages/core/src/ssh/client/index.ts
+++ b/packages/core/src/ssh/client/index.ts
@@ -1,11 +1,11 @@
 import ssh2 from 'ssh2'
 import { ListenOptions } from 'net'
-import { sftpClient } from './sftp'
-import { forwardOutStreamLocal } from './forward-out'
-import { execCommand } from './exec'
-import { Logger } from '../../log'
+import { sftpClient } from './sftp.js'
+import { forwardOutStreamLocal } from './forward-out.js'
+import { execCommand } from './exec.js'
+import { Logger } from '../../log.js'
 
-export { FileToCopy } from './files'
+export { FileToCopy } from './files.js'
 
 export const connectSshClient = async (
   { log, debug, ...connectConfig }: Omit<ssh2.ConnectConfig, 'debug'> & { log: Logger; debug: boolean },
diff --git a/packages/core/src/ssh/client/sftp.ts b/packages/core/src/ssh/client/sftp.ts
index fdc6bac9..511f5481 100644
--- a/packages/core/src/ssh/client/sftp.ts
+++ b/packages/core/src/ssh/client/sftp.ts
@@ -1,9 +1,9 @@
 import ssh2, { SFTPWrapper } from 'ssh2'
 import path from 'path'
 import { promisify } from 'util'
-import { pLimit } from '../../limit'
-import { DirToCopy, FileToCopy, isDirEnt, normalizeDirInfo, normalizeFileInfo, pathFromStringOrFileInfo } from './files'
-import { TransferOptions } from './transfer'
+import { pLimit } from '../../limit.js'
+import { DirToCopy, FileToCopy, isDirEnt, normalizeDirInfo, normalizeFileInfo, pathFromStringOrFileInfo } from './files.js'
+import { TransferOptions } from './transfer.js'
 
 type ErrorCodeHandler<T> = [number, () => T]
 const handleCodeError = <T>(...codes: ErrorCodeHandler<T>[]) => (err: unknown) => {
diff --git a/packages/core/src/ssh/client/transfer.ts b/packages/core/src/ssh/client/transfer.ts
index 0bb4ccf1..38c4f9f4 100644
--- a/packages/core/src/ssh/client/transfer.ts
+++ b/packages/core/src/ssh/client/transfer.ts
@@ -1,4 +1,4 @@
-import { TransferProgressEmitter } from './progress'
+import { TransferProgressEmitter } from './progress.js'
 
 export type TransferOptions = {
   mode?: number | string
diff --git a/packages/core/src/ssh/index.ts b/packages/core/src/ssh/index.ts
index 522f6fc3..c6aa8ac5 100644
--- a/packages/core/src/ssh/index.ts
+++ b/packages/core/src/ssh/index.ts
@@ -1,3 +1,3 @@
-export * from './keypair'
-export * from './url'
-export * from './client'
+export * from './keypair.js'
+export * from './url.js'
+export * from './client/index.js'
diff --git a/packages/core/src/ssh/keypair.ts b/packages/core/src/ssh/keypair.ts
index 22232730..59505189 100644
--- a/packages/core/src/ssh/keypair.ts
+++ b/packages/core/src/ssh/keypair.ts
@@ -1,6 +1,8 @@
 import crypto from 'crypto'
 import { promisify } from 'util'
-import { parseKey, parsePrivateKey } from 'sshpk'
+import sshpkModule from 'sshpk'
+
+const { parseKey, parsePrivateKey } = sshpkModule
 
 export type SshKeyPair = {
   privateKey: Buffer | string
diff --git a/packages/core/src/state/index.ts b/packages/core/src/state/index.ts
index e50e30e7..02553f93 100644
--- a/packages/core/src/state/index.ts
+++ b/packages/core/src/state/index.ts
@@ -1 +1 @@
-export { sshKeysStore } from './ssh'
+export { sshKeysStore } from './ssh.js'
diff --git a/packages/core/src/state/ssh.ts b/packages/core/src/state/ssh.ts
index 4d0957d7..661663fd 100644
--- a/packages/core/src/state/ssh.ts
+++ b/packages/core/src/state/ssh.ts
@@ -1,6 +1,6 @@
 import path from 'path'
-import { SSHKeyConfig, SshKeyPairType, generateSshKeyPair } from '../ssh/keypair'
-import { Store } from '../store'
+import { SSHKeyConfig, SshKeyPairType, generateSshKeyPair } from '../ssh/keypair.js'
+import { Store } from '../store/index.js'
 
 export const sshKeysStore = (store: Store) => {
   const sshKeysDir = 'ssh-keys'
diff --git a/packages/core/src/store/fs/index.ts b/packages/core/src/store/fs/index.ts
index 931f4e97..c2174e6d 100644
--- a/packages/core/src/store/fs/index.ts
+++ b/packages/core/src/store/fs/index.ts
@@ -1,5 +1,5 @@
-export { VirtualFS } from './base'
-export { localFs, localFsFromUrl } from './local'
-export { jsonReader } from './json-reader'
+export { VirtualFS, FsReader } from './base.js'
+export { localFs, localFsFromUrl } from './local.js'
+export { jsonReader } from './json-reader.js'
 
 export const fsTypeFromUrl = (url: string): string => new URL(url).protocol.replace(':', '')
diff --git a/packages/core/src/store/fs/json-reader.ts b/packages/core/src/store/fs/json-reader.ts
index 2dd04fc1..321cf318 100644
--- a/packages/core/src/store/fs/json-reader.ts
+++ b/packages/core/src/store/fs/json-reader.ts
@@ -1,4 +1,4 @@
-import { FsReader } from './base'
+import { FsReader } from './base.js'
 
 export const jsonReader = (reader: FsReader) => ({
   async readJSON<T>(file: string) {
diff --git a/packages/core/src/store/fs/local.ts b/packages/core/src/store/fs/local.ts
index c2ee441e..7398167d 100644
--- a/packages/core/src/store/fs/local.ts
+++ b/packages/core/src/store/fs/local.ts
@@ -1,7 +1,7 @@
 import fs from 'fs/promises'
 import path, { dirname } from 'path'
 import { rimraf } from 'rimraf'
-import { VirtualFS } from './base'
+import { VirtualFS } from './base.js'
 
 const isNotFoundError = (e: unknown) => (e as { code?: unknown })?.code === 'ENOENT'
 
diff --git a/packages/core/src/store/index.ts b/packages/core/src/store/index.ts
index 770d4fc3..9353befc 100644
--- a/packages/core/src/store/index.ts
+++ b/packages/core/src/store/index.ts
@@ -1,7 +1,7 @@
-import { Snapshot, snapshotStore } from './snapshot'
+import { Snapshot, snapshotStore } from './snapshot.js'
 
-export * from './tar'
-export { VirtualFS, jsonReader, fsTypeFromUrl, localFsFromUrl, localFs } from './fs'
+export * from './tar.js'
+export { VirtualFS, jsonReader, fsTypeFromUrl, localFsFromUrl, localFs, FsReader } from './fs/index.js'
 
 export type TransactionOp<T> = (s: Pick<Snapshot, 'write' | 'delete' | 'read'>) => Promise<T>
 
diff --git a/packages/core/src/store/snapshot.ts b/packages/core/src/store/snapshot.ts
index b298db3f..63323002 100644
--- a/packages/core/src/store/snapshot.ts
+++ b/packages/core/src/store/snapshot.ts
@@ -1,4 +1,4 @@
-import { VirtualFS } from './fs'
+import { VirtualFS } from './fs/index.js'
 
 export type Snapshot = VirtualFS & AsyncDisposable & {
   save: () => Promise<void>
diff --git a/packages/core/src/store/tar.ts b/packages/core/src/store/tar.ts
index 1ef30224..86874d81 100644
--- a/packages/core/src/store/tar.ts
+++ b/packages/core/src/store/tar.ts
@@ -5,8 +5,8 @@ import { Readable } from 'stream'
 import { pipeline } from 'stream/promises'
 import { mkdtemp } from 'fs/promises'
 import tar from 'tar'
-import { localFs } from './fs'
-import { FileBackedSnapshotter, Snapshot } from './snapshot'
+import { localFs } from './fs/index.js'
+import { FileBackedSnapshotter, Snapshot } from './snapshot.js'
 
 const readStream = (stream: Readable): Promise<Buffer> => new Promise<Buffer>((resolve, reject) => {
   const buffer: Buffer[] = []
diff --git a/packages/core/src/strings.test.ts b/packages/core/src/strings.test.ts
index bf6b6e2b..f9f1628e 100644
--- a/packages/core/src/strings.test.ts
+++ b/packages/core/src/strings.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach } from '@jest/globals'
-import { repeat } from 'lodash'
-import { alphabets, randomString, truncatePrefix, truncateWithHash } from './strings'
+import { repeat } from 'lodash-es'
+import { alphabets, randomString, truncatePrefix, truncateWithHash } from './strings.js'
 
 describe('strings', () => {
   describe('truncateWithHash', () => {
diff --git a/packages/core/src/strings.ts b/packages/core/src/strings.ts
index 57b9e73f..b1c3b161 100644
--- a/packages/core/src/strings.ts
+++ b/packages/core/src/strings.ts
@@ -1,5 +1,5 @@
 import { createHash, randomInt } from 'crypto'
-import { mapValues } from 'lodash'
+import { mapValues } from 'lodash-es'
 
 export const truncatePrefix = (prefix: string, suffix: string, maxLength: number, separator = '-') => {
   const truncateLength = maxLength - suffix.length - separator.length
diff --git a/packages/core/src/telemetry/emitter.ts b/packages/core/src/telemetry/emitter.ts
index d1c5b99d..71c7c5d6 100644
--- a/packages/core/src/telemetry/emitter.ts
+++ b/packages/core/src/telemetry/emitter.ts
@@ -1,14 +1,15 @@
 import os from 'os'
 import fs from 'fs'
 import crypto from 'crypto'
-import stringify from 'fast-safe-stringify'
-import fetch from 'node-fetch'
-import { debounce } from 'lodash'
+import stringifyModule from 'fast-safe-stringify'
+import { debounce } from 'lodash-es'
 import pLimit from 'p-limit'
 import { inspect } from 'util'
-import { memoizedMachineId } from './machine-id'
-import { TelemetryEvent, TelemetryProperties, serializableEvent } from './events'
-import { detectCiProvider } from '../ci-providers'
+import { memoizedMachineId } from './machine-id.js'
+import { TelemetryEvent, TelemetryProperties, serializableEvent } from './events.js'
+import { detectCiProvider } from '../ci-providers/index.js'
+
+const stringify = stringifyModule.default
 
 const newRunId = () => `ses_${crypto.randomBytes(16).toString('base64url').replace(/[^a-zA-Z0-9]/g, '').substring(0, 10)}`
 
@@ -48,7 +49,7 @@ export const telemetryEmitter = async ({ dataDir, version, debug, filename }: {
       method: 'POST',
       redirect: 'follow',
       body,
-      timeout: 1500,
+      signal: AbortSignal.timeout(1500),
     }).catch(err => {
       if (debug) {
         process.stderr.write(`Error sending telemetry: ${inspect(err)}${os.EOL}`)
diff --git a/packages/core/src/telemetry/index.ts b/packages/core/src/telemetry/index.ts
index e10682ae..ff5a5f19 100644
--- a/packages/core/src/telemetry/index.ts
+++ b/packages/core/src/telemetry/index.ts
@@ -1,10 +1,10 @@
-import { TelemetryEmitter, nullTelemetryEmitter } from './emitter'
+import { TelemetryEmitter, nullTelemetryEmitter } from './emitter.js'
 
 let staticEmitter: TelemetryEmitter = nullTelemetryEmitter
 
 export const registerEmitter = (emitter: TelemetryEmitter) => { staticEmitter = emitter }
 export const telemetryEmitter = (): TelemetryEmitter => staticEmitter
 
-export { telemetryEmitter as createTelemetryEmitter, nullTelemetryEmitter, TelemetryEmitter } from './emitter'
-export { wireProcessExit } from './process-exit'
-export { memoizedMachineId as machineId } from './machine-id'
+export { telemetryEmitter as createTelemetryEmitter, nullTelemetryEmitter, TelemetryEmitter } from './emitter.js'
+export { wireProcessExit } from './process-exit.js'
+export { memoizedMachineId as machineId } from './machine-id.js'
diff --git a/packages/core/src/telemetry/machine-id.ts b/packages/core/src/telemetry/machine-id.ts
index bb9b5212..e7241996 100644
--- a/packages/core/src/telemetry/machine-id.ts
+++ b/packages/core/src/telemetry/machine-id.ts
@@ -2,8 +2,8 @@ import fs from 'fs/promises'
 import os from 'os'
 import path from 'path'
 import crypto from 'crypto'
-import { execPromiseStdout } from '../child-process'
-import { localFs } from '../store'
+import { execPromiseStdout } from '../child-process.js'
+import { localFs } from '../store/index.js'
 
 const readFileOrUndefined = (file: string) => fs.readFile(file, 'utf-8').catch(() => undefined)
 
diff --git a/packages/core/src/telemetry/process-exit.ts b/packages/core/src/telemetry/process-exit.ts
index a0088c32..7176a147 100644
--- a/packages/core/src/telemetry/process-exit.ts
+++ b/packages/core/src/telemetry/process-exit.ts
@@ -1,4 +1,4 @@
-import { TelemetryEmitter } from './emitter'
+import { TelemetryEmitter } from './emitter.js'
 
 export const wireProcessExit = (process: NodeJS.Process, emitter: TelemetryEmitter) => {
   const captureExit = (() => {
diff --git a/packages/core/src/test-helpers.ts b/packages/core/src/test-helpers.ts
new file mode 100644
index 00000000..9ba582a6
--- /dev/null
+++ b/packages/core/src/test-helpers.ts
@@ -0,0 +1,11 @@
+import { jest } from '@jest/globals'
+
+export const mockFunction = <T extends (...args: never[]) => unknown>(impl?: T): jest.MockedFunction<T> => (
+  jest.fn(impl) as unknown as jest.MockedFunction<T>
+)
+
+export type MockFunctions<T extends {}> = {
+  [k in keyof T]: T[k] extends (...args: never[]) => unknown
+    ? jest.MockedFunction<T[k]>
+    : T[k] extends {} ? MockFunctions<T[k]> : T[k]
+}
diff --git a/packages/core/src/tunneling/index.ts b/packages/core/src/tunneling/index.ts
index 5fb150d5..baba3e42 100644
--- a/packages/core/src/tunneling/index.ts
+++ b/packages/core/src/tunneling/index.ts
@@ -1,2 +1,2 @@
-export * from './model'
-export * from './tunnel-server-client'
+export * from './model.js'
+export * from './tunnel-server-client.js'
diff --git a/packages/core/src/tunneling/model.ts b/packages/core/src/tunneling/model.ts
index 1575f772..542187f4 100644
--- a/packages/core/src/tunneling/model.ts
+++ b/packages/core/src/tunneling/model.ts
@@ -1,7 +1,7 @@
 import { TunnelNameResolver } from '@preevy/common'
-import { generateSshKeyPair } from '../ssh/keypair'
-import { ComposeModel } from '../compose/model'
-import { getExposedTcpServicePorts } from '../compose/client'
+import { generateSshKeyPair } from '../ssh/keypair.js'
+import { ComposeModel } from '../compose/model.js'
+import { getExposedTcpServicePorts } from '../compose/client.js'
 
 type port = string
 type url = string
diff --git a/packages/core/src/tunneling/tunnel-server-client.ts b/packages/core/src/tunneling/tunnel-server-client.ts
index 8e64de8e..6869ab2c 100644
--- a/packages/core/src/tunneling/tunnel-server-client.ts
+++ b/packages/core/src/tunneling/tunnel-server-client.ts
@@ -2,8 +2,8 @@ import {
   BaseSshClient, SshClientOpts, SshConnectionConfig, baseSshClient,
   formatSshConnectionConfig, keyFingerprint,
 } from '@preevy/common'
-import { Logger } from '../log'
-import { TunnelOpts } from '../ssh'
+import { Logger } from '../log.js'
+import { TunnelOpts } from '../ssh/index.js'
 
 export class UnverifiedHostKeyError extends Error {
   constructor(
diff --git a/packages/core/src/upload-files/_test.ts b/packages/core/src/upload-files/_test.ts
index a4e59e20..da6aa45c 100644
--- a/packages/core/src/upload-files/_test.ts
+++ b/packages/core/src/upload-files/_test.ts
@@ -2,9 +2,9 @@ import path from 'path'
 import util from 'util'
 import fs from 'fs'
 import { rimraf } from 'rimraf'
-import { tarStreamer } from './tar'
+import { tarStreamer } from './tar.js'
 
-const PREEVY_ROOT_DIR = path.resolve(__dirname, '..', '..', '..', '..')
+const PREEVY_ROOT_DIR = path.resolve(import.meta.url, '..', '..', '..', '..')
 
 const TARGET_FILE = '/tmp/aa.tar'
 
diff --git a/packages/core/src/upload-files/index.ts b/packages/core/src/upload-files/index.ts
index 19040fe3..4991b079 100644
--- a/packages/core/src/upload-files/index.ts
+++ b/packages/core/src/upload-files/index.ts
@@ -1,4 +1,4 @@
-export { FileToCopy } from './files'
-export { tarStreamer as tarStream, StartStreamingResult as FinalizeResult } from './tar'
-export { expandedTransferProgressEmitter } from './progress'
-export { uploadWithSpinner, upload } from './upload'
+export { FileToCopy } from './files.js'
+export { tarStreamer as tarStream, StartStreamingResult as FinalizeResult } from './tar.js'
+export { expandedTransferProgressEmitter } from './progress.js'
+export { uploadWithSpinner, upload } from './upload.js'
diff --git a/packages/core/src/upload-files/tar.test.ts b/packages/core/src/upload-files/tar.test.ts
index fce9f62e..4be27100 100644
--- a/packages/core/src/upload-files/tar.test.ts
+++ b/packages/core/src/upload-files/tar.test.ts
@@ -2,10 +2,10 @@ import { describe, expect, beforeAll, afterAll, test } from '@jest/globals'
 import path from 'path'
 import fs from 'fs'
 import os from 'os'
+import crypto from 'crypto'
 import { rimraf } from 'rimraf'
-import { pseudoRandomBytes } from 'crypto'
-import { tarStreamer } from './tar'
-import { execPromise, execPromiseStdout } from '../child-process'
+import { tarStreamer } from './tar.js'
+import { execPromise, execPromiseStdout } from '../child-process.js'
 
 describe('tar', () => {
   let tempDir: string
@@ -24,7 +24,7 @@ describe('tar', () => {
     await Promise.all([
       fs.promises.writeFile(path.join(d1, 'f1.txt'), 'this is f1'),
       fs.promises.writeFile(path.join(d3, 'f2.txt'), ['this is f2', 'with multiple lines'].join(os.EOL)),
-      fs.promises.writeFile(path.join(d3, 'blob1'), pseudoRandomBytes(100)),
+      fs.promises.writeFile(path.join(d3, 'blob1'), crypto.pseudoRandomBytes(100)),
     ])
     await fs.promises.symlink(path.join('d3', 'f2.txt'), path.join(d2, 'l2.txt'))
   })
diff --git a/packages/core/src/upload-files/tar.ts b/packages/core/src/upload-files/tar.ts
index 9d9ff883..b8e84577 100644
--- a/packages/core/src/upload-files/tar.ts
+++ b/packages/core/src/upload-files/tar.ts
@@ -5,9 +5,9 @@ import { platform } from 'os'
 import { pack, Headers, Pack } from 'tar-stream'
 import { Writable, pipeline } from 'stream'
 import { EmitterConsumer } from '@preevy/common'
-import { TransferProgressEmitter, TransferProgressEvents, transferProgressEmitter } from './progress'
-import { FileInfo, FileToCopy } from './files'
-import { Visitor, fsWalker } from './walk'
+import { TransferProgressEmitter, TransferProgressEvents, transferProgressEmitter } from './progress.js'
+import { FileInfo, FileToCopy } from './files.js'
+import { Visitor, fsWalker } from './walk.js'
 
 const isWin = platform() === 'win32'
 
diff --git a/packages/core/src/upload-files/upload.ts b/packages/core/src/upload-files/upload.ts
index 3f21a504..bc7bf78f 100644
--- a/packages/core/src/upload-files/upload.ts
+++ b/packages/core/src/upload-files/upload.ts
@@ -1,12 +1,12 @@
 import zlib from 'zlib'
-import { throttle } from 'lodash'
-import { withSpinner } from '../spinner'
-import { telemetryEmitter } from '../telemetry'
-import { filterCommand, filterStore } from './files-filter'
-import { FileInfo, FileToCopy } from './files'
-import { ExpandedTransferProgress, expandedTransferProgressEmitter } from './progress'
-import { StartStreamingResult, tarStreamer } from './tar'
-import { CommandExecuter } from '../command-executer'
+import { throttle } from 'lodash-es'
+import { withSpinner } from '../spinner.js'
+import { telemetryEmitter } from '../telemetry/index.js'
+import { filterCommand, filterStore } from './files-filter.js'
+import { FileInfo, FileToCopy } from './files.js'
+import { ExpandedTransferProgress, expandedTransferProgressEmitter } from './progress.js'
+import { StartStreamingResult, tarStreamer } from './tar.js'
+import { CommandExecuter } from '../command-executer.js'
 
 const displayAndUnit = (nbytes: number) => {
   if (nbytes < 1024) {
diff --git a/packages/core/src/upload-files/walk.ts b/packages/core/src/upload-files/walk.ts
index 4dcece83..c56b4b4c 100644
--- a/packages/core/src/upload-files/walk.ts
+++ b/packages/core/src/upload-files/walk.ts
@@ -1,7 +1,8 @@
 import fs from 'fs'
-import PQueue from 'p-queue'
-import { DirInfo, FileInfo } from './files'
+import PQueueModule from 'p-queue'
+import { DirInfo, FileInfo } from './files.js'
 
+const PQueue = PQueueModule.default
 const readDir = async (filename: string) => await fs.promises.readdir(filename)
 
 const normalizeFile = async (local: string | FileInfo | DirInfo) => {
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 2251f02f..378d465a 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -2,9 +2,9 @@
   "compilerOptions": {
     "declaration": true,
     "lib": ["ES2022", "ESNext.Disposable"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -25,8 +25,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../common" },
   ]
diff --git a/packages/driver-azure/.eslintignore b/packages/driver-azure/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/driver-azure/.eslintignore
+++ b/packages/driver-azure/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/driver-azure/.eslintrc.cjs b/packages/driver-azure/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/driver-azure/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/driver-azure/.eslintrc.js b/packages/driver-azure/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/driver-azure/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/driver-azure/package.json b/packages/driver-azure/package.json
index 2c96bfc7..bd734694 100644
--- a/packages/driver-azure/package.json
+++ b/packages/driver-azure/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/driver-azure",
   "version": "0.0.58",
   "description": "Microsoft Azure Virtual Machine for Preevy",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -19,19 +22,19 @@
     "@azure/logger": "^1.0.4",
     "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-10",
     "@preevy/core": "0.0.58",
-    "inquirer": "^8.0.0",
-    "inquirer-autocomplete-prompt": "^2.0.0",
+    "@inquirer/prompts": "^3.3.0",
+    "inquirer-autocomplete-standalone": "^0.8.1",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@types/azure": "^0.9.20",
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-oclif": "^4",
@@ -45,12 +48,12 @@
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
-    "build": "tsc -b",
+    "build": "tsc -b && shx cp -r static dist",
     "prepack": "yarn clean && yarn build",
     "prepare": "cd ../.. && husky install"
   }
diff --git a/packages/driver-azure/src/driver/client.ts b/packages/driver-azure/src/driver/client.ts
index 387a144f..5089346b 100644
--- a/packages/driver-azure/src/driver/client.ts
+++ b/packages/driver-azure/src/driver/client.ts
@@ -18,7 +18,7 @@ import {
   extractResourceNameFromId,
   findVMImage,
   getIpAddresses,
-} from './vm-creation-utils'
+} from './vm-creation-utils.js'
 
 // Uncomment to see Azure logs (import @azure/logger)
 // setLogLevel('info')
diff --git a/packages/driver-azure/src/driver/index.ts b/packages/driver-azure/src/driver/index.ts
index cb2e87ce..07686c45 100644
--- a/packages/driver-azure/src/driver/index.ts
+++ b/packages/driver-azure/src/driver/index.ts
@@ -1,7 +1,7 @@
 import { Flags, Interfaces } from '@oclif/core'
 import { asyncFirst, asyncMap } from 'iter-tools-es'
-import inquirer, { Question } from 'inquirer'
-import inquirerAutoComplete from 'inquirer-autocomplete-prompt'
+import * as inquirer from '@inquirer/prompts'
+import inquirerAutoComplete from 'inquirer-autocomplete-standalone'
 import { InferredFlags } from '@oclif/core/lib/interfaces'
 import { Resource, VirtualMachine } from '@azure/arm-compute'
 import { inspect } from 'util'
@@ -22,12 +22,10 @@ import {
   Logger,
   machineStatusNodeExporterCommand,
 } from '@preevy/core'
-import { pick } from 'lodash'
-import { Client, client as createClient, REGIONS } from './client'
-import { CUSTOMIZE_BARE_MACHINE } from './scripts'
-import { AzureCustomTags, extractResourceGroupNameFromId } from './vm-creation-utils'
-
-inquirer.registerPrompt('autocomplete', inquirerAutoComplete)
+import { pick } from 'lodash-es'
+import { Client, client as createClient, REGIONS } from './client.js'
+import { CUSTOMIZE_BARE_MACHINE } from './scripts.js'
+import { AzureCustomTags, extractResourceGroupNameFromId } from './vm-creation-utils.js'
 
 type RootObjectDetailsError = {
   code: string
@@ -145,32 +143,25 @@ const flags = {
 
 type FlagTypes = Omit<Interfaces.InferredFlags<typeof flags>, 'json'>
 
-const questions = async (): Promise<Question[]> => [
-  {
-    type: 'autocomplete',
-    name: 'region',
-    message: flags.region.description,
-    source: async (_opts, input) => !input || REGIONS.filter(r => r.includes(input.toLowerCase())),
+const inquireFlags = async () => {
+  const region = await inquirerAutoComplete<string>({
+    message: flags.region.description as string,
+    source: async input => REGIONS.filter(r => !input || r.includes(input.toLowerCase())).map(value => ({ value })),
     suggestOnly: true,
-    filter: i => i.toLowerCase(),
-  } as inquirerAutoComplete.AutocompleteQuestionOptions,
-  {
-    type: 'input',
-    name: 'subscription-id',
-    default: async () => {
-      const credential = new DefaultAzureCredential()
-      const subscriptionClient = new SubscriptionClient(credential)
-      const subscription = await asyncFirst(subscriptionClient.subscriptions.list())
-      return subscription?.subscriptionId || ''
-    },
-    message: flags['subscription-id'].description,
-  },
-]
+    transformer: i => i.toLowerCase(),
+  })
 
-const flagsFromAnswers = async (answers: Record<string, unknown>) => ({
-  region: answers.region,
-  'subscription-id': answers['subscription-id'],
-})
+  const credential = new DefaultAzureCredential()
+  const subscriptionClient = new SubscriptionClient(credential)
+  const defaultSubscriptionId = (await asyncFirst(subscriptionClient.subscriptions.list()))?.subscriptionId
+
+  const subscriptionId = await inquirer.input({
+    message: flags['subscription-id'].description as string,
+    default: defaultSubscriptionId,
+  })
+
+  return { region, 'subscription-id': subscriptionId }
+}
 
 const contextFromFlags = ({
   region,
@@ -297,6 +288,5 @@ export default {
   factory,
   machineCreationFlags,
   machineCreationFactory,
-  questions,
-  flagsFromAnswers,
+  inquireFlags,
 } as const
diff --git a/packages/driver-azure/src/driver/scripts.ts b/packages/driver-azure/src/driver/scripts.ts
index 4006d898..9075710d 100644
--- a/packages/driver-azure/src/driver/scripts.ts
+++ b/packages/driver-azure/src/driver/scripts.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import { SCRIPT_DIR as DIR } from '../static'
+import { SCRIPT_DIR as DIR } from '../static.js'
 
 export const CUSTOMIZE_BARE_MACHINE = [
   'increase-open-files-limits.sh',
diff --git a/packages/driver-azure/src/index.ts b/packages/driver-azure/src/index.ts
index 546c88ee..ebc12ed4 100644
--- a/packages/driver-azure/src/index.ts
+++ b/packages/driver-azure/src/index.ts
@@ -1,3 +1,3 @@
-import azure from './driver'
+import azure from './driver/index.js'
 
 export default azure
diff --git a/packages/driver-azure/src/static.ts b/packages/driver-azure/src/static.ts
index 8b74fab9..af003a00 100644
--- a/packages/driver-azure/src/static.ts
+++ b/packages/driver-azure/src/static.ts
@@ -1,4 +1,8 @@
 import path from 'path'
+import url from 'url'
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 export const DIR = path.join(__dirname, '../static')
 export const SCRIPT_DIR = path.join(DIR, 'scripts')
diff --git a/packages/driver-azure/tsconfig.json b/packages/driver-azure/tsconfig.json
index efe53731..9267c46b 100644
--- a/packages/driver-azure/tsconfig.json
+++ b/packages/driver-azure/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -25,8 +25,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../common" },
     { "path": "../core" },
diff --git a/packages/driver-gce/.eslintignore b/packages/driver-gce/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/driver-gce/.eslintignore
+++ b/packages/driver-gce/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/driver-gce/.eslintrc.cjs b/packages/driver-gce/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/driver-gce/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/driver-gce/.eslintrc.js b/packages/driver-gce/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/driver-gce/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/driver-gce/package.json b/packages/driver-gce/package.json
index 41f1f2b7..212ab714 100644
--- a/packages/driver-gce/package.json
+++ b/packages/driver-gce/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/driver-gce",
   "version": "0.0.58",
   "description": "Google Compute Engine driver for Preevy",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -15,19 +18,19 @@
     "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-10",
     "@preevy/core": "0.0.58",
     "google-auth-library": "^8.7.0",
-    "google-gax": "^4.0.4",
-    "inquirer": "^8.0.0",
-    "inquirer-autocomplete-prompt": "^2.0.0",
+    "google-gax": "^4.0.5",
+    "@inquirer/prompts": "^3.3.0",
+    "inquirer-autocomplete-standalone": "^0.8.1",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-oclif": "^4",
@@ -41,12 +44,12 @@
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
-    "build": "tsc -b",
+    "build": "tsc -b && shx cp -r static dist",
     "prepack": "yarn clean && yarn build",
     "prepare": "cd ../.. && husky install"
   }
diff --git a/packages/driver-gce/src/driver/client.ts b/packages/driver-gce/src/driver/client.ts
index 25845432..708bd630 100644
--- a/packages/driver-gce/src/driver/client.ts
+++ b/packages/driver-gce/src/driver/client.ts
@@ -2,9 +2,9 @@ import { InstancesClient, ImagesClient, ZoneOperationsClient, RegionsClient } fr
 import { GoogleError, Status, operationsProtos, CallOptions } from 'google-gax'
 import { asyncFirst, asyncToArray } from 'iter-tools-es'
 import { randomBytes } from 'crypto'
-import { LABELS, isValidLabel, normalizeLabel } from './labels'
-import { readCloudConfig } from '../static'
-import { metadataKey, serializeMetadata } from './metadata'
+import { LABELS, isValidLabel, normalizeLabel } from './labels.js'
+import { readCloudConfig } from '../static.js'
+import { metadataKey, serializeMetadata } from './metadata.js'
 
 type Operation = operationsProtos.google.longrunning.IOperation
 
diff --git a/packages/driver-gce/src/driver/index.ts b/packages/driver-gce/src/driver/index.ts
index fe0efd17..cb5f0520 100644
--- a/packages/driver-gce/src/driver/index.ts
+++ b/packages/driver-gce/src/driver/index.ts
@@ -1,7 +1,7 @@
 import { Flags, Interfaces } from '@oclif/core'
 import { asyncMap } from 'iter-tools-es'
-import inquirer, { ListQuestion, Question } from 'inquirer'
-import inquirerAutoComplete from 'inquirer-autocomplete-prompt'
+import * as inquirer from '@inquirer/prompts'
+import inquirerAutoComplete from 'inquirer-autocomplete-standalone'
 import {
   MachineDriver,
   SshMachine, MachineCreationDriver, MachineCreationDriverFactory, MachineDriverFactory,
@@ -16,12 +16,10 @@ import {
   extractDefined,
   PartialMachine,
 } from '@preevy/core'
-import { memoize, pick } from 'lodash'
-import createClient, { Client, Instance, availableRegions, defaultProjectId, instanceError, shortResourceName } from './client'
-import { deserializeMetadata, metadataKey } from './metadata'
-import { LABELS } from './labels'
-
-inquirer.registerPrompt('autocomplete', inquirerAutoComplete)
+import { memoize, pick } from 'lodash-es'
+import createClient, { Client, Instance, availableRegions, defaultProjectId, instanceError, shortResourceName } from './client.js'
+import { deserializeMetadata, metadataKey } from './metadata.js'
+import { LABELS } from './labels.js'
 
 type DriverContext = {
   log: Logger
@@ -111,37 +109,33 @@ const contextFromFlags = ({
   zone,
 })
 
-const questions = async (): Promise<Question[]> => {
-  const memoizedAvailableRegions = memoize(availableRegions)
-  return [
-    {
-      type: 'input',
-      name: 'project',
-      default: defaultProjectId,
-      message: flags['project-id'].description,
-    },
-    {
-      type: 'autocomplete',
-      name: 'region',
-      source: async ({ project }, input) => (await memoizedAvailableRegions(project))
-        .filter(({ name }) => !input || name.includes(input.toLowerCase()))
-        .map(r => r.name),
-      filter: i => i.toLowerCase(),
-    } as inquirerAutoComplete.AutocompleteQuestionOptions,
-    {
-      type: 'list',
-      name: 'zone',
-      choices: memoize(
-        async ({ project, region }) => (await availableRegions(project)).find(r => r.name === region)?.zones ?? [],
-      ),
-    } as ListQuestion,
-  ]
-}
+const inquireFlags = async () => {
+  const project = await inquirer.input({
+    default: await defaultProjectId(),
+    message: flags['project-id'].description as string,
+  })
 
-const flagsFromAnswers = async (answers: Record<string, unknown>): Promise<FlagTypes> => ({
-  'project-id': answers.project as string,
-  zone: answers.zone as string,
-})
+  const regionsForProject = await availableRegions(project)
+  const region = await inquirerAutoComplete<string>({
+    source: async input => regionsForProject
+      .filter(({ name }) => !input || name.includes(input.toLowerCase()))
+      .map(({ name }) => ({ value: name })),
+    transformer: i => i.toLowerCase(),
+    message: 'Region',
+  })
+
+  const zones = regionsForProject.find(({ name }) => name === region)?.zones
+  if (!zones) {
+    throw new Error(`No zones for region "${region}" in project "${project}"`)
+  }
+
+  const zone = await inquirer.select<string>({
+    message: flags.zone.description as string,
+    choices: zones.map(value => ({ value })),
+  })
+
+  return { 'project-id': project, zone }
+}
 
 const machineCreationFlags = {
   ...flags,
@@ -249,8 +243,7 @@ export default {
   factory,
   machineCreationFlags,
   machineCreationFactory,
-  questions,
-  flagsFromAnswers,
+  inquireFlags,
 } as const
 
-export { defaultProjectId } from './client'
+export { defaultProjectId } from './client.js'
diff --git a/packages/driver-gce/src/index.ts b/packages/driver-gce/src/index.ts
index 456e449d..3f2f774d 100644
--- a/packages/driver-gce/src/index.ts
+++ b/packages/driver-gce/src/index.ts
@@ -1,5 +1,5 @@
-import gce from './driver'
+import gce from './driver/index.js'
 
 export default gce
-export { defaultProjectId } from './driver'
-export { googleCloudStorageFs, defaultBucketName } from './fs'
+export { defaultProjectId } from './driver/index.js'
+export { googleCloudStorageFs, defaultBucketName } from './fs/index.js'
diff --git a/packages/driver-gce/src/static.ts b/packages/driver-gce/src/static.ts
index 74d73679..47bb8829 100644
--- a/packages/driver-gce/src/static.ts
+++ b/packages/driver-gce/src/static.ts
@@ -1,7 +1,11 @@
 import path from 'path'
 import fs from 'fs'
+import url from 'url'
 
-const DIR = path.join(__dirname, '../static')
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
+
+export const DIR = path.join(__dirname, '../static')
 
 export const readCloudConfig = () => fs.promises.readFile(
   path.join(DIR, 'cloud-config.yaml'),
diff --git a/packages/driver-gce/tsconfig.json b/packages/driver-gce/tsconfig.json
index efe53731..9267c46b 100644
--- a/packages/driver-gce/tsconfig.json
+++ b/packages/driver-gce/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -25,8 +25,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../common" },
     { "path": "../core" },
diff --git a/packages/driver-kube-pod/.eslintignore b/packages/driver-kube-pod/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/driver-kube-pod/.eslintignore
+++ b/packages/driver-kube-pod/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/driver-kube-pod/.eslintrc.cjs b/packages/driver-kube-pod/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/driver-kube-pod/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/driver-kube-pod/.eslintrc.js b/packages/driver-kube-pod/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/driver-kube-pod/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/driver-kube-pod/jest.config.cjs b/packages/driver-kube-pod/jest.config.cjs
new file mode 100644
index 00000000..d69d187d
--- /dev/null
+++ b/packages/driver-kube-pod/jest.config.cjs
@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  testMatch: ['!dist/', '**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.+)\\.js$': '$1',
+  },
+}
diff --git a/packages/driver-kube-pod/jest.config.js b/packages/driver-kube-pod/jest.config.js
deleted file mode 100644
index 1fd541c2..00000000
--- a/packages/driver-kube-pod/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testMatch: ['!dist/', '**/*.test.ts'],
-};
\ No newline at end of file
diff --git a/packages/driver-kube-pod/package.json b/packages/driver-kube-pod/package.json
index e58a275e..ddc4aeb4 100644
--- a/packages/driver-kube-pod/package.json
+++ b/packages/driver-kube-pod/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/driver-kube-pod",
   "version": "0.0.58",
   "description": "Kubernetes single Pod driver for Preevy",
-  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js"
+  },
+  "type": "module",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -15,21 +18,21 @@
     "@preevy/common": "0.0.58",
     "@preevy/core": "0.0.58",
     "fast-safe-stringify": "^2.1.1",
-    "inquirer": "^8.0.0",
+    "@inquirer/prompts": "^3.3.0",
     "is-stream": "^2.0.1",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "nunjucks": "^3.2.4",
     "p-retry": "^4.6.2",
     "yaml": "^2.3.2"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/stream-buffers": "^3.0.4",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-oclif": "^4",
@@ -43,13 +46,13 @@
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
-    "test": "yarn jest",
+    "test": "yarn node --experimental-vm-modules ../../node_modules/.bin/jest",
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
-    "build": "tsc -b",
+    "build": "tsc -b && shx cp -r static dist",
     "prepack": "yarn clean && yarn build",
     "prepare": "cd ../.. && husky install"
   }
diff --git a/packages/driver-kube-pod/src/driver/client/dynamic/apply.ts b/packages/driver-kube-pod/src/driver/client/dynamic/apply.ts
index a704485e..cca18a39 100644
--- a/packages/driver-kube-pod/src/driver/client/dynamic/apply.ts
+++ b/packages/driver-kube-pod/src/driver/client/dynamic/apply.ts
@@ -1,9 +1,9 @@
 import * as k8s from '@kubernetes/client-node'
 import { pSeries } from '@preevy/core'
 import { inspect } from 'util'
-import { bodyOrUndefined } from '../common'
-import waiter from './wait'
-import { FuncWrapper } from '../log-error'
+import { bodyOrUndefined } from '../common.js'
+import waiter from './wait.js'
+import { FuncWrapper } from '../log-error.js'
 
 export type ApplyFunc<Return = k8s.KubernetesObject | undefined> = (
   existingObject: k8s.KubernetesObject | undefined,
diff --git a/packages/driver-kube-pod/src/driver/client/dynamic/index.ts b/packages/driver-kube-pod/src/driver/client/dynamic/index.ts
index 87a1cd88..b6eba25f 100644
--- a/packages/driver-kube-pod/src/driver/client/dynamic/index.ts
+++ b/packages/driver-kube-pod/src/driver/client/dynamic/index.ts
@@ -1,11 +1,11 @@
 import * as k8s from '@kubernetes/client-node'
 import { HasRequired, ensureDefined } from '@preevy/core'
 import { asyncConcat, asyncMap } from 'iter-tools-es'
-import { defaults } from 'lodash'
-import { paginationIterator } from '../pagination'
-import apply from './apply'
-import waiter from './wait'
-import { FuncWrapper } from '../log-error'
+import { defaults } from 'lodash-es'
+import { paginationIterator } from '../pagination.js'
+import apply from './apply.js'
+import waiter from './wait.js'
+import { FuncWrapper } from '../log-error.js'
 
 const dynamicApi = (
   { client, wrap }: { client: k8s.KubernetesObjectApi; wrap: FuncWrapper },
@@ -58,4 +58,4 @@ const dynamicApi = (
 
 export default dynamicApi
 
-export { applyStrategies, applyStrategy, ApplyStrategy, compositeApplyFilter, ApplyFilter } from './apply'
+export { applyStrategies, applyStrategy, ApplyStrategy, compositeApplyFilter, ApplyFilter } from './apply.js'
diff --git a/packages/driver-kube-pod/src/driver/client/dynamic/wait.ts b/packages/driver-kube-pod/src/driver/client/dynamic/wait.ts
index 8dc7cf76..552c5859 100644
--- a/packages/driver-kube-pod/src/driver/client/dynamic/wait.ts
+++ b/packages/driver-kube-pod/src/driver/client/dynamic/wait.ts
@@ -1,6 +1,6 @@
 import * as k8s from '@kubernetes/client-node'
 import { ensureDefined, extractDefined } from '@preevy/core'
-import objectKindUrl from './url'
+import objectKindUrl from './url.js'
 
 const waiter = ({ watcher, client }: { watcher: k8s.Watch; client: k8s.KubernetesObjectApi }) => {
   const urlGetter = objectKindUrl(client)
diff --git a/packages/driver-kube-pod/src/driver/client/exec/api.ts b/packages/driver-kube-pod/src/driver/client/exec/api.ts
index c540b2d9..97be8fc5 100644
--- a/packages/driver-kube-pod/src/driver/client/exec/api.ts
+++ b/packages/driver-kube-pod/src/driver/client/exec/api.ts
@@ -1,11 +1,13 @@
 import * as k8s from '@kubernetes/client-node'
 import util from 'util'
 import retry from 'p-retry'
-import { readable as isReadableStream } from 'is-stream'
+import isStreamModule from 'is-stream'
 import { Logger } from '@preevy/core'
 import { Writable } from 'stream'
 import { ProcessOutputBuffers } from '@preevy/common'
-import { BaseExecOpts, ExecError, ReadableBufferStream, callbackWritableStream } from './common'
+import { BaseExecOpts, ExecError, ReadableBufferStream, callbackWritableStream } from './common.js'
+
+const { readable: isReadableStream } = isStreamModule
 
 export class WebSocketExecError extends ExecError {
   constructor(
diff --git a/packages/driver-kube-pod/src/driver/client/exec/index.ts b/packages/driver-kube-pod/src/driver/client/exec/index.ts
index 754a5265..c42b16b2 100644
--- a/packages/driver-kube-pod/src/driver/client/exec/index.ts
+++ b/packages/driver-kube-pod/src/driver/client/exec/index.ts
@@ -2,11 +2,11 @@ import { Writable } from 'stream'
 import * as k8s from '@kubernetes/client-node'
 import { Logger } from '@preevy/core'
 import { ProcessOutputBuffers } from '@preevy/common'
-import { BaseExecOpts } from './common'
-import apiExec from './api'
-import kubectlExec from './kubectl'
+import { BaseExecOpts } from './common.js'
+import apiExec from './api.js'
+import kubectlExec from './kubectl.js'
 
-export { BaseExecOpts } from './common'
+export { BaseExecOpts } from './common.js'
 
 export default (
   { kubeconfigLocation, kubeConfig, namespace, log }: {
diff --git a/packages/driver-kube-pod/src/driver/client/exec/kubectl.ts b/packages/driver-kube-pod/src/driver/client/exec/kubectl.ts
index 8fcb8237..40cdfed0 100644
--- a/packages/driver-kube-pod/src/driver/client/exec/kubectl.ts
+++ b/packages/driver-kube-pod/src/driver/client/exec/kubectl.ts
@@ -1,11 +1,13 @@
-import { readable as isReadableStream } from 'is-stream'
+import isStreamModule from 'is-stream'
 import { ProcessOutputBuffers } from '@preevy/common'
 import { Readable, Writable } from 'stream'
 import { ChildProcess, StdioOptions, spawn } from 'child_process'
-import { BaseExecOpts, ExecError, ReadableBufferStream, callbackWritableStream } from './common'
+import { BaseExecOpts, ExecError, ReadableBufferStream, callbackWritableStream } from './common.js'
 
 const isStreamWithFileDescriptor = (s: unknown) => typeof (s as { fd: number }).fd === 'number'
 
+const { readable: isReadableStream } = isStreamModule
+
 export class ProcessExecError extends ExecError {
   constructor(
     readonly command: string[],
diff --git a/packages/driver-kube-pod/src/driver/client/index.ts b/packages/driver-kube-pod/src/driver/client/index.ts
index 1ed8ca6a..21b4ad18 100644
--- a/packages/driver-kube-pod/src/driver/client/index.ts
+++ b/packages/driver-kube-pod/src/driver/client/index.ts
@@ -1,17 +1,17 @@
 import { createHash } from 'crypto'
 import { ListenOptions } from 'net'
-import stringify from 'fast-safe-stringify'
+import stringifyModule from 'fast-safe-stringify'
 import * as k8s from '@kubernetes/client-node'
 import nunjucks from 'nunjucks'
 import yaml from 'yaml'
 import { asyncToArray, asyncFirst } from 'iter-tools-es'
-import { maxBy } from 'lodash'
+import { maxBy } from 'lodash-es'
 import { inspect } from 'util'
 import { Logger } from '@preevy/core'
-import baseExec from './exec'
-import dynamicApi, { ApplyFilter, applyStrategies, compositeApplyFilter } from './dynamic'
-import basePortForward from './port-forward'
-import k8sHelpers from './k8s-helpers'
+import baseExec from './exec/index.js'
+import dynamicApi, { ApplyFilter, applyStrategies, compositeApplyFilter } from './dynamic/index.js'
+import basePortForward from './port-forward.js'
+import k8sHelpers from './k8s-helpers.js'
 import {
   LABELS,
   addEnvMetadata,
@@ -25,9 +25,11 @@ import {
   extractName,
   isDockerHostDeployment,
   ANNOTATIONS,
-} from './metadata'
-import { Package } from './common'
-import { logError } from './log-error'
+} from './metadata.js'
+import { Package } from './common.js'
+import { logError } from './log-error.js'
+
+const stringify = stringifyModule.default
 
 export const loadKubeConfig = (kubeconfig?: string, context?: string) => {
   const kc = new k8s.KubeConfig()
@@ -210,7 +212,7 @@ const kubeClient = ({ log, namespace, kc, profileId, template, package: packageD
 
 export type Client = ReturnType<typeof kubeClient>
 
-export { extractInstance, extractEnvId, extractName, extractNamespace, extractTemplateHash } from './metadata'
-export { DeploymentNotReadyError, DeploymentNotReadyErrorReason } from './k8s-helpers'
+export { extractInstance, extractEnvId, extractName, extractNamespace, extractTemplateHash } from './metadata.js'
+export { DeploymentNotReadyError, DeploymentNotReadyErrorReason } from './k8s-helpers.js'
 
 export default kubeClient
diff --git a/packages/driver-kube-pod/src/driver/client/k8s-helpers.ts b/packages/driver-kube-pod/src/driver/client/k8s-helpers.ts
index 8e364a79..f266dbce 100644
--- a/packages/driver-kube-pod/src/driver/client/k8s-helpers.ts
+++ b/packages/driver-kube-pod/src/driver/client/k8s-helpers.ts
@@ -1,8 +1,8 @@
 import * as k8s from '@kubernetes/client-node'
 import { ensureDefined, extractDefined } from '@preevy/core'
 import { asyncFilter, asyncFirst, asyncToArray } from 'iter-tools-es'
-import { paginationIterator } from './pagination'
-import { FuncWrapper } from './log-error'
+import { paginationIterator } from './pagination.js'
+import { FuncWrapper } from './log-error.js'
 
 export type DeploymentNotReadyErrorReason = 'NoRevision' | 'NoReplicaSet' | 'NoReadyPod'
 export class DeploymentNotReadyError extends Error {
diff --git a/packages/driver-kube-pod/src/driver/client/labels.test.ts b/packages/driver-kube-pod/src/driver/client/labels.test.ts
index 4d8cf81b..9e9e93ee 100644
--- a/packages/driver-kube-pod/src/driver/client/labels.test.ts
+++ b/packages/driver-kube-pod/src/driver/client/labels.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from '@jest/globals'
-import { repeat } from 'lodash'
-import { sanitizeLabel, sanitizeLabels } from './labels'
+import { repeat } from 'lodash-es'
+import { sanitizeLabel, sanitizeLabels } from './labels.js'
 
 describe('labels', () => {
   describe('sanitizeLabel', () => {
diff --git a/packages/driver-kube-pod/src/driver/client/labels.ts b/packages/driver-kube-pod/src/driver/client/labels.ts
index e3644dfb..7650f1b8 100644
--- a/packages/driver-kube-pod/src/driver/client/labels.ts
+++ b/packages/driver-kube-pod/src/driver/client/labels.ts
@@ -1,4 +1,4 @@
-import { mapValues } from 'lodash'
+import { mapValues } from 'lodash-es'
 import { truncateWithHash } from '@preevy/core'
 
 const MAX_LABEL_LENGTH = 63
diff --git a/packages/driver-kube-pod/src/driver/client/metadata.test.ts b/packages/driver-kube-pod/src/driver/client/metadata.test.ts
index 62c30035..5f68e0e2 100644
--- a/packages/driver-kube-pod/src/driver/client/metadata.test.ts
+++ b/packages/driver-kube-pod/src/driver/client/metadata.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from '@jest/globals'
-import { repeat } from 'lodash'
-import { envRandomName } from './metadata'
+import { repeat } from 'lodash-es'
+import { envRandomName } from './metadata.js'
 
 describe('metadata', () => {
   describe('envRandomName', () => {
diff --git a/packages/driver-kube-pod/src/driver/client/metadata.ts b/packages/driver-kube-pod/src/driver/client/metadata.ts
index 270b8119..aa019e36 100644
--- a/packages/driver-kube-pod/src/driver/client/metadata.ts
+++ b/packages/driver-kube-pod/src/driver/client/metadata.ts
@@ -1,7 +1,7 @@
 import * as k8s from '@kubernetes/client-node'
 import { extractDefined, randomString, truncatePrefix } from '@preevy/core'
-import { sanitizeLabel, sanitizeLabels } from './labels'
-import { HasMetadata, Package } from './common'
+import { sanitizeLabel, sanitizeLabels } from './labels.js'
+import { HasMetadata, Package } from './common.js'
 
 export const MAX_LABEL_LENGTH = 63
 
diff --git a/packages/driver-kube-pod/src/driver/common.ts b/packages/driver-kube-pod/src/driver/common.ts
index 8b5c3732..df0d378f 100644
--- a/packages/driver-kube-pod/src/driver/common.ts
+++ b/packages/driver-kube-pod/src/driver/common.ts
@@ -1,6 +1,6 @@
 import * as k8s from '@kubernetes/client-node'
 import { MachineBase, machineResourceType } from '@preevy/core'
-import { extractEnvId, extractInstance, extractName, extractNamespace } from './client'
+import { extractEnvId, extractInstance, extractName, extractNamespace } from './client/index.js'
 
 export type DeploymentMachine = MachineBase & {
   deployment: k8s.V1Deployment
diff --git a/packages/driver-kube-pod/src/driver/creation-driver.ts b/packages/driver-kube-pod/src/driver/creation-driver.ts
index 9678560c..6f87af4f 100644
--- a/packages/driver-kube-pod/src/driver/creation-driver.ts
+++ b/packages/driver-kube-pod/src/driver/creation-driver.ts
@@ -1,8 +1,8 @@
 import { Flags, Interfaces } from '@oclif/core'
 import { MachineCreationDriver, MachineCreationDriverFactory, telemetryEmitter } from '@preevy/core'
-import { pick } from 'lodash'
-import { DeploymentMachine, machineFromDeployment } from './common'
-import { DriverContext, clientFromConfiguration, machineConnection, flags as machineDriverFlags } from './driver'
+import { pick } from 'lodash-es'
+import { DeploymentMachine, machineFromDeployment } from './common.js'
+import { DriverContext, clientFromConfiguration, machineConnection, flags as machineDriverFlags } from './driver.js'
 
 export const flags = {
   ...machineDriverFlags,
diff --git a/packages/driver-kube-pod/src/driver/driver.ts b/packages/driver-kube-pod/src/driver/driver.ts
index 0cbeabc3..bf7af51b 100644
--- a/packages/driver-kube-pod/src/driver/driver.ts
+++ b/packages/driver-kube-pod/src/driver/driver.ts
@@ -14,9 +14,9 @@ import { asyncMap } from 'iter-tools-es'
 import { AddressInfo } from 'net'
 import { Readable, Writable } from 'stream'
 import { orderedOutput } from '@preevy/common'
-import { DeploymentMachine, ResourceType, machineFromDeployment } from './common'
-import createClient, { Client, extractName, loadKubeConfig } from './client'
-import { PACKAGE_JSON, DEFAULT_TEMPLATE } from '../static'
+import { DeploymentMachine, ResourceType, machineFromDeployment } from './common.js'
+import createClient, { Client, extractName, loadKubeConfig } from './client/index.js'
+import { DEFAULT_TEMPLATE, packageJson } from '../static.js'
 
 export type DriverContext = {
   log: Logger
@@ -177,8 +177,8 @@ export const clientFromConfiguration = ({ flags: f, profileId, log }: {
   kc: loadKubeConfig(f.kubeconfig, f.context),
   kubeconfig: f.kubeconfig,
   profileId,
-  package: fs.promises.readFile(PACKAGE_JSON, 'utf-8').then(JSON.parse),
-  template: fs.promises.readFile(f.template || DEFAULT_TEMPLATE, 'utf-8'),
+  package: packageJson,
+  template: fs.readFileSync(f.template || DEFAULT_TEMPLATE, 'utf-8'),
 })
 
 export const factory: MachineDriverFactory<
diff --git a/packages/driver-kube-pod/src/driver/index.ts b/packages/driver-kube-pod/src/driver/index.ts
index 2e9dd826..756f915a 100644
--- a/packages/driver-kube-pod/src/driver/index.ts
+++ b/packages/driver-kube-pod/src/driver/index.ts
@@ -1,12 +1,14 @@
-import { flags, factory } from './driver'
-import { flags as machineCreationFlags, factory as machineCreationFactory } from './creation-driver'
-import { flagsFromAnswers, questions } from './questions'
+import { flags, factory } from './driver.js'
+import { flags as machineCreationFlags, factory as machineCreationFactory } from './creation-driver.js'
+import { inquireFlags } from './questions.js'
+
+export type { DeploymentMachine, ResourceType } from './common.js'
+export type { MachineCreationFlagTypes } from './creation-driver.js'
 
 export default {
   flags,
   factory,
   machineCreationFlags,
   machineCreationFactory,
-  questions,
-  flagsFromAnswers,
+  inquireFlags,
 } as const
diff --git a/packages/driver-kube-pod/src/driver/questions.ts b/packages/driver-kube-pod/src/driver/questions.ts
index 338f37e8..3743fd0a 100644
--- a/packages/driver-kube-pod/src/driver/questions.ts
+++ b/packages/driver-kube-pod/src/driver/questions.ts
@@ -1,37 +1,27 @@
-import { InputQuestion, ListQuestion, ConfirmQuestion, Separator } from 'inquirer'
-import { MachineCreationFlagTypes, flags } from './creation-driver'
-import { loadKubeConfig } from './client'
+import * as inquirer from '@inquirer/prompts'
+import { MachineCreationFlagTypes, flags } from './creation-driver.js'
+import { loadKubeConfig } from './client/index.js'
 
-export const questions = async (): Promise<(InputQuestion | ListQuestion | ConfirmQuestion)[]> => [
-  {
-    type: 'input',
-    name: 'namespace',
-    default: flags.namespace.default,
-    message: flags.namespace.description,
-  },
-  {
-    type: 'list',
-    name: 'context',
-    choices: () => {
-      const kc = loadKubeConfig() // will read from KUBECONFIG env var as well
-      return [
-        { name: 'Default: use default context at runtime', value: undefined },
-        new Separator(),
-        ...kc.getContexts().map(c => c.name),
-      ]
-    },
-    message: flags.context.description,
-  },
-]
+export const inquireFlags = async (): Promise<Partial<MachineCreationFlagTypes>> => {
+  const namespace = await inquirer.input({
+    default: flags.namespace.default as string,
+    message: flags.namespace.description as string,
+  })
 
-export const flagsFromAnswers = async (
-  answers: Record<string, unknown>,
-): Promise<Partial<MachineCreationFlagTypes>> => {
-  const result = {
-    ...(answers.namespace && answers.namespace !== flags.namespace.default)
-      ? { namespace: answers.namespace as string } : undefined,
-    ...(answers.context && answers.context !== flags.context.default)
-      ? { context: answers.context as string } : undefined,
+  const kc = loadKubeConfig() // will read from KUBECONFIG env var as well
+  const contextChoices = [
+    { name: 'Default: use default context at runtime', value: undefined },
+    new inquirer.Separator(),
+    ...kc.getContexts().map(c => ({ value: c.name })),
+  ] as const
+
+  const context = await inquirer.select({
+    choices: contextChoices,
+    message: flags.context.description as string,
+  })
+
+  return {
+    ...(namespace && namespace !== flags.namespace.default) ? { namespace } : undefined,
+    ...(context && context !== flags.context.default) ? { context } : undefined,
   }
-  return result
 }
diff --git a/packages/driver-kube-pod/src/index.ts b/packages/driver-kube-pod/src/index.ts
index b23d6227..552163e8 100644
--- a/packages/driver-kube-pod/src/index.ts
+++ b/packages/driver-kube-pod/src/index.ts
@@ -1,3 +1,4 @@
-import kubeDocker from './driver'
+import kubeDocker from './driver/index.js'
 
+export type * from './driver/index.js'
 export default kubeDocker
diff --git a/packages/driver-kube-pod/src/static.ts b/packages/driver-kube-pod/src/static.ts
index 7fb908de..c8723301 100644
--- a/packages/driver-kube-pod/src/static.ts
+++ b/packages/driver-kube-pod/src/static.ts
@@ -1,5 +1,10 @@
 import path from 'path'
+import url from 'url'
+import packageJsonImport from '../package.json' assert { type: 'json' }
 
-const DIR = path.join(__dirname, '../static')
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
+
+export const DIR = path.join(__dirname, '../static')
 export const DEFAULT_TEMPLATE = path.join(DIR, './default-template.yaml.njk')
-export const PACKAGE_JSON = path.join(__dirname, '..', 'package.json')
+export const packageJson = packageJsonImport
diff --git a/packages/driver-kube-pod/tsconfig.json b/packages/driver-kube-pod/tsconfig.json
index efe53731..c5996423 100644
--- a/packages/driver-kube-pod/tsconfig.json
+++ b/packages/driver-kube-pod/tsconfig.json
@@ -1,10 +1,11 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "NodeNext",
+    "target": "ES2020",
+    "resolveJsonModule": true,
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -25,8 +26,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../common" },
     { "path": "../core" },
diff --git a/packages/driver-lightsail/.eslintignore b/packages/driver-lightsail/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/driver-lightsail/.eslintignore
+++ b/packages/driver-lightsail/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/driver-lightsail/.eslintrc.cjs b/packages/driver-lightsail/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/driver-lightsail/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/driver-lightsail/.eslintrc.js b/packages/driver-lightsail/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/driver-lightsail/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/driver-lightsail/package.json b/packages/driver-lightsail/package.json
index 890467fb..c6c92603 100644
--- a/packages/driver-lightsail/package.json
+++ b/packages/driver-lightsail/package.json
@@ -2,7 +2,10 @@
   "name": "@preevy/driver-lightsail",
   "version": "0.0.58",
   "description": "AWS Lightsail driver for Preevy",
-  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js"
+  },
+  "type": "module",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -16,18 +19,17 @@
     "@aws-sdk/util-waiter": "^3.271.0",
     "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-10",
     "@preevy/core": "0.0.58",
-    "inquirer": "^8.0.0",
-    "inquirer-autocomplete-prompt": "^2.0.0",
+    "inquirer-autocomplete-standalone": "^0.8.1",
     "iter-tools-es": "^7.5.3",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-oclif": "^4",
@@ -41,12 +43,12 @@
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.tsx --cache",
     "clean": "shx rm -rf dist tsconfig.tsbuildinfo",
-    "build": "tsc -b",
+    "build": "tsc -b && shx cp -r static dist",
     "prepack": "yarn clean && yarn build",
     "prepare": "cd ../.. && husky install"
   }
diff --git a/packages/driver-lightsail/src/aws-utils/index.ts b/packages/driver-lightsail/src/aws-utils/index.ts
index 78b030af..347d0579 100644
--- a/packages/driver-lightsail/src/aws-utils/index.ts
+++ b/packages/driver-lightsail/src/aws-utils/index.ts
@@ -1,2 +1,2 @@
-export * from './account-id'
-export * from './pagination'
+export * from './account-id.js'
+export * from './pagination.js'
diff --git a/packages/driver-lightsail/src/driver/client.ts b/packages/driver-lightsail/src/driver/client.ts
index 587f98a5..52eb1121 100644
--- a/packages/driver-lightsail/src/driver/client.ts
+++ b/packages/driver-lightsail/src/driver/client.ts
@@ -9,10 +9,10 @@ import { randomBytes } from 'crypto'
 import { asyncFilter, asyncFind, asyncFirst } from 'iter-tools-es'
 
 import { ensureDefined, extractDefined } from '@preevy/core'
-import { paginationIterator } from '../aws-utils/pagination'
-import { waitUntilAllOperationsSucceed } from './operation-waiter'
-import { BundleId, bundleIdEqualOrLarger, bundleIdFromString } from './bundle-id'
-import { instanceTags, instanceTagsPredicate, keypairTags, keypairTagsPredicate, snapshotTags, snapshotTagsPredicate } from './tags'
+import { paginationIterator } from '../aws-utils/pagination.js'
+import { waitUntilAllOperationsSucceed } from './operation-waiter.js'
+import { BundleId, bundleIdEqualOrLarger, bundleIdFromString } from './bundle-id.js'
+import { instanceTags, instanceTagsPredicate, keypairTags, keypairTagsPredicate, snapshotTags, snapshotTagsPredicate } from './tags.js'
 
 export const REGIONS = [
   'us-east-2',
diff --git a/packages/driver-lightsail/src/driver/index.ts b/packages/driver-lightsail/src/driver/index.ts
index 57655e49..c888814e 100644
--- a/packages/driver-lightsail/src/driver/index.ts
+++ b/packages/driver-lightsail/src/driver/index.ts
@@ -4,24 +4,21 @@ import { asyncConcat, asyncMap } from 'iter-tools-es'
 import { Flags } from '@oclif/core'
 import { randomBytes } from 'crypto'
 import { InferredFlags } from '@oclif/core/lib/interfaces'
-import inquirer, { Question } from 'inquirer'
-import inquirerAutoComplete from 'inquirer-autocomplete-prompt'
+import inquirerAutoComplete from 'inquirer-autocomplete-standalone'
 import {
   telemetryEmitter,
   SshMachine, MachineDriver, MachineCreationDriver, MachineCreationDriverFactory, machineResourceType,
   MachineDriverFactory, sshKeysStore, Store,
   getStoredSshKey, sshDriver, extractDefined, Logger, machineStatusNodeExporterCommand,
 } from '@preevy/core'
-import { pick } from 'lodash'
-import createClient, { Client, REGIONS } from './client'
-import { BUNDLE_IDS, BundleId, bundleIdFromString } from './bundle-id'
-import { CUSTOMIZE_BARE_MACHINE } from './scripts'
-import { CURRENT_MACHINE_VERSION, TAGS, requiredTag } from './tags'
+import { pick } from 'lodash-es'
+import createClient, { Client, REGIONS } from './client.js'
+import { BUNDLE_IDS, BundleId, bundleIdFromString } from './bundle-id.js'
+import { CUSTOMIZE_BARE_MACHINE } from './scripts.js'
+import { CURRENT_MACHINE_VERSION, TAGS, requiredTag } from './tags.js'
 
 export { BundleId, BUNDLE_IDS, bundleIdFromString as bundleId }
 
-inquirer.registerPrompt('autocomplete', inquirerAutoComplete)
-
 type ResourceType = typeof machineResourceType | 'snapshot' | 'keypair'
 
 const machineFromInstance = (
@@ -122,21 +119,16 @@ const contextFromFlags = ({ region }: FlagTypes): { region: string } => ({
   region: region as string,
 })
 
-const questions = async (): Promise<Question[]> => [
-  {
-    type: 'autocomplete',
-    name: 'region',
+const inquireFlags = async () => {
+  const region = await inquirerAutoComplete<string>({
     default: process.env.AWS_REGION ?? 'us-east-1',
-    message: flags.region.description,
-    source: async (_opts, input) => REGIONS.filter(r => !input || r.includes(input.toLowerCase())),
+    message: flags.region.description as string,
+    source: async input => REGIONS.filter(r => !input || r.includes(input.toLowerCase())).map(value => ({ value })),
     suggestOnly: true,
-    filter: i => i.toLowerCase(),
-  } as inquirerAutoComplete.AutocompleteQuestionOptions,
-]
-
-const flagsFromAnswers = async (answers: Record<string, unknown>): Promise<FlagTypes> => ({
-  region: answers.region as string,
-})
+    transformer: i => i.toLowerCase(),
+  })
+  return { region }
+}
 
 const factory: MachineDriverFactory<FlagTypes, SshMachine, ResourceType> = ({
   flags: f,
@@ -294,6 +286,5 @@ export default {
   factory,
   machineCreationFlags,
   machineCreationFactory,
-  questions,
-  flagsFromAnswers,
+  inquireFlags,
 } as const
diff --git a/packages/driver-lightsail/src/driver/scripts.ts b/packages/driver-lightsail/src/driver/scripts.ts
index 4006d898..9075710d 100644
--- a/packages/driver-lightsail/src/driver/scripts.ts
+++ b/packages/driver-lightsail/src/driver/scripts.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import { SCRIPT_DIR as DIR } from '../static'
+import { SCRIPT_DIR as DIR } from '../static.js'
 
 export const CUSTOMIZE_BARE_MACHINE = [
   'increase-open-files-limits.sh',
diff --git a/packages/driver-lightsail/src/index.ts b/packages/driver-lightsail/src/index.ts
index 51e92220..94d0439a 100644
--- a/packages/driver-lightsail/src/index.ts
+++ b/packages/driver-lightsail/src/index.ts
@@ -1,6 +1,6 @@
-import lightsail from './driver'
+import lightsail from './driver/index.js'
 
 export default lightsail
-export * as awsUtils from './aws-utils'
-export { REGIONS as LIGHTSAIL_REGIONS } from './driver/client'
-export { s3fs, defaultBucketName, S3_REGIONS } from './fs'
+export * as awsUtils from './aws-utils/index.js'
+export { REGIONS as LIGHTSAIL_REGIONS } from './driver/client.js'
+export { s3fs, defaultBucketName, S3_REGIONS } from './fs/index.js'
diff --git a/packages/driver-lightsail/src/static.ts b/packages/driver-lightsail/src/static.ts
index 8b74fab9..af003a00 100644
--- a/packages/driver-lightsail/src/static.ts
+++ b/packages/driver-lightsail/src/static.ts
@@ -1,4 +1,8 @@
 import path from 'path'
+import url from 'url'
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 export const DIR = path.join(__dirname, '../static')
 export const SCRIPT_DIR = path.join(DIR, 'scripts')
diff --git a/packages/driver-lightsail/tsconfig.json b/packages/driver-lightsail/tsconfig.json
index efe53731..9267c46b 100644
--- a/packages/driver-lightsail/tsconfig.json
+++ b/packages/driver-lightsail/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -25,8 +25,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../common" },
     { "path": "../core" },
diff --git a/packages/plugin-github/.eslintignore b/packages/plugin-github/.eslintignore
index 4a74d128..33bffeaa 100644
--- a/packages/plugin-github/.eslintignore
+++ b/packages/plugin-github/.eslintignore
@@ -1,3 +1,3 @@
-/.eslintrc.js
+/.eslintrc.cjs
 /dist
 /build.mjs
\ No newline at end of file
diff --git a/packages/plugin-github/.eslintrc.cjs b/packages/plugin-github/.eslintrc.cjs
new file mode 100644
index 00000000..1a4bf217
--- /dev/null
+++ b/packages/plugin-github/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('../../build_utils/eslintrc.cjs')
\ No newline at end of file
diff --git a/packages/plugin-github/.eslintrc.js b/packages/plugin-github/.eslintrc.js
deleted file mode 100644
index de29daef..00000000
--- a/packages/plugin-github/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../build_utils/eslintrc.js')
\ No newline at end of file
diff --git a/packages/plugin-github/package.json b/packages/plugin-github/package.json
index 79a5af56..cfe3914b 100644
--- a/packages/plugin-github/package.json
+++ b/packages/plugin-github/package.json
@@ -1,8 +1,11 @@
 {
   "name": "@preevy/plugin-github",
   "version": "0.0.58",
-  "description": "",
-  "main": "dist/index.js",
+  "description": "Preevy plugin for GitHub",
+  "exports": {
+    ".": "./dist/index.js"
+  },
+  "type": "module",
   "files": [
     "dist"
   ],
@@ -11,18 +14,18 @@
     "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-10",
     "@preevy/cli-common": "0.0.58",
     "@preevy/core": "0.0.58",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "nunjucks": "^3.2.4",
     "octokit": "^3.1.1"
   },
   "devDependencies": {
     "@types/nunjucks": "^3.2.2",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "lint-staged": "^15.2.0",
     "shx": "^0.3.3",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts,.tsx --cache",
diff --git a/packages/plugin-github/src/commands/github/base.ts b/packages/plugin-github/src/commands/github/base.ts
index ede56876..9a6efba6 100644
--- a/packages/plugin-github/src/commands/github/base.ts
+++ b/packages/plugin-github/src/commands/github/base.ts
@@ -1,8 +1,8 @@
 import { Command, Flags, Interfaces } from '@oclif/core'
 import { BaseCommand, ParsedFlags, envIdFlags } from '@preevy/cli-common'
 import { CiProvider, detectCiProvider, findEnvId } from '@preevy/core'
-import { PluginConfig, loadGithubConfig } from '../../config'
-import { flagsDef } from '../../flags'
+import { PluginConfig, loadGithubConfig } from '../../config.js'
+import { flagsDef } from '../../flags.js'
 
 // eslint-disable-next-line no-use-before-define
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof BaseGithubCommand['baseFlags'] & T['flags']>
diff --git a/packages/plugin-github/src/commands/github/pr/base.ts b/packages/plugin-github/src/commands/github/pr/base.ts
index 7809f552..e181a49d 100644
--- a/packages/plugin-github/src/commands/github/pr/base.ts
+++ b/packages/plugin-github/src/commands/github/pr/base.ts
@@ -1,8 +1,8 @@
 import { Command, Flags, Interfaces } from '@oclif/core'
 import { ParsedFlags } from '@preevy/cli-common'
-import { commentTemplateFlagDef, flagsDef, pullRequestFlagsDef } from '../../../flags'
-import BaseGithubCommand from '../base'
-import { GithubConfig, loadGithubPullRequestCommentConfig, loadGithubPullRequestConfig } from '../../../config'
+import { commentTemplateFlagDef, flagsDef, pullRequestFlagsDef } from '../../../flags.js'
+import BaseGithubCommand from '../base.js'
+import { GithubConfig, loadGithubPullRequestCommentConfig, loadGithubPullRequestConfig } from '../../../config.js'
 
 const ensureConfig = <T extends GithubConfig>(config: T | undefined) => {
   if (!config) {
diff --git a/packages/plugin-github/src/commands/github/pr/comment.ts b/packages/plugin-github/src/commands/github/pr/comment.ts
index 21f3f283..788ab75f 100644
--- a/packages/plugin-github/src/commands/github/pr/comment.ts
+++ b/packages/plugin-github/src/commands/github/pr/comment.ts
@@ -1,8 +1,8 @@
 import { Octokit } from 'octokit'
 import { FlatTunnel } from '@preevy/core'
-import { upsertPreevyComment } from '../../../lib/github-comment'
-import BaseGithubPrCommand from './base'
-import { commentTemplateFlagDef } from '../../../flags'
+import { upsertPreevyComment } from '../../../lib/github-comment.js'
+import BaseGithubPrCommand from './base.js'
+import { commentTemplateFlagDef } from '../../../flags.js'
 
 // eslint-disable-next-line no-use-before-define
 class CommentGithubPr extends BaseGithubPrCommand<typeof CommentGithubPr> {
diff --git a/packages/plugin-github/src/commands/github/pr/uncomment.ts b/packages/plugin-github/src/commands/github/pr/uncomment.ts
index 877bcfc9..164318a6 100644
--- a/packages/plugin-github/src/commands/github/pr/uncomment.ts
+++ b/packages/plugin-github/src/commands/github/pr/uncomment.ts
@@ -1,8 +1,8 @@
 import { Command, Flags, Interfaces } from '@oclif/core'
 import { Octokit } from 'octokit'
-import { upsertPreevyComment } from '../../../lib/github-comment'
-import BaseGithubPrCommand from './base'
-import { commentTemplateFlagDef } from '../../../flags'
+import { upsertPreevyComment } from '../../../lib/github-comment.js'
+import BaseGithubPrCommand from './base.js'
+import { commentTemplateFlagDef } from '../../../flags.js'
 
 // eslint-disable-next-line no-use-before-define
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof UnCommentGithubPr['baseFlags'] & T['flags']>
diff --git a/packages/plugin-github/src/config.ts b/packages/plugin-github/src/config.ts
index 52931ad8..4de54fad 100644
--- a/packages/plugin-github/src/config.ts
+++ b/packages/plugin-github/src/config.ts
@@ -1,9 +1,9 @@
 import fs from 'fs'
 import { CiProvider, gitContext } from '@preevy/core'
 import { ParsedFlags } from '@preevy/cli-common'
-import { tryParseUrlToRepo } from './repo'
-import { commentTemplateFlagDef, flagsDef, pullRequestFlagsDef } from './flags'
-import { defaultCommentTemplate } from './lib/github-comment'
+import { tryParseUrlToRepo } from './repo.js'
+import { commentTemplateFlagDef, flagsDef, pullRequestFlagsDef } from './flags.js'
+import { defaultCommentTemplate } from './lib/github-comment.js'
 
 export type PluginConfig = {
   repo?: string
diff --git a/packages/plugin-github/src/flags.ts b/packages/plugin-github/src/flags.ts
index 823da760..90b8e220 100644
--- a/packages/plugin-github/src/flags.ts
+++ b/packages/plugin-github/src/flags.ts
@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core'
-import { mapKeys } from 'lodash'
+import { mapKeys } from 'lodash-es'
 import { ParsedFlags, parseFlags } from '@preevy/cli-common'
-import { tryParseRepo } from './repo'
+import { tryParseRepo } from './repo.js'
 
 const HELP_GROUP = 'GitHub integration'
 
diff --git a/packages/plugin-github/src/hooks.ts b/packages/plugin-github/src/hooks.ts
index c9b9ef61..cde8a9c6 100644
--- a/packages/plugin-github/src/hooks.ts
+++ b/packages/plugin-github/src/hooks.ts
@@ -2,10 +2,10 @@ import { HookFunc, HookName } from '@preevy/cli-common'
 import { Octokit } from 'octokit'
 import { Config as OclifConfig } from '@oclif/core/lib/interfaces'
 import { Logger, detectCiProvider } from '@preevy/core'
-import { mapValues, memoize } from 'lodash'
-import { upsertPreevyComment, Content } from './lib/github-comment'
-import { parseUpDownFlagsDef } from './flags'
-import { PluginConfig, loadGithubPullRequestCommentConfig } from './config'
+import { mapValues, memoize } from 'lodash-es'
+import { upsertPreevyComment, Content } from './lib/github-comment.js'
+import { parseUpDownFlagsDef } from './flags.js'
+import { PluginConfig, loadGithubPullRequestCommentConfig } from './config.js'
 
 const COMMENT_ENABLED_ENV_KEY = 'GITHUB_PR_COMMENT_ENABLED'
 
diff --git a/packages/plugin-github/src/index.ts b/packages/plugin-github/src/index.ts
index ca7b73a7..bda6f4a0 100644
--- a/packages/plugin-github/src/index.ts
+++ b/packages/plugin-github/src/index.ts
@@ -1,9 +1,9 @@
 import { Plugin } from '@preevy/cli-common'
-import { envCreated, envDeleted, userModelFilter } from './hooks'
-import { PluginConfig } from './config'
-import { upDownFlagsDef } from './flags'
-import CommentGithubPr from './commands/github/pr/comment'
-import UnCommentGithubPr from './commands/github/pr/uncomment'
+import { envCreated, envDeleted, userModelFilter } from './hooks.js'
+import { PluginConfig } from './config.js'
+import { upDownFlagsDef } from './flags.js'
+import CommentGithubPr from './commands/github/pr/comment.js'
+import UnCommentGithubPr from './commands/github/pr/uncomment.js'
 
 export const preevyPlugin: Plugin<PluginConfig> = {
   init: async context => ({
diff --git a/packages/plugin-github/tsconfig.json b/packages/plugin-github/tsconfig.json
index 7ba3665a..656f0369 100644
--- a/packages/plugin-github/tsconfig.json
+++ b/packages/plugin-github/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2022"],
-    "module": "CommonJS",
-    "target": "ES2019",
-    "moduleResolution": "node",
+    "lib": ["es2022", "ESNext.Disposable"],
+    "module": "Node16",
+    "target": "ES2020",
+    "moduleResolution": "Node16",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
@@ -24,8 +24,11 @@
     "baseUrl": ".",
     "rootDir": "src",
   },
+  "ts-node": {
+    "esm": true
+  },
   "include": ["**/*"],
-  "exclude": ["jest.config.js", "dist", "lint-staged.config.cjs"],
+  "exclude": ["jest.config.cjs", "dist", "lint-staged.config.cjs"],
   "references": [
     { "path": "../cli-common" },
   ]
diff --git a/site/docs/cli-reference/down.md b/site/docs/cli-reference/down.md
index ae053ecd..26ac9aec 100644
--- a/site/docs/cli-reference/down.md
+++ b/site/docs/cli-reference/down.md
@@ -16,14 +16,15 @@ USAGE
     <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
     [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template
     <value>] [--id <value>] [--force] [--wait] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
+    auto|no|always]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
       --force            Do not error if the environment is not found
-      --id=<value>       Environment id - affects created URLs. If not specified, will try to detect automatically
-      --profile=<value>  Run in a specific profile context
+      --id=<value>       Environment id
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
@@ -45,6 +46,7 @@ GCE DRIVER FLAGS
   --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -65,6 +67,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Delete preview environments
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/down.ts)_
+_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/down.ts)_
diff --git a/site/docs/cli-reference/help.md b/site/docs/cli-reference/help.md
index 3c1a6049..ba8df910 100644
--- a/site/docs/cli-reference/help.md
+++ b/site/docs/cli-reference/help.md
@@ -23,4 +23,4 @@ DESCRIPTION
   Display help for preevy.
 ```
 
-_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/help.ts)_
diff --git a/site/docs/cli-reference/index.md b/site/docs/cli-reference/index.md
index c7158aa7..38f84030 100644
--- a/site/docs/cli-reference/index.md
+++ b/site/docs/cli-reference/index.md
@@ -20,7 +20,7 @@ $ npm install -g preevy
 $ preevy COMMAND
 running command...
 $ preevy (--version)
-preevy/0.0.56 darwin-arm64 node-v18.12.1
+preevy/0.0.58 darwin-arm64 node-v18.12.1
 $ preevy --help [COMMAND]
 USAGE
   $ preevy COMMAND
diff --git a/site/docs/cli-reference/init.md b/site/docs/cli-reference/init.md
index 2c87fa87..abd197c7 100644
--- a/site/docs/cli-reference/init.md
+++ b/site/docs/cli-reference/init.md
@@ -12,13 +12,13 @@ Initialize or import a new profile
 ```
 USAGE
   $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [-f <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
 
 ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
+  PROFILE-ALIAS  Name of the profile
 
 FLAGS
-  -f, --from=<value>  Import profile from existing path
+  --from=<value>  Import profile from existing path
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -32,4 +32,4 @@ DESCRIPTION
   Initialize or import a new profile
 ```
 
-_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/init.ts)_
diff --git a/site/docs/cli-reference/login.md b/site/docs/cli-reference/login.md
index e6cfcdb6..5134f064 100644
--- a/site/docs/cli-reference/login.md
+++ b/site/docs/cli-reference/login.md
@@ -31,4 +31,4 @@ DESCRIPTION
   Login to the Livecycle SaaS
 ```
 
-_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/login.ts)_
diff --git a/site/docs/cli-reference/logs.md b/site/docs/cli-reference/logs.md
index 22158616..230148b2 100644
--- a/site/docs/cli-reference/logs.md
+++ b/site/docs/cli-reference/logs.md
@@ -25,9 +25,9 @@ FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
       --follow           Follow log output
-      --id=<value>       Environment id - affects created URLs. If not specified, will try to detect automatically
+      --id=<value>       Environment id
       --no-log-prefix    Don't print log prefix in logs
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --since=<value>    Show logs since timestamp
       --tail=<value>     Number of lines to show from the end of the logs for each container (default: all)
       --timestamps       Show timestamps
@@ -61,6 +61,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Show logs for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/logs.ts)_
diff --git a/site/docs/cli-reference/ls.md b/site/docs/cli-reference/ls.md
index 6b6d8960..1c902327 100644
--- a/site/docs/cli-reference/ls.md
+++ b/site/docs/cli-reference/ls.md
@@ -21,16 +21,7 @@ USAGE
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  -x, --extended         show extra columns
-      --columns=<value>  only show provided columns (comma-separated)
-      --csv              output is csv format [alias: --output=csv]
-      --filter=<value>   filter property by partial string matching, ex: name=foo
-      --no-header        hide table header from output
-      --no-truncate      do not truncate output to fit screen
-      --output=<option>  output in a more machine friendly format
-                         <options: csv|json|yaml>
-      --profile=<value>  Run in a specific profile context
-      --sort=<value>     property to sort by (prepend '-' for descending)
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -41,6 +32,17 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
@@ -63,4 +65,4 @@ DESCRIPTION
   List preview environments
 ```
 
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
+_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
diff --git a/site/docs/cli-reference/profile.md b/site/docs/cli-reference/profile.md
index 5939fe77..4f1c03ef 100644
--- a/site/docs/cli-reference/profile.md
+++ b/site/docs/cli-reference/profile.md
@@ -35,7 +35,7 @@ USAGE
 FLAGS
   -d, --driver=<option>    Machine driver to use
                            <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context
+      --profile=<value>    Run in a specific profile context (either an alias or a URL)
       --unset=<option>...  [default: ] Unset a configuration option
                            <options: lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-po
                            d-namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zon
@@ -78,7 +78,7 @@ DESCRIPTION
   View and update profile configuration
 ```
 
-_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/update.ts)_
+_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/update.ts)_
 
 ## `preevy profile config view`
 
@@ -90,7 +90,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -105,7 +105,7 @@ DESCRIPTION
   View profile configuration
 ```
 
-_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/view.ts)_
+_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/view.ts)_
 
 ## `preevy profile cp`
 
@@ -138,7 +138,7 @@ DESCRIPTION
   Copy a profile
 ```
 
-_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/cp.ts)_
+_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/cp.ts)_
 
 ## `preevy profile create NAME URL`
 
@@ -161,7 +161,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --use              Mark the new profile as the current profile
 
 GLOBAL FLAGS
@@ -202,7 +202,7 @@ DESCRIPTION
   Create a new profile
 ```
 
-_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/create.ts)_
+_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/create.ts)_
 
 ## `preevy profile current`
 
@@ -214,7 +214,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -229,7 +229,7 @@ DESCRIPTION
   Display current profile in use
 ```
 
-_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/current.ts)_
+_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/current.ts)_
 
 ## `preevy profile import LOCATION`
 
@@ -259,7 +259,7 @@ DESCRIPTION
   Import an existing profile
 ```
 
-_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/import.ts)_
+_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/import.ts)_
 
 ## `preevy profile key [TYPE]`
 
@@ -274,7 +274,7 @@ ARGUMENTS
   TYPE  (private|public-pem|public-ssh|thumbprint|thumbprint-uri) [default: thumbprint-uri] type of the key to show
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -289,7 +289,7 @@ DESCRIPTION
   Show profile key
 ```
 
-_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/key.ts)_
+_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/key.ts)_
 
 ## `preevy profile link`
 
@@ -304,7 +304,7 @@ FLAGS
   --access-token=<value>  Livecycle's Access Token
   --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
   --org=<value>           Target organization slug for linking the profile
-  --profile=<value>       Run in a specific profile context
+  --profile=<value>       Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -318,7 +318,7 @@ DESCRIPTION
   Link the profile to the logged in user's organization
 ```
 
-_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/link.ts)_
+_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/link.ts)_
 
 ## `preevy profile ls`
 
@@ -327,10 +327,12 @@ Lists profiles
 ```
 USAGE
   $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
+    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --json
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -338,14 +340,24 @@ GLOBAL FLAGS
   -p, --project=<value>                 Project name. Defaults to the Compose project name
       --disable-plugin=<value>...       Disable plugin with specified package name
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Lists profiles
 ```
 
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
+_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
 
 ## `preevy profile rm NAME`
 
@@ -354,13 +366,14 @@ Remove a profile
 ```
 USAGE
   $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
 
 ARGUMENTS
   NAME  name of the profile to remove
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --force            Do not error if the profile is not found
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -375,7 +388,7 @@ DESCRIPTION
   Remove a profile
 ```
 
-_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/rm.ts)_
+_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/rm.ts)_
 
 ## `preevy profile use NAME`
 
@@ -401,4 +414,4 @@ DESCRIPTION
   Set current profile
 ```
 
-_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/use.ts)_
+_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/use.ts)_
diff --git a/site/docs/cli-reference/purge.md b/site/docs/cli-reference/purge.md
index ccb7aa1b..84ee4e01 100644
--- a/site/docs/cli-reference/purge.md
+++ b/site/docs/cli-reference/purge.md
@@ -22,7 +22,7 @@ FLAGS
                          <options: lightsail|gce|azure|kube-pod>
       --all              Remove all resources types (snapshots, keypairs, and other resource types)
       --force            Do not ask for confirmation
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --type=<value>...  [default: machine] Resource type(s) to delete
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
@@ -58,4 +58,4 @@ DESCRIPTION
   Delete all cloud provider machines, and potentially other resources
 ```
 
-_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/purge.ts)_
+_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/purge.ts)_
diff --git a/site/docs/cli-reference/ssh.md b/site/docs/cli-reference/ssh.md
index 23a52e6a..a4755b86 100644
--- a/site/docs/cli-reference/ssh.md
+++ b/site/docs/cli-reference/ssh.md
@@ -23,7 +23,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
diff --git a/site/docs/cli-reference/up.md b/site/docs/cli-reference/up.md
index 9d1d5b6b..96028295 100644
--- a/site/docs/cli-reference/up.md
+++ b/site/docs/cli-reference/up.md
@@ -19,10 +19,12 @@ USAGE
     [--lightsail-availability-zone <value>] [--lightsail-bundle-id
     nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
     [--azure-vm-size <value>] [--kube-pod-server-side-apply] [--id <value>] [-t <value>] [--tls-hostname <value>]
-    [--insecure-skip-verify] [--skip-unchanged-files] [--show-preevy-service-urls] [--output-urls-to <value>] [--columns
-    <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort
-    <value>] [--github-token <value>] [--github-repo <value>] [--github-pull-request <value>]
-    [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
+    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
+    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
+    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
+    [--github-pr-comment-enabled auto|no|always]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
@@ -32,25 +34,16 @@ FLAGS
                                           <options: lightsail|gce|azure|kube-pod>
   -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
                                           or ssh+tls://hostname[:port]
-  -x, --extended                          show extra columns
-      --access-credentials-type=<option>  (required) [default: browser]
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
                                           <options: api|browser>
-      --columns=<value>                   only show provided columns (comma-separated)
-      --csv                               output is csv format [alias: --output=csv]
-      --filter=<value>                    filter property by partial string matching, ex: name=foo
-      --id=<value>                        Environment id - affects created URLs. If not specified, will try to detect
-                                          automatically
+      --id=<value>                        Environment id
       --include-access-credentials        Include access credentials for basic auth for each service URL
       --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --no-header                         hide table header from output
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --show-preevy-service-urls          Show URLs for internal Preevy services
       --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
-      --sort=<value>                      property to sort by (prepend '-' for descending)
+      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -61,17 +54,40 @@ GLOBAL FLAGS
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
   --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
 
+BUILD FLAGS
+  --builder=<value>               Builder to use
+  --no-build                      Do not build images
+  --no-cache                      Do not use cache when building the images
+  --no-registry-cache             Do not add the registry as a cache source and target
+  --no-registry-single-name       Disable auto-detection for ECR-style registry single name
+  --registry=<value>              Image registry. If this flag is specified, the "build-context" flag defaults to
+                                  "*local"
+  --registry-single-name=<value>  Use single name for image registry, ECR-style. Default: auto-detect from "registry"
+                                  flag
+
 GCE DRIVER FLAGS
   --gce-machine-type=<value>  Machine type to be provisioned
   --gce-project-id=<value>    Google Cloud project ID
   --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -97,6 +113,12 @@ LIGHTSAIL DRIVER FLAGS
 
 DESCRIPTION
   Bring up a preview environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/up.ts)_
+_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/up.ts)_
diff --git a/site/docs/cli-reference/urls.md b/site/docs/cli-reference/urls.md
index 398c3a98..c720bab0 100644
--- a/site/docs/cli-reference/urls.md
+++ b/site/docs/cli-reference/urls.md
@@ -24,24 +24,14 @@ ARGUMENTS
 FLAGS
   -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
                                           or ssh+tls://hostname[:port]
-  -x, --extended                          show extra columns
-      --access-credentials-type=<option>  (required) [default: browser]
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
                                           <options: api|browser>
-      --columns=<value>                   only show provided columns (comma-separated)
-      --csv                               output is csv format [alias: --output=csv]
-      --filter=<value>                    filter property by partial string matching, ex: name=foo
-      --id=<value>                        Environment id - affects created URLs. If not specified, will try to detect
-                                          automatically
+      --id=<value>                        Environment id
       --include-access-credentials        Include access credentials for basic auth for each service URL
       --insecure-skip-verify              Skip TLS or SSH certificate verification
-      --no-header                         hide table header from output
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --show-preevy-service-urls          Show URLs for internal Preevy services
-      --sort=<value>                      property to sort by (prepend '-' for descending)
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -53,8 +43,25 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -x, --extended         show extra columns
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Show urls for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/urls.ts)_
+_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/urls.ts)_
diff --git a/site/docs/cli-reference/version.md b/site/docs/cli-reference/version.md
index f237b71e..28b8abac 100644
--- a/site/docs/cli-reference/version.md
+++ b/site/docs/cli-reference/version.md
@@ -27,4 +27,4 @@ DESCRIPTION
   Show Preevy version
 ```
 
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_
+_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/version.ts)_
diff --git a/tunnel-server/.eslintrc.cjs b/tunnel-server/.eslintrc.cjs
index 4b333975..59c60ff4 100644
--- a/tunnel-server/.eslintrc.cjs
+++ b/tunnel-server/.eslintrc.cjs
@@ -1,6 +1,6 @@
 const deepMerge = require('../build_utils/deep_merge')
 
-module.exports = deepMerge(require('../build_utils/eslintrc'), {
+module.exports = deepMerge(require('../build_utils/eslintrc.cjs'), {
   rules: {
     'no-underscore-dangle': [
       'warn',
diff --git a/tunnel-server/.gitignore b/tunnel-server/.gitignore
index 72d4fea4..74e70484 100644
--- a/tunnel-server/.gitignore
+++ b/tunnel-server/.gitignore
@@ -10,9 +10,6 @@ node_modules/
 # Coverage
 coverage
 
-# Transpiled files
-build/
-
 # Optional npm cache directory
 .npm
 
diff --git a/tunnel-server/index.ts b/tunnel-server/index.ts
index 5fb50d8c..2683f3e0 100644
--- a/tunnel-server/index.ts
+++ b/tunnel-server/index.ts
@@ -16,6 +16,7 @@ import { cookieSessionStore } from './src/session'
 import { claimsSchema } from './src/auth'
 import { createSshServer } from './src/ssh'
 
+// eslint-disable-next-line no-underscore-dangle
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 const log = pino(appLoggerFromEnv())
diff --git a/tunnel-server/package.json b/tunnel-server/package.json
index 18696123..35125b05 100644
--- a/tunnel-server/package.json
+++ b/tunnel-server/package.json
@@ -14,7 +14,7 @@
     "http-proxy": "^1.18.1",
     "iconv-lite": "^0.6.3",
     "jose": "^4.14.4",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "node-fetch": "2.6.9",
     "p-timeout": "^6.1.2",
     "pino": "^8.11.0",
@@ -34,12 +34,12 @@
     "@types/content-type": "^1.1.5",
     "@types/cookies": "^0.7.8",
     "@types/http-proxy": "^1.17.9",
-    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "18",
     "@types/node-fetch": "^2.6.4",
     "@types/ssh2": "^1.11.8",
-    "@typescript-eslint/eslint-plugin": "6.7.4",
-    "@typescript-eslint/parser": "6.7.4",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
     "eslint": "^8.36.0",
     "jest": "29.7.0",
     "nodemon": "^2.0.20",
diff --git a/tunnel-server/src/ssh/index.ts b/tunnel-server/src/ssh/index.ts
index e1e1ab25..7670ebc2 100644
--- a/tunnel-server/src/ssh/index.ts
+++ b/tunnel-server/src/ssh/index.ts
@@ -1,7 +1,7 @@
 import { Logger } from 'pino'
 import { inspect } from 'util'
 import { Gauge } from 'prom-client'
-import lodash from 'lodash'
+import lodash from 'lodash-es'
 import { BaseSshClient, baseSshServer } from './base-server'
 import { ActiveTunnelStore, activeTunnelStoreKey } from '../tunnel-store'
 import { KeyAlreadyExistsError } from '../memory-store'
diff --git a/tunnel-server/src/url.ts b/tunnel-server/src/url.ts
index b2c65a3f..9b36e7b4 100644
--- a/tunnel-server/src/url.ts
+++ b/tunnel-server/src/url.ts
@@ -1,4 +1,4 @@
-import lodash from 'lodash'
+import lodash from 'lodash-es'
 
 export const editUrl = (
   url: URL | string,
diff --git a/yarn.lock b/yarn.lock
index 2b319958..1e23f7b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1277,226 +1277,226 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@esbuild/android-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
-  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
-
 "@esbuild/android-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
   integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
 
-"@esbuild/android-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
-  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
+"@esbuild/android-arm64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.9.tgz#683794bdc3d27222d3eced7b74cad15979548031"
+  integrity sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==
 
 "@esbuild/android-arm@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
   integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
 
-"@esbuild/android-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
-  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
+"@esbuild/android-arm@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.9.tgz#21a4de41f07b2af47401c601d64dfdefd056c595"
+  integrity sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==
 
 "@esbuild/android-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
   integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
 
-"@esbuild/darwin-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
-  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
+"@esbuild/android-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.9.tgz#e2d7674bc025ddc8699f0cc76cb97823bb63c252"
+  integrity sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==
 
 "@esbuild/darwin-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
   integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
 
-"@esbuild/darwin-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
-  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
+"@esbuild/darwin-arm64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.9.tgz#ae7a582289cc5c0bac15d4b9020a90cb7288f1e9"
+  integrity sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==
 
 "@esbuild/darwin-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
   integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
 
-"@esbuild/freebsd-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
-  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
+"@esbuild/darwin-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.9.tgz#8a216c66dcf51addeeb843d8cfaeff712821d12b"
+  integrity sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==
 
 "@esbuild/freebsd-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
   integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
 
-"@esbuild/freebsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
-  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
+"@esbuild/freebsd-arm64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.9.tgz#63d4f603e421252c3cd836b18d01545be7c6c440"
+  integrity sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==
 
 "@esbuild/freebsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
   integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
 
-"@esbuild/linux-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
-  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
+"@esbuild/freebsd-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.9.tgz#a3db52595be65360eae4de1d1fa3c1afd942e1e4"
+  integrity sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==
 
 "@esbuild/linux-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
   integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
 
-"@esbuild/linux-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
-  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
+"@esbuild/linux-arm64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.9.tgz#4ae5811ce9f8d7df5eb9edd9765ea9401a534f13"
+  integrity sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==
 
 "@esbuild/linux-arm@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
   integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
 
-"@esbuild/linux-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
-  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
+"@esbuild/linux-arm@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.9.tgz#9807e92cfd335f46326394805ad488e646e506f2"
+  integrity sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==
 
 "@esbuild/linux-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
   integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
 
-"@esbuild/linux-loong64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
-  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
+"@esbuild/linux-ia32@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.9.tgz#18892c10f3106652b16f9da88a0362dc95ed46c7"
+  integrity sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==
 
 "@esbuild/linux-loong64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
   integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
 
-"@esbuild/linux-mips64el@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
-  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
+"@esbuild/linux-loong64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.9.tgz#dc2ebf9a125db0a1bba18c2bbfd4fbdcbcaf61c2"
+  integrity sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==
 
 "@esbuild/linux-mips64el@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
   integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
 
-"@esbuild/linux-ppc64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
-  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
+"@esbuild/linux-mips64el@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.9.tgz#4c2f7c5d901015e3faf1563c4a89a50776cb07fd"
+  integrity sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==
 
 "@esbuild/linux-ppc64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
   integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
 
-"@esbuild/linux-riscv64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
-  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
+"@esbuild/linux-ppc64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.9.tgz#8385332713b4e7812869622163784a5633f76fc4"
+  integrity sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==
 
 "@esbuild/linux-riscv64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
   integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
 
-"@esbuild/linux-s390x@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
-  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
+"@esbuild/linux-riscv64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.9.tgz#23f1db24fa761be311874f32036c06249aa20cba"
+  integrity sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==
 
 "@esbuild/linux-s390x@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
   integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
 
-"@esbuild/linux-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
-  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
+"@esbuild/linux-s390x@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.9.tgz#2dffe497726b897c9f0109e774006e25b33b4fd0"
+  integrity sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==
 
 "@esbuild/linux-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
   integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
 
-"@esbuild/netbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
-  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
+"@esbuild/linux-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.9.tgz#ceb1d62cd830724ff5b218e5d3172a8bad59420e"
+  integrity sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==
 
 "@esbuild/netbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
   integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
 
-"@esbuild/openbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
-  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
+"@esbuild/netbsd-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.9.tgz#0cbca65e9ef4d3fc41502d3e055e6f49479a8f18"
+  integrity sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==
 
 "@esbuild/openbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
   integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
 
-"@esbuild/sunos-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
-  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
+"@esbuild/openbsd-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.9.tgz#1f57adfbee09c743292c6758a3642e875bcad1cf"
+  integrity sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==
 
 "@esbuild/sunos-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
   integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
 
-"@esbuild/win32-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
-  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
+"@esbuild/sunos-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.9.tgz#116be6adbd2c7479edeeb5f6ea0441002ab4cb9c"
+  integrity sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==
 
 "@esbuild/win32-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
   integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
 
-"@esbuild/win32-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
-  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
+"@esbuild/win32-arm64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.9.tgz#2be22131ab18af4693fd737b161d1ef34de8ca9d"
+  integrity sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==
 
 "@esbuild/win32-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
   integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
 
-"@esbuild/win32-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
-  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
+"@esbuild/win32-ia32@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.9.tgz#e10ead5a55789b167b4225d2469324538768af7c"
+  integrity sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==
 
 "@esbuild/win32-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
+"@esbuild/win32-x64@0.19.9":
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.9.tgz#b2da6219b603e3fa371a78f53f5361260d0c5585"
+  integrity sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==
+
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -1674,7 +1674,18 @@
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
-"@inquirer/confirm@^2.0.14":
+"@inquirer/checkbox@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.5.0.tgz#05869b4ee81e2c8d523799ef350d57cabd556bfa"
+  integrity sha512-3cKJkW1vIZAs4NaS0reFsnpAjP0azffYII4I2R7PTI7ZTMg5Y1at4vzXccOH3762b2c2L4drBhpJpf9uiaGNxA==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/confirm@^2.0.14", "@inquirer/confirm@^2.0.15":
   version "2.0.15"
   resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-2.0.15.tgz#b5512ed190efd8c5b96e0969115756b48546ab36"
   integrity sha512-hj8Q/z7sQXsF0DSpLQZVDhWYGN6KLM/gNjjqGkpKwBzljbQofGjn0ueHADy4HUY+OqDHmXuwk/bY+tZyIuuB0w==
@@ -1683,6 +1694,25 @@
     "@inquirer/type" "^1.1.5"
     chalk "^4.1.2"
 
+"@inquirer/core@^3.1.1":
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/@inquirer/core/-/core-3.1.2.tgz#d9691e6ffae85935685641550b8370ab7e599caa"
+  integrity sha512-lR2GaqBkp42Ew9BOAOqf2pSp+ymVES1qN8OC90WWh45yeoYLl0Ty1GyCxmkKqBJtq/+Ea1MF12AdFcZcpRNFsw==
+  dependencies:
+    "@inquirer/type" "^1.1.2"
+    "@types/mute-stream" "^0.0.1"
+    "@types/node" "^20.4.8"
+    "@types/wrap-ansi" "^3.0.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    cli-spinners "^2.9.0"
+    cli-width "^4.1.0"
+    figures "^3.2.0"
+    mute-stream "^1.0.0"
+    run-async "^3.0.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^6.2.0"
+
 "@inquirer/core@^5.1.1":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-5.1.1.tgz#849d4846aea68371c133df6ec9059f5e5bd30d30"
@@ -1703,7 +1733,81 @@
     strip-ansi "^6.0.1"
     wrap-ansi "^6.2.0"
 
-"@inquirer/type@^1.1.5":
+"@inquirer/editor@^1.2.13":
+  version "1.2.13"
+  resolved "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.13.tgz#94bddeeabc043d4a05fbde8523add4db221555d5"
+  integrity sha512-gBxjqt0B9GLN0j6M/tkEcmcIvB2fo9Cw0f5NRqDTkYyB9AaCzj7qvgG0onQ3GVPbMyMbbP4tWYxrBOaOdKpzNA==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    chalk "^4.1.2"
+    external-editor "^3.1.0"
+
+"@inquirer/expand@^1.1.14":
+  version "1.1.14"
+  resolved "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.14.tgz#d315014939d0bb82ed2b769907db5bd1922fb823"
+  integrity sha512-yS6fJ8jZYAsxdxuw2c8XTFMTvMR1NxZAw3LxDaFnqh7BZ++wTQ6rSp/2gGJhMacdZ85osb+tHxjVgx7F+ilv5g==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/input@^1.2.14":
+  version "1.2.14"
+  resolved "https://registry.npmjs.org/@inquirer/input/-/input-1.2.14.tgz#8951867618bb5cd16dd096e02404eec225a92207"
+  integrity sha512-tISLGpUKXixIQue7jypNEShrdzJoLvEvZOJ4QRsw5XTfrIYfoWFqAjMQLerGs9CzR86yAI89JR6snHmKwnNddw==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    chalk "^4.1.2"
+
+"@inquirer/password@^1.1.14":
+  version "1.1.14"
+  resolved "https://registry.npmjs.org/@inquirer/password/-/password-1.1.14.tgz#c1fc139efe84a38986870a1bcf80718050f82bbf"
+  integrity sha512-vL2BFxfMo8EvuGuZYlryiyAB3XsgtbxOcFs4H9WI9szAS/VZCAwdVqs8rqEeaAf/GV/eZOghIOYxvD91IsRWSg==
+  dependencies:
+    "@inquirer/input" "^1.2.14"
+    "@inquirer/type" "^1.1.5"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+
+"@inquirer/prompts@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/@inquirer/prompts/-/prompts-3.3.0.tgz#1324881d207e37b1162f174fb9726b9ecb4c475c"
+  integrity sha512-BBCqdSnhNs+WziSIo4f/RNDu6HAj4R/Q5nMgJb5MNPFX8sJGCvj9BoALdmR0HTWXyDS7TO8euKj6W6vtqCQG7A==
+  dependencies:
+    "@inquirer/checkbox" "^1.5.0"
+    "@inquirer/confirm" "^2.0.15"
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/editor" "^1.2.13"
+    "@inquirer/expand" "^1.1.14"
+    "@inquirer/input" "^1.2.14"
+    "@inquirer/password" "^1.1.14"
+    "@inquirer/rawlist" "^1.2.14"
+    "@inquirer/select" "^1.3.1"
+
+"@inquirer/rawlist@^1.2.14":
+  version "1.2.14"
+  resolved "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.14.tgz#7fac491345a984bafad96817a4f5ae45fb6b0c96"
+  integrity sha512-xIYmDpYgfz2XGCKubSDLKEvadkIZAKbehHdWF082AyC2I4eHK44RUfXaoOAqnbqItZq4KHXS6jDJ78F2BmQvxg==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    chalk "^4.1.2"
+
+"@inquirer/select@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/@inquirer/select/-/select-1.3.1.tgz#b10bb8d4ba72f08eb887b3d948eb734d680897c6"
+  integrity sha512-EgOPHv7XOHEqiBwBJTyiMg9r57ySyW4oyYCumGp+pGyOaXQaLb2kTnccWI6NFd9HSi5kDJhF7YjA+3RfMQJ2JQ==
+  dependencies:
+    "@inquirer/core" "^5.1.1"
+    "@inquirer/type" "^1.1.5"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/type@^1.1.2", "@inquirer/type@^1.1.5":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.1.5.tgz#b8c171f755859c8159b10e41e1e3a88f0ca99d7f"
   integrity sha512-wmwHvHozpPo4IZkkNtbYenem/0wnfI6hvOcGKmPEa0DwuaH5XUQzFqy6OpEpjEegZMhYIk8HDYITI16BPLtrRA==
@@ -3637,6 +3741,86 @@
     "@smithy/types" "^2.7.0"
     tslib "^2.5.0"
 
+"@swc/core-darwin-arm64@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.100.tgz#f582c5bbc9c49506f728fc1d14dff33c2cc226d5"
+  integrity sha512-XVWFsKe6ei+SsDbwmsuRkYck1SXRpO60Hioa4hoLwR8fxbA9eVp6enZtMxzVVMBi8ej5seZ4HZQeAWepbukiBw==
+
+"@swc/core-darwin-x64@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.100.tgz#d84f5c0bb4603c252884d011a698ed7c634b1505"
+  integrity sha512-KF/MXrnH1nakm1wbt4XV8FS7kvqD9TGmVxeJ0U4bbvxXMvzeYUurzg3AJUTXYmXDhH/VXOYJE5N5RkwZZPs5iA==
+
+"@swc/core-linux-arm64-gnu@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.100.tgz#1ed4b92b373882d8f338c4e0a0aa64cdaa6106f1"
+  integrity sha512-p8hikNnAEJrw5vHCtKiFT4hdlQxk1V7vqPmvUDgL/qe2menQDK/i12tbz7/3BEQ4UqUPnvwpmVn2d19RdEMNxw==
+
+"@swc/core-linux-arm64-musl@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.100.tgz#9db560f7459e42e65ec02670d6a8316e7c850cfc"
+  integrity sha512-BWx/0EeY89WC4q3AaIaBSGfQxkYxIlS3mX19dwy2FWJs/O+fMvF9oLk/CyJPOZzbp+1DjGeeoGFuDYpiNO91JA==
+
+"@swc/core-linux-x64-gnu@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.100.tgz#228826ea48879bf1e73683fbef4373e3e762e424"
+  integrity sha512-XUdGu3dxAkjsahLYnm8WijPfKebo+jHgHphDxaW0ovI6sTdmEGFDew7QzKZRlbYL2jRkUuuKuDGvD6lO5frmhA==
+
+"@swc/core-linux-x64-musl@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.100.tgz#09a234dbbf625d071ecb663680e997a62d230d49"
+  integrity sha512-PhoXKf+f0OaNW/GCuXjJ0/KfK9EJX7z2gko+7nVnEA0p3aaPtbP6cq1Ubbl6CMoPL+Ci3gZ7nYumDqXNc3CtLQ==
+
+"@swc/core-win32-arm64-msvc@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.100.tgz#add1c82884c10a9054ed6a48f884097aa85c6d2b"
+  integrity sha512-PwLADZN6F9cXn4Jw52FeP/MCLVHm8vwouZZSOoOScDtihjY495SSjdPnlosMaRSR4wJQssGwiD/4MbpgQPqbAw==
+
+"@swc/core-win32-ia32-msvc@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.100.tgz#e0b6c5ae7f3250adeeb88dae83558d3f45148c56"
+  integrity sha512-0f6nicKSLlDKlyPRl2JEmkpBV4aeDfRQg6n8mPqgL7bliZIcDahG0ej+HxgNjZfS3e0yjDxsNRa6sAqWU2Z60A==
+
+"@swc/core-win32-x64-msvc@1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.100.tgz#34721dff151d7dcf165675f18aeed0a12264d88c"
+  integrity sha512-b7J0rPoMkRTa3XyUGt8PwCaIBuYWsL2DqbirrQKRESzgCvif5iNpqaM6kjIjI/5y5q1Ycv564CB51YDpiS8EtQ==
+
+"@swc/core@^1.3.100":
+  version "1.3.100"
+  resolved "https://registry.npmjs.org/@swc/core/-/core-1.3.100.tgz#8fa36f26a35137620234b084224c9fa9b8a0fee2"
+  integrity sha512-7dKgTyxJjlrMwFZYb1auj3Xq0D8ZBe+5oeIgfMlRU05doXZypYJe0LAk0yjj3WdbwYzpF+T1PLxwTWizI0pckw==
+  dependencies:
+    "@swc/counter" "^0.1.1"
+    "@swc/types" "^0.1.5"
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.3.100"
+    "@swc/core-darwin-x64" "1.3.100"
+    "@swc/core-linux-arm64-gnu" "1.3.100"
+    "@swc/core-linux-arm64-musl" "1.3.100"
+    "@swc/core-linux-x64-gnu" "1.3.100"
+    "@swc/core-linux-x64-musl" "1.3.100"
+    "@swc/core-win32-arm64-msvc" "1.3.100"
+    "@swc/core-win32-ia32-msvc" "1.3.100"
+    "@swc/core-win32-x64-msvc" "1.3.100"
+
+"@swc/counter@^0.1.1":
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/@swc/counter/-/counter-0.1.2.tgz#bf06d0770e47c6f1102270b744e17b934586985e"
+  integrity sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==
+
+"@swc/helpers@^0.5.3":
+  version "0.5.3"
+  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz#98c6da1e196f5f08f977658b80d6bd941b5f294f"
+  integrity sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==
+  dependencies:
+    tslib "^2.4.0"
+
+"@swc/types@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz#043b731d4f56a79b4897a3de1af35e75d56bc63a"
+  integrity sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==
+
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -3889,9 +4073,16 @@
   dependencies:
     "@types/node" "*"
 
-"@types/lodash@^4.14.192":
+"@types/lodash-es@^4.17.12":
+  version "4.17.12"
+  resolved "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz#65f6d1e5f80539aa7cfbfc962de5def0cf4f341b"
+  integrity sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
   version "4.14.202"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
+  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
   integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
 
 "@types/long@^4.0.0":
@@ -3909,6 +4100,13 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
+"@types/mute-stream@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.1.tgz#8ec7d16d51e2ceb054d8be0226250169d17af5b2"
+  integrity sha512-0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mute-stream@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@types/mute-stream/-/mute-stream-0.0.4.tgz#77208e56a08767af6c5e1237be8888e2f255c478"
@@ -3950,6 +4148,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa"
   integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==
 
+"@types/node@^20.4.8":
+  version "20.10.4"
+  resolved "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz#b246fd84d55d5b1b71bf51f964bd514409347198"
+  integrity sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -4105,16 +4310,16 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz#cfe2bd34e26d2289212946b96ab19dcad64b661a"
-  integrity sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==
+"@typescript-eslint/eslint-plugin@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.14.0.tgz#fc1ab5f23618ba590c87e8226ff07a760be3dd7b"
+  integrity sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/type-utils" "6.10.0"
-    "@typescript-eslint/utils" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.14.0"
+    "@typescript-eslint/type-utils" "6.14.0"
+    "@typescript-eslint/utils" "6.14.0"
+    "@typescript-eslint/visitor-keys" "6.14.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -4148,15 +4353,15 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a"
-  integrity sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==
+"@typescript-eslint/parser@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz#a2d6a732e0d2b95c73f6a26ae7362877cc1b4212"
+  integrity sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/typescript-estree" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.14.0"
+    "@typescript-eslint/types" "6.14.0"
+    "@typescript-eslint/typescript-estree" "6.14.0"
+    "@typescript-eslint/visitor-keys" "6.14.0"
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^4.31.2":
@@ -4185,14 +4390,6 @@
     "@typescript-eslint/types" "5.54.0"
     "@typescript-eslint/visitor-keys" "5.54.0"
 
-"@typescript-eslint/scope-manager@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540"
-  integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==
-  dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
-
 "@typescript-eslint/scope-manager@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
@@ -4201,13 +4398,21 @@
     "@typescript-eslint/types" "6.12.0"
     "@typescript-eslint/visitor-keys" "6.12.0"
 
-"@typescript-eslint/type-utils@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1"
-  integrity sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==
+"@typescript-eslint/scope-manager@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz#53d24363fdb5ee0d1d8cda4ed5e5321272ab3d48"
+  integrity sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==
+  dependencies:
+    "@typescript-eslint/types" "6.14.0"
+    "@typescript-eslint/visitor-keys" "6.14.0"
+
+"@typescript-eslint/type-utils@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.14.0.tgz#ac9cb5ba0615c837f1a6b172feeb273d36e4f8af"
+  integrity sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.10.0"
-    "@typescript-eslint/utils" "6.10.0"
+    "@typescript-eslint/typescript-estree" "6.14.0"
+    "@typescript-eslint/utils" "6.14.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
@@ -4221,16 +4426,16 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.0.tgz#7d519df01f50739254d89378e0dcac504cab2740"
   integrity sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==
 
-"@typescript-eslint/types@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367"
-  integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==
-
 "@typescript-eslint/types@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
   integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
 
+"@typescript-eslint/types@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz#935307f7a931016b7a5eb25d494ea3e1f613e929"
+  integrity sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==
+
 "@typescript-eslint/typescript-estree@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
@@ -4257,43 +4462,43 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697"
-  integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==
+"@typescript-eslint/typescript-estree@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
+  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
   dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/typescript-estree@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
-  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
+"@typescript-eslint/typescript-estree@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz#90c7ddd45cd22139adf3d4577580d04c9189ac13"
+  integrity sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==
   dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
+    "@typescript-eslint/types" "6.14.0"
+    "@typescript-eslint/visitor-keys" "6.14.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336"
-  integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==
+"@typescript-eslint/utils@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.14.0.tgz#856a9e274367d99ffbd39c48128b93a86c4261e3"
+  integrity sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/typescript-estree" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.14.0"
+    "@typescript-eslint/types" "6.14.0"
+    "@typescript-eslint/typescript-estree" "6.14.0"
     semver "^7.5.4"
 
 "@typescript-eslint/utils@^5.10.0":
@@ -4339,14 +4544,6 @@
     "@typescript-eslint/types" "5.54.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3"
-  integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==
-  dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
@@ -4355,6 +4552,14 @@
     "@typescript-eslint/types" "6.12.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.14.0":
+  version "6.14.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz#1d1d486581819287de824a56c22f32543561138e"
+  integrity sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==
+  dependencies:
+    "@typescript-eslint/types" "6.14.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
@@ -5392,6 +5597,11 @@ cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
   integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
 
+cli-spinners@^2.9.0:
+  version "2.9.2"
+  resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
+
 cli-spinners@^2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.1.tgz#9c0b9dad69a6d47cbb4333c14319b060ed395a35"
@@ -6408,33 +6618,33 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.17.14:
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
-  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+esbuild@^0.19.9:
+  version "0.19.9"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.19.9.tgz#423a8f35153beb22c0b695da1cd1e6c0c8cdd490"
+  integrity sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.19"
-    "@esbuild/android-arm64" "0.17.19"
-    "@esbuild/android-x64" "0.17.19"
-    "@esbuild/darwin-arm64" "0.17.19"
-    "@esbuild/darwin-x64" "0.17.19"
-    "@esbuild/freebsd-arm64" "0.17.19"
-    "@esbuild/freebsd-x64" "0.17.19"
-    "@esbuild/linux-arm" "0.17.19"
-    "@esbuild/linux-arm64" "0.17.19"
-    "@esbuild/linux-ia32" "0.17.19"
-    "@esbuild/linux-loong64" "0.17.19"
-    "@esbuild/linux-mips64el" "0.17.19"
-    "@esbuild/linux-ppc64" "0.17.19"
-    "@esbuild/linux-riscv64" "0.17.19"
-    "@esbuild/linux-s390x" "0.17.19"
-    "@esbuild/linux-x64" "0.17.19"
-    "@esbuild/netbsd-x64" "0.17.19"
-    "@esbuild/openbsd-x64" "0.17.19"
-    "@esbuild/sunos-x64" "0.17.19"
-    "@esbuild/win32-arm64" "0.17.19"
-    "@esbuild/win32-ia32" "0.17.19"
-    "@esbuild/win32-x64" "0.17.19"
+    "@esbuild/android-arm" "0.19.9"
+    "@esbuild/android-arm64" "0.19.9"
+    "@esbuild/android-x64" "0.19.9"
+    "@esbuild/darwin-arm64" "0.19.9"
+    "@esbuild/darwin-x64" "0.19.9"
+    "@esbuild/freebsd-arm64" "0.19.9"
+    "@esbuild/freebsd-x64" "0.19.9"
+    "@esbuild/linux-arm" "0.19.9"
+    "@esbuild/linux-arm64" "0.19.9"
+    "@esbuild/linux-ia32" "0.19.9"
+    "@esbuild/linux-loong64" "0.19.9"
+    "@esbuild/linux-mips64el" "0.19.9"
+    "@esbuild/linux-ppc64" "0.19.9"
+    "@esbuild/linux-riscv64" "0.19.9"
+    "@esbuild/linux-s390x" "0.19.9"
+    "@esbuild/linux-x64" "0.19.9"
+    "@esbuild/netbsd-x64" "0.19.9"
+    "@esbuild/openbsd-x64" "0.19.9"
+    "@esbuild/sunos-x64" "0.19.9"
+    "@esbuild/win32-arm64" "0.19.9"
+    "@esbuild/win32-ia32" "0.19.9"
+    "@esbuild/win32-x64" "0.19.9"
 
 esbuild@~0.18.20:
   version "0.18.20"
@@ -6484,6 +6694,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -6936,7 +7151,7 @@ extend@^3.0.2, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
+external-editor@^3.0.3, external-editor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
@@ -7132,6 +7347,14 @@ figures@3.2.0, figures@^3.0.0, figures@^3.2.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f"
+  integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -7769,7 +7992,7 @@ google-auth-library@^9.0.0:
     jws "^4.0.0"
     lru-cache "^6.0.0"
 
-google-gax@^4.0.3, google-gax@^4.0.4:
+google-gax@^4.0.3, google-gax@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.0.5.tgz#e30a2f2fad3716e8b23996f1bbe941e16abf0889"
   integrity sha512-yLoYtp4zE+8OQA74oBEbNkbzI6c95W01JSL7RqC8XERKpRvj3ytZp1dgnbA6G9aRsc8pZB25xWYBcCmrbYOEhA==
@@ -8212,16 +8435,15 @@ init-package-json@3.0.2, init-package-json@^3.0.2:
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^4.0.0"
 
-inquirer-autocomplete-prompt@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-2.0.1.tgz#72868aada4d9d36814a6054cbd1ececc63aab0c6"
-  integrity sha512-jUHrH0btO7j5r8DTQgANf2CBkTZChoVySD8zF/wp5fZCOLIuUbleXhf4ZY5jNBOc1owA3gdfWtfZuppfYBhcUg==
+inquirer-autocomplete-standalone@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.npmjs.org/inquirer-autocomplete-standalone/-/inquirer-autocomplete-standalone-0.8.1.tgz#540ac162d5dd01f83d0f4016b76bf0bb64e2fff8"
+  integrity sha512-mlzwCTiXDX1Cw4yJL5PCq32k23XYLTK8K6BDFoL1a76iJeFB5ul6IoMU9spgdDagl2SM7P6ZaCNjj8VNXRDPOQ==
   dependencies:
-    ansi-escapes "^4.3.2"
-    figures "^3.2.0"
+    "@inquirer/core" "^3.1.1"
+    "@inquirer/type" "^1.1.2"
+    figures "^5.0.0"
     picocolors "^1.0.0"
-    run-async "^2.4.1"
-    rxjs "^7.5.4"
 
 inquirer@8.2.4:
   version "8.2.4"
@@ -8611,6 +8833,11 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-unicode-supported@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
+  integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==
+
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -9642,6 +9869,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -10315,13 +10547,6 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.7, node-fetch@^2.6.9:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
@@ -11432,10 +11657,10 @@ pino-abstract-transport@^1.0.0, pino-abstract-transport@v1.1.0:
     readable-stream "^4.0.0"
     split2 "^4.0.0"
 
-pino-pretty@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-9.4.1.tgz#89121ef32d00a4d2e4b1c62850dcfff26f62a185"
-  integrity sha512-loWr5SNawVycvY//hamIzyz3Fh5OSpvkcO13MwdDW+eKIGylobPLqnVGTDwDXkdmpJd1BhEG+qhDw09h6SqJiQ==
+pino-pretty@^10.2.3:
+  version "10.2.3"
+  resolved "https://registry.npmjs.org/pino-pretty/-/pino-pretty-10.2.3.tgz#db539c796a1421fd4d130734fa994f5a26027783"
+  integrity sha512-4jfIUc8TC1GPUfDyMSlW1STeORqkoxec71yhxIpLDQapUu8WOuoz2TTCoidrIssyz78LZC69whBMPIKCMbi3cw==
   dependencies:
     colorette "^2.0.7"
     dateformat "^4.6.3"
@@ -12237,14 +12462,14 @@ rimraf@^4.4.1:
   dependencies:
     glob "^9.2.0"
 
-rimraf@^5.0.0:
+rimraf@^5.0.5:
   version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
   integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
   dependencies:
     glob "^10.3.7"
 
-run-async@^2.0.0, run-async@^2.4.0, run-async@^2.4.1:
+run-async@^2.0.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -12268,13 +12493,6 @@ rxjs@^7.2.0, rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
-rxjs@^7.5.4:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
@@ -13515,9 +13733,9 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-typescript@^5.2.2:
+typescript@^5.3.3:
   version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 uglify-js@^3.1.4: