From 73fe26d7bcd062f2abe1ce7ebda33f8bd11da779 Mon Sep 17 00:00:00 2001
From: Ross Stenersen <rossiam@gmail.com>
Date: Wed, 21 Sep 2022 12:50:13 -0500
Subject: [PATCH] refactor: incorporate edge plugin into monorepo

---
 .changeset/clean-bulldogs-deny.md             |    6 +
 .changeset/pre.json                           |    1 +
 .gitignore                                    |    1 +
 jest.config.js                                |    2 +
 package-lock.json                             |  151 ++-
 package.json                                  |    3 +-
 packages/cli/README.md                        |  526 ++++----
 packages/cli/jest.config.js                   |    3 -
 packages/cli/package.json                     |    6 +-
 packages/cli/tsconfig.json                    |    4 +
 packages/edge/.eslintrc.js                    |    5 +
 packages/edge/README.md                       | 1188 +++++++++++++++++
 packages/edge/global.d.ts                     |    1 +
 packages/edge/jest.config.js                  |   11 +
 packages/edge/package.json                    |   94 ++
 .../__tests__/commands/edge/channels.test.ts  |  107 ++
 .../commands/edge/channels/delete.test.ts     |   35 +
 .../commands/edge/channels/drivers.test.ts    |   91 ++
 .../edge/channels/enrollments.test.ts         |   49 +
 .../commands/edge/channels/metainfo.test.ts   |  132 ++
 .../__tests__/commands/edge/drivers.test.ts   |  152 +++
 .../commands/edge/drivers/default.test.ts     |   52 +
 .../commands/edge/drivers/delete.test.ts      |   27 +
 .../commands/edge/drivers/install.test.ts     |   82 ++
 .../commands/edge/drivers/installed.test.ts   |   90 ++
 .../commands/edge/drivers/logcat.test.ts      |  514 +++++++
 .../commands/edge/drivers/package.test.ts     |  312 +++++
 .../commands/edge/drivers/switch.test.ts      |  150 +++
 .../commands/edge/drivers/uninstall.test.ts   |   33 +
 packages/edge/src/__tests__/file-util.test.ts |  236 ++++
 .../lib/commands/channels-util.test.ts        |  217 +++
 .../lib/commands/drivers-util.test.ts         |  650 +++++++++
 .../lib/commands/drivers/package-util.test.ts |  480 +++++++
 .../src/__tests__/lib/live-logging.test.ts    |  285 ++++
 .../edge/src/__tests__/tsconfig-eslint.json   |    9 +
 packages/edge/src/commands/edge/channels.ts   |   72 +
 .../edge/src/commands/edge/channels/assign.ts |   45 +
 .../edge/src/commands/edge/channels/create.ts |   51 +
 .../edge/src/commands/edge/channels/delete.ts |   23 +
 .../src/commands/edge/channels/drivers.ts     |   35 +
 .../edge/src/commands/edge/channels/enroll.ts |   36 +
 .../src/commands/edge/channels/enrollments.ts |   34 +
 .../src/commands/edge/channels/invites.ts     |   95 ++
 .../commands/edge/channels/invites/accept.ts  |   22 +
 .../commands/edge/channels/invites/create.ts  |   94 ++
 .../commands/edge/channels/invites/delete.ts  |   40 +
 .../src/commands/edge/channels/metainfo.ts    |   64 +
 .../src/commands/edge/channels/unassign.ts    |   74 +
 .../src/commands/edge/channels/unenroll.ts    |   37 +
 .../edge/src/commands/edge/channels/update.ts |   28 +
 packages/edge/src/commands/edge/drivers.ts    |   66 +
 .../edge/src/commands/edge/drivers/default.ts |   29 +
 .../edge/src/commands/edge/drivers/delete.ts  |   20 +
 .../edge/src/commands/edge/drivers/install.ts |   62 +
 .../src/commands/edge/drivers/installed.ts    |   50 +
 .../edge/src/commands/edge/drivers/logcat.ts  |  291 ++++
 .../edge/src/commands/edge/drivers/package.ts |  142 ++
 .../edge/src/commands/edge/drivers/switch.ts  |   77 ++
 .../src/commands/edge/drivers/uninstall.ts    |   32 +
 .../edge/src/lib/commands/channels-util.ts    |   68 +
 .../edge/src/lib/commands/drivers-util.ts     |  207 +++
 .../src/lib/commands/drivers/logcat-util.ts   |   11 +
 .../src/lib/commands/drivers/package-util.ts  |  115 ++
 packages/edge/src/lib/edge-client.ts          |   20 +
 packages/edge/src/lib/edge-command.ts         |   23 +
 packages/edge/src/lib/endpoints/invites.ts    |   66 +
 packages/edge/src/lib/file-util.ts            |   78 ++
 packages/edge/src/lib/live-logging.ts         |  284 ++++
 packages/edge/tsconfig.json                   |   21 +
 tsconfig.json                                 |    4 +
 70 files changed, 7846 insertions(+), 275 deletions(-)
 create mode 100644 .changeset/clean-bulldogs-deny.md
 create mode 100644 packages/edge/.eslintrc.js
 create mode 100644 packages/edge/README.md
 create mode 100644 packages/edge/global.d.ts
 create mode 100644 packages/edge/jest.config.js
 create mode 100644 packages/edge/package.json
 create mode 100644 packages/edge/src/__tests__/commands/edge/channels.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/channels/delete.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/channels/drivers.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/channels/enrollments.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/channels/metainfo.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/default.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/delete.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/install.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/installed.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/logcat.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/package.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/switch.test.ts
 create mode 100644 packages/edge/src/__tests__/commands/edge/drivers/uninstall.test.ts
 create mode 100644 packages/edge/src/__tests__/file-util.test.ts
 create mode 100644 packages/edge/src/__tests__/lib/commands/channels-util.test.ts
 create mode 100644 packages/edge/src/__tests__/lib/commands/drivers-util.test.ts
 create mode 100644 packages/edge/src/__tests__/lib/commands/drivers/package-util.test.ts
 create mode 100644 packages/edge/src/__tests__/lib/live-logging.test.ts
 create mode 100644 packages/edge/src/__tests__/tsconfig-eslint.json
 create mode 100644 packages/edge/src/commands/edge/channels.ts
 create mode 100644 packages/edge/src/commands/edge/channels/assign.ts
 create mode 100644 packages/edge/src/commands/edge/channels/create.ts
 create mode 100644 packages/edge/src/commands/edge/channels/delete.ts
 create mode 100644 packages/edge/src/commands/edge/channels/drivers.ts
 create mode 100644 packages/edge/src/commands/edge/channels/enroll.ts
 create mode 100644 packages/edge/src/commands/edge/channels/enrollments.ts
 create mode 100644 packages/edge/src/commands/edge/channels/invites.ts
 create mode 100644 packages/edge/src/commands/edge/channels/invites/accept.ts
 create mode 100644 packages/edge/src/commands/edge/channels/invites/create.ts
 create mode 100644 packages/edge/src/commands/edge/channels/invites/delete.ts
 create mode 100644 packages/edge/src/commands/edge/channels/metainfo.ts
 create mode 100644 packages/edge/src/commands/edge/channels/unassign.ts
 create mode 100644 packages/edge/src/commands/edge/channels/unenroll.ts
 create mode 100644 packages/edge/src/commands/edge/channels/update.ts
 create mode 100644 packages/edge/src/commands/edge/drivers.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/default.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/delete.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/install.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/installed.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/logcat.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/package.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/switch.ts
 create mode 100644 packages/edge/src/commands/edge/drivers/uninstall.ts
 create mode 100644 packages/edge/src/lib/commands/channels-util.ts
 create mode 100644 packages/edge/src/lib/commands/drivers-util.ts
 create mode 100644 packages/edge/src/lib/commands/drivers/logcat-util.ts
 create mode 100644 packages/edge/src/lib/commands/drivers/package-util.ts
 create mode 100644 packages/edge/src/lib/edge-client.ts
 create mode 100644 packages/edge/src/lib/edge-command.ts
 create mode 100644 packages/edge/src/lib/endpoints/invites.ts
 create mode 100644 packages/edge/src/lib/file-util.ts
 create mode 100644 packages/edge/src/lib/live-logging.ts
 create mode 100644 packages/edge/tsconfig.json

diff --git a/.changeset/clean-bulldogs-deny.md b/.changeset/clean-bulldogs-deny.md
new file mode 100644
index 000000000..b2f8f57fe
--- /dev/null
+++ b/.changeset/clean-bulldogs-deny.md
@@ -0,0 +1,6 @@
+---
+"@smartthings/cli": patch
+"@smartthings/plugin-cli-edge": patch
+---
+
+incorporate edge plugin into monorepo
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 7e471e2e5..3551b54cf 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -3,6 +3,7 @@
   "tag": "beta",
   "initialVersions": {
     "@smartthings/cli": "1.0.0-beta.0",
+    "@smartthings/plugin-cli-edge": "2.0.0-beta.0",
     "@smartthings/cli-lib": "1.0.0-beta.0",
     "@smartthings/cli-testlib": "1.0.0-beta.0"
   },
diff --git a/.gitignore b/.gitignore
index 4a00c0c9a..9dcdacbda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ smartthings-*.zip
 
 # the Typescript outDir that oclif prefers
 packages/cli/lib
+packages/edge/lib
 
 # functional tests
 .pytest_cache
diff --git a/jest.config.js b/jest.config.js
index be711d423..23972407a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -13,6 +13,7 @@ module.exports = {
 	],
 	modulePathIgnorePatterns: [
 		'<rootDir>/dist',
+		'<rootDir>/lib',
 	],
 	clearMocks: true,
 	reporters: [
@@ -22,6 +23,7 @@ module.exports = {
 	globals: {
 		// TODO: remove when https://github.com/kulshekhar/ts-jest/issues/1967 is resolved
 		// related flag in tsconfig as well
+		// eslint-disable-next-line @typescript-eslint/naming-convention
 		'ts-jest': {
 			isolatedModules: true,
 		},
diff --git a/package-lock.json b/package-lock.json
index 059e16625..0dbbe741d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
 			"workspaces": [
 				"packages/lib",
 				"packages/testlib",
+				"packages/edge",
 				"packages/cli"
 			],
 			"devDependencies": {
@@ -3757,25 +3758,8 @@
 			}
 		},
 		"node_modules/@smartthings/plugin-cli-edge": {
-			"version": "1.15.5",
-			"resolved": "https://registry.npmjs.org/@smartthings/plugin-cli-edge/-/plugin-cli-edge-1.15.5.tgz",
-			"integrity": "sha512-bRFiYCu9dNsWytCT/SD+cibCLMWYsvLpx1tAR26gb0fTxNXqGDh0/aTvr911yXR0ck8yw9jhiuHokGxaZXoGRQ==",
-			"dependencies": {
-				"@log4js-node/log4js-api": "^1.0.2",
-				"@oclif/core": "^1.13.10",
-				"@smartthings/cli-lib": "^1.0.0-beta.14",
-				"@smartthings/core-sdk": "^5.1.1",
-				"axios": "^0.21.4",
-				"inquirer": "^8.2.4",
-				"js-yaml": "^4.1.0",
-				"jszip": "^3.9.1",
-				"picomatch": "^2.3.1",
-				"tslib": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=12.18.1 <17",
-				"npm": ">=8"
-			}
+			"resolved": "packages/edge",
+			"link": true
 		},
 		"node_modules/@tootallnate/once": {
 			"version": "1.1.2",
@@ -3861,6 +3845,12 @@
 				"@types/node": "*"
 			}
 		},
+		"node_modules/@types/cli-table": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@types/cli-table/-/cli-table-0.3.0.tgz",
+			"integrity": "sha512-QnZUISJJXyhyD6L1e5QwXDV/A5i2W1/gl6D6YMc8u0ncPepbv/B4w3S+izVvtAg60m6h+JP09+Y/0zF2mojlFQ==",
+			"dev": true
+		},
 		"node_modules/@types/connect": {
 			"version": "3.4.35",
 			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -3967,12 +3957,12 @@
 			}
 		},
 		"node_modules/@types/jest": {
-			"version": "28.1.5",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.5.tgz",
-			"integrity": "sha512-TLAC2zXxGnohSP3GxgIyJn7yrTeRPDEyVFyCY1NE2wzg392auI+69uk5EPGjUXuhkq/K208J/TWpLG7J8ebIEQ==",
+			"version": "28.1.8",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz",
+			"integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==",
 			"dev": true,
 			"dependencies": {
-				"jest-matcher-utils": "^28.0.0",
+				"expect": "^28.0.0",
 				"pretty-format": "^28.0.0"
 			}
 		},
@@ -4062,6 +4052,12 @@
 			"integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
 			"dev": true
 		},
+		"node_modules/@types/picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
+			"dev": true
+		},
 		"node_modules/@types/prettier": {
 			"version": "2.6.3",
 			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
@@ -18602,9 +18598,9 @@
 				"@oclif/plugin-help": "^5.1.12",
 				"@oclif/plugin-not-found": "^2.3.1",
 				"@oclif/plugin-plugins": "^2.1.0",
-				"@smartthings/cli-lib": "^1.0.0-beta.15",
+				"@smartthings/cli-lib": "^1.0.0-beta.16",
 				"@smartthings/core-sdk": "^5.1.1",
-				"@smartthings/plugin-cli-edge": "^1.15.5",
+				"@smartthings/plugin-cli-edge": "^2.0.0-beta.0",
 				"aws-sdk": "^2.1175.0",
 				"inquirer": "^8.2.4",
 				"js-yaml": "^4.1.0",
@@ -18614,7 +18610,7 @@
 				"smartthings": "bin/run"
 			},
 			"devDependencies": {
-				"@smartthings/cli-testlib": "^1.0.0-beta.9",
+				"@smartthings/cli-testlib": "^1.0.0-beta.10",
 				"@types/inquirer": "^8.2.1",
 				"@types/jest": "^28.1.5",
 				"@types/js-yaml": "^4.0.5",
@@ -18640,6 +18636,52 @@
 				"npm": ">=8"
 			}
 		},
+		"packages/edge": {
+			"name": "@smartthings/plugin-cli-edge",
+			"version": "2.0.0-beta.0",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@log4js-node/log4js-api": "^1.0.2",
+				"@oclif/core": "^1.13.10",
+				"@smartthings/cli-lib": "^1.0.0-beta.16",
+				"@smartthings/core-sdk": "^5.1.1",
+				"axios": "^0.21.4",
+				"inquirer": "^8.2.4",
+				"js-yaml": "^4.1.0",
+				"jszip": "^3.9.1",
+				"picomatch": "^2.3.1",
+				"tslib": "^2.3.1"
+			},
+			"devDependencies": {
+				"@smartthings/cli-testlib": "^1.0.0-beta.10",
+				"@types/cli-table": "^0.3.0",
+				"@types/eventsource": "^1.1.8",
+				"@types/inquirer": "^8.2.1",
+				"@types/jest": "^28.1.5",
+				"@types/js-yaml": "^4.0.5",
+				"@types/node": "^16.11.44",
+				"@types/picomatch": "^2.3.0",
+				"@typescript-eslint/eslint-plugin": "^5.30.6",
+				"@typescript-eslint/parser": "^5.30.6",
+				"eslint": "^8.19.0",
+				"eslint-plugin-eslint-comments": "^3.2.0",
+				"eslint-plugin-import": "^2.26.0",
+				"eslint-plugin-jest": "^26.6.0",
+				"eventsource": "^2.0.0",
+				"jest": "^28.1.3",
+				"jest-extended": "^0.11.5",
+				"oclif": "^3.1.2",
+				"rimraf": "^3.0.2",
+				"strip-ansi": "^6.0.1",
+				"ts-jest": "^28.0.6",
+				"ts-node": "^10.9.1",
+				"typescript": "^4.7.4"
+			},
+			"engines": {
+				"node": ">=16.14.2 <17",
+				"npm": ">=8"
+			}
+		},
 		"packages/lib": {
 			"name": "@smartthings/cli-lib",
 			"version": "1.0.0-beta.16",
@@ -21779,10 +21821,10 @@
 				"@oclif/plugin-help": "^5.1.12",
 				"@oclif/plugin-not-found": "^2.3.1",
 				"@oclif/plugin-plugins": "^2.1.0",
-				"@smartthings/cli-lib": "^1.0.0-beta.15",
-				"@smartthings/cli-testlib": "^1.0.0-beta.9",
+				"@smartthings/cli-lib": "^1.0.0-beta.16",
+				"@smartthings/cli-testlib": "^1.0.0-beta.10",
 				"@smartthings/core-sdk": "^5.1.1",
-				"@smartthings/plugin-cli-edge": "^1.15.5",
+				"@smartthings/plugin-cli-edge": "^2.0.0-beta.0",
 				"@types/inquirer": "^8.2.1",
 				"@types/jest": "^28.1.5",
 				"@types/js-yaml": "^4.0.5",
@@ -21899,20 +21941,41 @@
 			}
 		},
 		"@smartthings/plugin-cli-edge": {
-			"version": "1.15.5",
-			"resolved": "https://registry.npmjs.org/@smartthings/plugin-cli-edge/-/plugin-cli-edge-1.15.5.tgz",
-			"integrity": "sha512-bRFiYCu9dNsWytCT/SD+cibCLMWYsvLpx1tAR26gb0fTxNXqGDh0/aTvr911yXR0ck8yw9jhiuHokGxaZXoGRQ==",
+			"version": "file:packages/edge",
 			"requires": {
 				"@log4js-node/log4js-api": "^1.0.2",
 				"@oclif/core": "^1.13.10",
-				"@smartthings/cli-lib": "^1.0.0-beta.14",
+				"@smartthings/cli-lib": "^1.0.0-beta.16",
+				"@smartthings/cli-testlib": "^1.0.0-beta.10",
 				"@smartthings/core-sdk": "^5.1.1",
+				"@types/cli-table": "^0.3.0",
+				"@types/eventsource": "^1.1.8",
+				"@types/inquirer": "^8.2.1",
+				"@types/jest": "^28.1.5",
+				"@types/js-yaml": "^4.0.5",
+				"@types/node": "^16.11.44",
+				"@types/picomatch": "^2.3.0",
+				"@typescript-eslint/eslint-plugin": "^5.30.6",
+				"@typescript-eslint/parser": "^5.30.6",
 				"axios": "^0.21.4",
+				"eslint": "^8.19.0",
+				"eslint-plugin-eslint-comments": "^3.2.0",
+				"eslint-plugin-import": "^2.26.0",
+				"eslint-plugin-jest": "^26.6.0",
+				"eventsource": "^2.0.0",
 				"inquirer": "^8.2.4",
+				"jest": "^28.1.3",
+				"jest-extended": "^0.11.5",
 				"js-yaml": "^4.1.0",
 				"jszip": "^3.9.1",
+				"oclif": "^3.1.2",
 				"picomatch": "^2.3.1",
-				"tslib": "^2.3.1"
+				"rimraf": "^3.0.2",
+				"strip-ansi": "^6.0.1",
+				"ts-jest": "^28.0.6",
+				"ts-node": "^10.9.1",
+				"tslib": "^2.3.1",
+				"typescript": "^4.7.4"
 			}
 		},
 		"@tootallnate/once": {
@@ -21996,6 +22059,12 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cli-table": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@types/cli-table/-/cli-table-0.3.0.tgz",
+			"integrity": "sha512-QnZUISJJXyhyD6L1e5QwXDV/A5i2W1/gl6D6YMc8u0ncPepbv/B4w3S+izVvtAg60m6h+JP09+Y/0zF2mojlFQ==",
+			"dev": true
+		},
 		"@types/connect": {
 			"version": "3.4.35",
 			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -22102,12 +22171,12 @@
 			}
 		},
 		"@types/jest": {
-			"version": "28.1.5",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.5.tgz",
-			"integrity": "sha512-TLAC2zXxGnohSP3GxgIyJn7yrTeRPDEyVFyCY1NE2wzg392auI+69uk5EPGjUXuhkq/K208J/TWpLG7J8ebIEQ==",
+			"version": "28.1.8",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz",
+			"integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==",
 			"dev": true,
 			"requires": {
-				"jest-matcher-utils": "^28.0.0",
+				"expect": "^28.0.0",
 				"pretty-format": "^28.0.0"
 			}
 		},
@@ -22197,6 +22266,12 @@
 			"integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
 			"dev": true
 		},
+		"@types/picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
+			"dev": true
+		},
 		"@types/prettier": {
 			"version": "2.6.3",
 			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
diff --git a/package.json b/package.json
index 02586209c..5a209621d 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,12 @@
 		"package": "npm run package -w packages/cli",
 		"version": "changeset version && npm i --package-lock-only && npm run build && npm run version -w packages/cli",
 		"release": "npm run build && changeset publish",
-		"readme": "npm run readme -w packages/cli"
+		"readme": "npm run readme -w packages/edge && npm run readme -w packages/cli"
 	},
 	"workspaces": [
 		"packages/lib",
 		"packages/testlib",
+		"packages/edge",
 		"packages/cli"
 	],
 	"devDependencies": {
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 2d466ce42..9cbde56dc 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -3587,17 +3587,19 @@ FLAGS
   -A, --all-organizations     include entities from all organizations the user belongs to
   -I, --include-read-only     include subscribed-to channels as well as owned channels
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
-  --subscriber-id=<value>     filter results based on subscriber id (e.g. hub id)
+  --subscriber-id=<UUID>      filter results based on subscriber id (e.g. hub id)
   --subscriber-type=<option>  filter results based on subscriber type
                               <options: HUB>
 
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
 DESCRIPTION
   list all channels owned by you or retrieve a single channel
 
@@ -3613,7 +3615,7 @@ EXAMPLES
   $ smartthings edge:channels --subscriber-type HUB --subscriber-id <hub-id>
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels.ts)_
 
 ## `smartthings edge:channels:assign [DRIVERID] [VERSION]`
 
@@ -3629,12 +3631,14 @@ ARGUMENTS
   VERSION   driver version
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   assign a driver to a channel
@@ -3643,7 +3647,7 @@ ALIASES
   $ smartthings edge:drivers:publish
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/assign.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/assign.ts)_
 
 ## `smartthings edge:channels:assignments [IDORINDEX]`
 
@@ -3659,13 +3663,15 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all drivers assigned to a given channel
@@ -3686,20 +3692,22 @@ USAGE
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
   -d, --dry-run               produce JSON but don't actually submit
-  -h, --help                  Show CLI help.
-  -i, --input=<value>         specify input file
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   create a channel
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/create.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/create.ts)_
 
 ## `smartthings edge:channels:delete [ID]`
 
@@ -3714,16 +3722,18 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete a channel
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/delete.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/delete.ts)_
 
 ## `smartthings edge:channels:drivers [IDORINDEX]`
 
@@ -3739,13 +3749,15 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all drivers assigned to a given channel
@@ -3754,7 +3766,7 @@ ALIASES
   $ smartthings edge:channels:assignments
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/drivers.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/drivers.ts)_
 
 ## `smartthings edge:channels:enroll [HUBID]`
 
@@ -3769,18 +3781,20 @@ ARGUMENTS
   HUBID  hub id
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   enroll a hub in a channel
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/enroll.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/enroll.ts)_
 
 ## `smartthings edge:channels:enrollments [IDORINDEX]`
 
@@ -3796,19 +3810,21 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all channels a given hub is enrolled in
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/enrollments.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/enrollments.ts)_
 
 ## `smartthings edge:channels:invitations [IDORINDEX]`
 
@@ -3823,15 +3839,17 @@ ARGUMENTS
   IDORINDEX  the invitation id or number in list
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list invitations or retrieve a single invitation by id or index
@@ -3862,10 +3880,12 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   accept a channel invitation
@@ -3884,17 +3904,19 @@ USAGE
     <value>] [-j] [-y] [-o <value>] [-d]
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
   -d, --dry-run               produce JSON but don't actually submit
-  -h, --help                  Show CLI help.
-  -i, --input=<value>         specify input file
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   create an invitation
@@ -3916,12 +3938,14 @@ ARGUMENTS
   ID  invitation UUID
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete a channel invitation
@@ -3945,12 +3969,14 @@ ARGUMENTS
   ID  invitation UUID
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete a channel invitation
@@ -3974,15 +4000,17 @@ ARGUMENTS
   IDORINDEX  the invitation id or number in list
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list invitations or retrieve a single invitation by id or index
@@ -4000,7 +4028,7 @@ EXAMPLES
   $ smartthings edge:channels:invites <invite id>      # list details about the invite with id <invite id>
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/invites.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites.ts)_
 
 ## `smartthings edge:channels:invites:accept ID`
 
@@ -4015,10 +4043,12 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   accept a channel invitation
@@ -4027,7 +4057,7 @@ ALIASES
   $ smartthings edge:channels:invitations:accept
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/invites/accept.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/accept.ts)_
 
 ## `smartthings edge:channels:invites:create`
 
@@ -4039,17 +4069,19 @@ USAGE
     <value>] [-j] [-y] [-o <value>] [-d]
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
   -d, --dry-run               produce JSON but don't actually submit
-  -h, --help                  Show CLI help.
-  -i, --input=<value>         specify input file
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   create an invitation
@@ -4058,7 +4090,7 @@ ALIASES
   $ smartthings edge:channels:invitations:create
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/invites/create.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/create.ts)_
 
 ## `smartthings edge:channels:invites:delete [ID]`
 
@@ -4073,12 +4105,14 @@ ARGUMENTS
   ID  invitation UUID
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete a channel invitation
@@ -4089,7 +4123,7 @@ ALIASES
   $ smartthings edge:channels:invites:revoke
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/invites/delete.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/delete.ts)_
 
 ## `smartthings edge:channels:invites:revoke [ID]`
 
@@ -4104,12 +4138,14 @@ ARGUMENTS
   ID  invitation UUID
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete a channel invitation
@@ -4133,15 +4169,17 @@ ARGUMENTS
   IDORINDEX  the channel id or number in list
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all channels owned by you or retrieve a single channel
@@ -4160,7 +4198,7 @@ EXAMPLES
       699c7308-8c72-4363-9571-880d0f5cc725
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/metainfo.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/metainfo.ts)_
 
 ## `smartthings edge:channels:unassign [DRIVERID]`
 
@@ -4175,12 +4213,14 @@ ARGUMENTS
   DRIVERID  driver id
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   remove a driver from a channel
@@ -4189,7 +4229,7 @@ ALIASES
   $ smartthings edge:drivers:unpublish
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/unassign.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/unassign.ts)_
 
 ## `smartthings edge:channels:unenroll [HUBID]`
 
@@ -4204,18 +4244,20 @@ ARGUMENTS
   HUBID  hub id
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   unenroll a hub from a channel
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/unenroll.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/unenroll.ts)_
 
 ## `smartthings edge:channels:update [ID]`
 
@@ -4232,20 +4274,22 @@ ARGUMENTS
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
   -d, --dry-run               produce JSON but don't actually submit
-  -h, --help                  Show CLI help.
-  -i, --input=<value>         specify input file
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   update a channel
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/channels/update.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/update.ts)_
 
 ## `smartthings edge:drivers [IDORINDEX]`
 
@@ -4263,13 +4307,15 @@ FLAGS
   -A, --all-organizations     include entities from all organizations the user belongs to
   -O, --organization=<value>  the organization ID to use for this command
   -V, --version=<value>       driver version
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all drivers owned by you or retrieve a single driver
@@ -4294,7 +4340,7 @@ EXAMPLES
   $ smartthings edge:drivers 699c7308-8c72-4363-9571-880d0f5cc725 --version 2021-10-25T00:48:23.295969
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers.ts)_
 
 ## `smartthings edge:drivers:default`
 
@@ -4307,13 +4353,15 @@ USAGE
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list default drivers available to all users
@@ -4324,7 +4372,7 @@ EXAMPLES
     $ smartthings edge:drivers:default
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/default.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/default.ts)_
 
 ## `smartthings edge:drivers:delete [ID]`
 
@@ -4339,16 +4387,18 @@ ARGUMENTS
 
 FLAGS
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   delete an edge driver
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/delete.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/delete.ts)_
 
 ## `smartthings edge:drivers:install [DRIVERID]`
 
@@ -4363,13 +4413,15 @@ ARGUMENTS
   DRIVERID  id of driver to install
 
 FLAGS
-  -C, --channel=<value>       channel id
-  -H, --hub=<value>           hub id
+  -C, --channel=<UUID>        channel id
+  -H, --hub=<UUID>            hub id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   install an edge driver onto a hub
@@ -4382,7 +4434,7 @@ EXAMPLES
   $ smartthings edge:drivers:install -H <hub-id> -C <channel-id> <driver-id> # install a driver from a channel on an enrolled hub
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/install.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/install.ts)_
 
 ## `smartthings edge:drivers:installed [IDORINDEX]`
 
@@ -4397,22 +4449,24 @@ ARGUMENTS
   IDORINDEX  the driver id or number in list
 
 FLAGS
-  -H, --hub=<value>           hub id
+  -H, --hub=<UUID>            hub id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  -y, --yaml                  use YAML format of input and/or output
-  --device=<value>            return drivers matching the specified device
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+  --device=<UUID>             return drivers matching the specified device
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   list all drivers installed on a given hub
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/installed.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/installed.ts)_
 
 ## `smartthings edge:drivers:logcat [DRIVERID]`
 
@@ -4428,19 +4482,21 @@ ARGUMENTS
 
 FLAGS
   -a, --all                         stream from all installed drivers
-  -h, --help                        Show CLI help.
-  -p, --profile=<value>             [default: default] configuration profile
-  -t, --token=<value>               the auth token to use
   --connect-timeout=<milliseconds>  [default: 30000] max time allowed when connecting to hub
   --hub-address=<value>             IPv4 address of hub with optionally appended port number
-  --language=<value>                ISO language code or "NONE" to not specify a language. Defaults to the OS locale
   --log-level=<string>              [default: TRACE] minimum level of event to log
 
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
 DESCRIPTION
   stream logs from installed drivers
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/logcat.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/logcat.ts)_
 
 ## `smartthings edge:drivers:package [PROJECTDIRECTORY]`
 
@@ -4460,17 +4516,19 @@ FLAGS
   -O, --organization=<value>  the organization ID to use for this command
   -a, --assign                prompt for a channel to assign the driver to after upload
   -b, --build-only=<value>    save package to specified zip file but skip upload
-  -h, --help                  Show CLI help.
-  -j, --json                  use JSON format of input and/or output
-  -o, --output=<value>        specify output file
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
   -u, --upload=<value>        upload zip file previously built with --build flag
-  -y, --yaml                  use YAML format of input and/or output
-  --channel=<value>           automatically assign driver to specified channel after upload
-  --hub=<value>               automatically install driver to specified hub, implies --assign if --assign or --channel
+  --channel=<UUID>            automatically assign driver to specified channel after upload
+  --hub=<UUID>                automatically install driver to specified hub, implies --assign if --assign or --channel
                               not included
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   build and upload an edge package
@@ -4494,7 +4552,7 @@ EXAMPLES
     $ smartthings edge:drivers:package -u driver.zip
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/package.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/package.ts)_
 
 ## `smartthings edge:drivers:publish [DRIVERID] [VERSION]`
 
@@ -4510,12 +4568,14 @@ ARGUMENTS
   VERSION   driver version
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   assign a driver to a channel
@@ -4537,15 +4597,17 @@ ARGUMENTS
   DEVICEID  id of device to update
 
 FLAGS
-  -H, --hub=<value>           hub id
+  -H, --hub=<UUID>            hub id
   -I, --include-non-matching  when presenting a list of drivers to switch to, include drivers that do not match the
                               device
   -O, --organization=<value>  the organization ID to use for this command
-  -d, --driver=<value>        id of new driver to use
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+  -d, --driver=<UUID>         id of new driver to use
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   change the driver used by an installed device
@@ -4561,7 +4623,7 @@ EXAMPLES
     $ smartthings edge:drivers:switch --include-non-matching
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/switch.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/switch.ts)_
 
 ## `smartthings edge:drivers:uninstall [DRIVERID]`
 
@@ -4576,18 +4638,20 @@ ARGUMENTS
   DRIVERID  id of driver to uninstall
 
 FLAGS
-  -H, --hub=<value>           hub id
+  -H, --hub=<UUID>            hub id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   uninstall an edge driver from a hub
 ```
 
-_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/edge-cli-plugin/blob/v1.15.5/src/commands/edge/drivers/uninstall.ts)_
+_See code: [@smartthings/plugin-cli-edge](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/uninstall.ts)_
 
 ## `smartthings edge:drivers:unpublish [DRIVERID]`
 
@@ -4602,12 +4666,14 @@ ARGUMENTS
   DRIVERID  driver id
 
 FLAGS
-  -C, --channel=<value>       channel id
+  -C, --channel=<UUID>        channel id
   -O, --organization=<value>  the organization ID to use for this command
-  -h, --help                  Show CLI help.
-  -p, --profile=<value>       [default: default] configuration profile
-  -t, --token=<value>         the auth token to use
-  --language=<value>          ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
 
 DESCRIPTION
   remove a driver from a channel
diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
index 611c16120..8874c9775 100644
--- a/packages/cli/jest.config.js
+++ b/packages/cli/jest.config.js
@@ -8,7 +8,4 @@ module.exports = {
 		'@smartthings/cli-testlib',
 		'jest-extended',
 	],
-	modulePathIgnorePatterns: [
-		'<rootDir>/lib',
-	],
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2cc0fe1fe..b6f19f47c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -75,16 +75,16 @@
 		"@oclif/plugin-help": "^5.1.12",
 		"@oclif/plugin-not-found": "^2.3.1",
 		"@oclif/plugin-plugins": "^2.1.0",
-		"@smartthings/cli-lib": "^1.0.0-beta.15",
+		"@smartthings/cli-lib": "^1.0.0-beta.16",
 		"@smartthings/core-sdk": "^5.1.1",
-		"@smartthings/plugin-cli-edge": "^1.15.5",
+		"@smartthings/plugin-cli-edge": "^2.0.0-beta.0",
 		"aws-sdk": "^2.1175.0",
 		"inquirer": "^8.2.4",
 		"js-yaml": "^4.1.0",
 		"log4js": "^6.6.0"
 	},
 	"devDependencies": {
-		"@smartthings/cli-testlib": "^1.0.0-beta.9",
+		"@smartthings/cli-testlib": "^1.0.0-beta.10",
 		"@types/inquirer": "^8.2.1",
 		"@types/jest": "^28.1.5",
 		"@types/js-yaml": "^4.0.5",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 520c83c85..c8b434953 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -13,6 +13,10 @@
 		{
 			"path": "../testlib",
 			"name": "@smartthings/cli-testlib"
+		},
+		{
+			"path": "../edge",
+			"name": "@smartthings/plugin-cli-edge"
 		}
 	],
 	"exclude": [
diff --git a/packages/edge/.eslintrc.js b/packages/edge/.eslintrc.js
new file mode 100644
index 000000000..c4016e415
--- /dev/null
+++ b/packages/edge/.eslintrc.js
@@ -0,0 +1,5 @@
+const shared = require("../../.eslintrc.js")
+
+shared.parserOptions.tsconfigRootDir = __dirname
+
+module.exports = shared
diff --git a/packages/edge/README.md b/packages/edge/README.md
new file mode 100644
index 000000000..6cd4b40bc
--- /dev/null
+++ b/packages/edge/README.md
@@ -0,0 +1,1188 @@
+SmartThings Edge CLI Plugin
+===========================
+
+This is the home of the SmartThings CLI plugin for Edge Drivers. While it is a plugin with a
+separate code base, it is installed by default with the SmartThings CLI. No additional setup is
+necessary to begin using the Edge CLI plugin with the SmartThings CLI.
+
+
+<!-- toc -->
+* [Using](#using)
+* [Commands](#commands)
+* [Building](#building)
+<!-- tocstop -->
+
+# Using
+
+See the [README for the CLI](https://github.com/SmartThingsCommunity/smartthings-cli/blob/master/packages/cli/README.md)
+for information on running the CLI.
+
+# Commands
+
+<!-- commands -->
+* [`smartthings edge:channels [IDORINDEX]`](#smartthings-edgechannels-idorindex)
+* [`smartthings edge:channels:assign [DRIVERID] [VERSION]`](#smartthings-edgechannelsassign-driverid-version)
+* [`smartthings edge:channels:assignments [IDORINDEX]`](#smartthings-edgechannelsassignments-idorindex)
+* [`smartthings edge:channels:create`](#smartthings-edgechannelscreate)
+* [`smartthings edge:channels:delete [ID]`](#smartthings-edgechannelsdelete-id)
+* [`smartthings edge:channels:drivers [IDORINDEX]`](#smartthings-edgechannelsdrivers-idorindex)
+* [`smartthings edge:channels:enroll [HUBID]`](#smartthings-edgechannelsenroll-hubid)
+* [`smartthings edge:channels:enrollments [IDORINDEX]`](#smartthings-edgechannelsenrollments-idorindex)
+* [`smartthings edge:channels:invitations [IDORINDEX]`](#smartthings-edgechannelsinvitations-idorindex)
+* [`smartthings edge:channels:invitations:accept ID`](#smartthings-edgechannelsinvitationsaccept-id)
+* [`smartthings edge:channels:invitations:create`](#smartthings-edgechannelsinvitationscreate)
+* [`smartthings edge:channels:invitations:delete [ID]`](#smartthings-edgechannelsinvitationsdelete-id)
+* [`smartthings edge:channels:invitations:revoke [ID]`](#smartthings-edgechannelsinvitationsrevoke-id)
+* [`smartthings edge:channels:invites [IDORINDEX]`](#smartthings-edgechannelsinvites-idorindex)
+* [`smartthings edge:channels:invites:accept ID`](#smartthings-edgechannelsinvitesaccept-id)
+* [`smartthings edge:channels:invites:create`](#smartthings-edgechannelsinvitescreate)
+* [`smartthings edge:channels:invites:delete [ID]`](#smartthings-edgechannelsinvitesdelete-id)
+* [`smartthings edge:channels:invites:revoke [ID]`](#smartthings-edgechannelsinvitesrevoke-id)
+* [`smartthings edge:channels:metainfo [IDORINDEX]`](#smartthings-edgechannelsmetainfo-idorindex)
+* [`smartthings edge:channels:unassign [DRIVERID]`](#smartthings-edgechannelsunassign-driverid)
+* [`smartthings edge:channels:unenroll [HUBID]`](#smartthings-edgechannelsunenroll-hubid)
+* [`smartthings edge:channels:update [ID]`](#smartthings-edgechannelsupdate-id)
+* [`smartthings edge:drivers [IDORINDEX]`](#smartthings-edgedrivers-idorindex)
+* [`smartthings edge:drivers:default`](#smartthings-edgedriversdefault)
+* [`smartthings edge:drivers:delete [ID]`](#smartthings-edgedriversdelete-id)
+* [`smartthings edge:drivers:install [DRIVERID]`](#smartthings-edgedriversinstall-driverid)
+* [`smartthings edge:drivers:installed [IDORINDEX]`](#smartthings-edgedriversinstalled-idorindex)
+* [`smartthings edge:drivers:logcat [DRIVERID]`](#smartthings-edgedriverslogcat-driverid)
+* [`smartthings edge:drivers:package [PROJECTDIRECTORY]`](#smartthings-edgedriverspackage-projectdirectory)
+* [`smartthings edge:drivers:publish [DRIVERID] [VERSION]`](#smartthings-edgedriverspublish-driverid-version)
+* [`smartthings edge:drivers:switch [DEVICEID]`](#smartthings-edgedriversswitch-deviceid)
+* [`smartthings edge:drivers:uninstall [DRIVERID]`](#smartthings-edgedriversuninstall-driverid)
+* [`smartthings edge:drivers:unpublish [DRIVERID]`](#smartthings-edgedriversunpublish-driverid)
+
+## `smartthings edge:channels [IDORINDEX]`
+
+list all channels owned by you or retrieve a single channel
+
+```
+USAGE
+  $ smartthings edge:channels [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-I | -A] [--subscriber-id <value> --subscriber-type HUB]
+
+ARGUMENTS
+  IDORINDEX  the channel id or number in list
+
+FLAGS
+  -A, --all-organizations     include entities from all organizations the user belongs to
+  -I, --include-read-only     include subscribed-to channels as well as owned channels
+  -O, --organization=<value>  the organization ID to use for this command
+  --subscriber-id=<UUID>      filter results based on subscriber id (e.g. hub id)
+  --subscriber-type=<option>  filter results based on subscriber type
+                              <options: HUB>
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all channels owned by you or retrieve a single channel
+
+EXAMPLES
+  # list all user-owned channels
+  $ smartthings edge:channels
+  # list user-owned and subscribed channels
+  $ smartthings edge:channels --include-read-only
+
+  # display details about the second channel listed when running "smartthings edge:channels"
+  $ smartthings edge:channels 2
+  # display channels subscribed to by the specified hub
+  $ smartthings edge:channels --subscriber-type HUB --subscriber-id <hub-id>
+```
+
+_See code: [src/commands/edge/channels.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels.ts)_
+
+## `smartthings edge:channels:assign [DRIVERID] [VERSION]`
+
+assign a driver to a channel
+
+```
+USAGE
+  $ smartthings edge:channels:assign [DRIVERID] [VERSION] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+    [-C <value>]
+
+ARGUMENTS
+  DRIVERID  driver id
+  VERSION   driver version
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  assign a driver to a channel
+
+ALIASES
+  $ smartthings edge:drivers:publish
+```
+
+_See code: [src/commands/edge/channels/assign.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/assign.ts)_
+
+## `smartthings edge:channels:assignments [IDORINDEX]`
+
+list all drivers assigned to a given channel
+
+```
+USAGE
+  $ smartthings edge:channels:assignments [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>]
+
+ARGUMENTS
+  IDORINDEX  the channel id or number in list
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all drivers assigned to a given channel
+
+ALIASES
+  $ smartthings edge:channels:assignments
+```
+
+## `smartthings edge:channels:create`
+
+create a channel
+
+```
+USAGE
+  $ smartthings edge:channels:create [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j] [-y] [-i
+    <value>] [-o <value>] [-d]
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+  -d, --dry-run               produce JSON but don't actually submit
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  create a channel
+```
+
+_See code: [src/commands/edge/channels/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/create.ts)_
+
+## `smartthings edge:channels:delete [ID]`
+
+delete a channel
+
+```
+USAGE
+  $ smartthings edge:channels:delete [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+
+ARGUMENTS
+  ID  channel id
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete a channel
+```
+
+_See code: [src/commands/edge/channels/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/delete.ts)_
+
+## `smartthings edge:channels:drivers [IDORINDEX]`
+
+list all drivers assigned to a given channel
+
+```
+USAGE
+  $ smartthings edge:channels:drivers [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>]
+
+ARGUMENTS
+  IDORINDEX  the channel id or number in list
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all drivers assigned to a given channel
+
+ALIASES
+  $ smartthings edge:channels:assignments
+```
+
+_See code: [src/commands/edge/channels/drivers.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/drivers.ts)_
+
+## `smartthings edge:channels:enroll [HUBID]`
+
+enroll a hub in a channel
+
+```
+USAGE
+  $ smartthings edge:channels:enroll [HUBID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+  <value>]
+
+ARGUMENTS
+  HUBID  hub id
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  enroll a hub in a channel
+```
+
+_See code: [src/commands/edge/channels/enroll.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/enroll.ts)_
+
+## `smartthings edge:channels:enrollments [IDORINDEX]`
+
+list all channels a given hub is enrolled in
+
+```
+USAGE
+  $ smartthings edge:channels:enrollments [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>]
+
+ARGUMENTS
+  IDORINDEX  the hub id or number in list
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all channels a given hub is enrolled in
+```
+
+_See code: [src/commands/edge/channels/enrollments.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/enrollments.ts)_
+
+## `smartthings edge:channels:invitations [IDORINDEX]`
+
+list invitations or retrieve a single invitation by id or index
+
+```
+USAGE
+  $ smartthings edge:channels:invitations [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-C <value>]
+
+ARGUMENTS
+  IDORINDEX  the invitation id or number in list
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list invitations or retrieve a single invitation by id or index
+
+ALIASES
+  $ smartthings edge:channels:invitations
+
+EXAMPLES
+  $ smartthings edge:channels:invites                  # list all invites on all channels you own
+
+  $ smartthings edge:channels:invites 2                # list details about the second invite show when listed as in the example above
+
+  $ smartthings edge:channels:invites -C <channel id>  # list all invites on channel with id <channel id>
+
+  $ smartthings edge:channels:invites <invite id>      # list details about the invite with id <invite id>
+```
+
+## `smartthings edge:channels:invitations:accept ID`
+
+accept a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invitations:accept [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+
+ARGUMENTS
+  ID  invite UUID
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  accept a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:accept
+```
+
+## `smartthings edge:channels:invitations:create`
+
+create an invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invitations:create [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C <value> | -i
+    <value>] [-j] [-y] [-o <value>] [-d]
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+  -d, --dry-run               produce JSON but don't actually submit
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  create an invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:create
+```
+
+## `smartthings edge:channels:invitations:delete [ID]`
+
+delete a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invitations:delete [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+  [-C <value>]
+
+ARGUMENTS
+  ID  invitation UUID
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:revoke
+  $ smartthings edge:channels:invitations:delete
+  $ smartthings edge:channels:invites:revoke
+```
+
+## `smartthings edge:channels:invitations:revoke [ID]`
+
+delete a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invitations:revoke [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+  [-C <value>]
+
+ARGUMENTS
+  ID  invitation UUID
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:revoke
+  $ smartthings edge:channels:invitations:delete
+  $ smartthings edge:channels:invites:revoke
+```
+
+## `smartthings edge:channels:invites [IDORINDEX]`
+
+list invitations or retrieve a single invitation by id or index
+
+```
+USAGE
+  $ smartthings edge:channels:invites [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-C <value>]
+
+ARGUMENTS
+  IDORINDEX  the invitation id or number in list
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list invitations or retrieve a single invitation by id or index
+
+ALIASES
+  $ smartthings edge:channels:invitations
+
+EXAMPLES
+  $ smartthings edge:channels:invites                  # list all invites on all channels you own
+
+  $ smartthings edge:channels:invites 2                # list details about the second invite show when listed as in the example above
+
+  $ smartthings edge:channels:invites -C <channel id>  # list all invites on channel with id <channel id>
+
+  $ smartthings edge:channels:invites <invite id>      # list details about the invite with id <invite id>
+```
+
+_See code: [src/commands/edge/channels/invites.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites.ts)_
+
+## `smartthings edge:channels:invites:accept ID`
+
+accept a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invites:accept [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+
+ARGUMENTS
+  ID  invite UUID
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  accept a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:accept
+```
+
+_See code: [src/commands/edge/channels/invites/accept.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/accept.ts)_
+
+## `smartthings edge:channels:invites:create`
+
+create an invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invites:create [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C <value> | -i
+    <value>] [-j] [-y] [-o <value>] [-d]
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+  -d, --dry-run               produce JSON but don't actually submit
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  create an invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:create
+```
+
+_See code: [src/commands/edge/channels/invites/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/create.ts)_
+
+## `smartthings edge:channels:invites:delete [ID]`
+
+delete a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invites:delete [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+  <value>]
+
+ARGUMENTS
+  ID  invitation UUID
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:revoke
+  $ smartthings edge:channels:invitations:delete
+  $ smartthings edge:channels:invites:revoke
+```
+
+_See code: [src/commands/edge/channels/invites/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/invites/delete.ts)_
+
+## `smartthings edge:channels:invites:revoke [ID]`
+
+delete a channel invitation
+
+```
+USAGE
+  $ smartthings edge:channels:invites:revoke [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+  <value>]
+
+ARGUMENTS
+  ID  invitation UUID
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete a channel invitation
+
+ALIASES
+  $ smartthings edge:channels:invitations:revoke
+  $ smartthings edge:channels:invitations:delete
+  $ smartthings edge:channels:invites:revoke
+```
+
+## `smartthings edge:channels:metainfo [IDORINDEX]`
+
+list all channels owned by you or retrieve a single channel
+
+```
+USAGE
+  $ smartthings edge:channels:metainfo [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-C <value> | ]
+
+ARGUMENTS
+  IDORINDEX  the channel id or number in list
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all channels owned by you or retrieve a single channel
+
+EXAMPLES
+  # summarize metainfo for all drivers in a channel
+  $ smartthings edge:channels:metainfo
+  # summarize metainfo for all drivers in the specified channel
+  $ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2
+  # display metainfo about the third driver listed in the above command
+  $ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2 3
+
+  # display metainfo about a driver by using its id
+
+    $ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2 \
+      699c7308-8c72-4363-9571-880d0f5cc725
+```
+
+_See code: [src/commands/edge/channels/metainfo.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/metainfo.ts)_
+
+## `smartthings edge:channels:unassign [DRIVERID]`
+
+remove a driver from a channel
+
+```
+USAGE
+  $ smartthings edge:channels:unassign [DRIVERID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+    <value>]
+
+ARGUMENTS
+  DRIVERID  driver id
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  remove a driver from a channel
+
+ALIASES
+  $ smartthings edge:drivers:unpublish
+```
+
+_See code: [src/commands/edge/channels/unassign.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/unassign.ts)_
+
+## `smartthings edge:channels:unenroll [HUBID]`
+
+unenroll a hub from a channel
+
+```
+USAGE
+  $ smartthings edge:channels:unenroll [HUBID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+  <value>]
+
+ARGUMENTS
+  HUBID  hub id
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  unenroll a hub from a channel
+```
+
+_See code: [src/commands/edge/channels/unenroll.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/unenroll.ts)_
+
+## `smartthings edge:channels:update [ID]`
+
+update a channel
+
+```
+USAGE
+  $ smartthings edge:channels:update [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j] [-y] [-i
+    <value>] [-o <value>] [-d]
+
+ARGUMENTS
+  ID  the channel id
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+  -d, --dry-run               produce JSON but don't actually submit
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -i, --input=<value>    specify input file
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  update a channel
+```
+
+_See code: [src/commands/edge/channels/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/channels/update.ts)_
+
+## `smartthings edge:drivers [IDORINDEX]`
+
+list all drivers owned by you or retrieve a single driver
+
+```
+USAGE
+  $ smartthings edge:drivers [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-A] [-V <value>]
+
+ARGUMENTS
+  IDORINDEX  the driver id or number in list
+
+FLAGS
+  -A, --all-organizations     include entities from all organizations the user belongs to
+  -O, --organization=<value>  the organization ID to use for this command
+  -V, --version=<value>       driver version
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all drivers owned by you or retrieve a single driver
+
+  Use this command to list all drivers you own, even if they are not yet assigned to a channel.
+
+  See also:
+
+  edge:drivers:installed to list installed drivers
+
+  edge:channels:drivers to list drivers that are part of a channel you own or have subscribed to
+
+EXAMPLES
+  # list all user-owned drivers
+  $ smartthings edge:drivers
+  # display details about the third driver listed in the above command
+  $ smartthings edge:drivers 3
+
+  # display details about a driver by using its id
+  $ smartthings edge:drivers 699c7308-8c72-4363-9571-880d0f5cc725
+  # get information on a specific version of a driver
+  $ smartthings edge:drivers 699c7308-8c72-4363-9571-880d0f5cc725 --version 2021-10-25T00:48:23.295969
+```
+
+_See code: [src/commands/edge/drivers.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers.ts)_
+
+## `smartthings edge:drivers:default`
+
+list default drivers available to all users
+
+```
+USAGE
+  $ smartthings edge:drivers:default [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j] [-y] [-o
+    <value>]
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list default drivers available to all users
+
+EXAMPLES
+  # list default drivers
+
+    $ smartthings edge:drivers:default
+```
+
+_See code: [src/commands/edge/drivers/default.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/default.ts)_
+
+## `smartthings edge:drivers:delete [ID]`
+
+delete an edge driver
+
+```
+USAGE
+  $ smartthings edge:drivers:delete [ID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+
+ARGUMENTS
+  ID  driver UUID
+
+FLAGS
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  delete an edge driver
+```
+
+_See code: [src/commands/edge/drivers/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/delete.ts)_
+
+## `smartthings edge:drivers:install [DRIVERID]`
+
+install an edge driver onto a hub
+
+```
+USAGE
+  $ smartthings edge:drivers:install [DRIVERID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-H
+    <value>] [-C <value>]
+
+ARGUMENTS
+  DRIVERID  id of driver to install
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -H, --hub=<UUID>            hub id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  install an edge driver onto a hub
+
+EXAMPLES
+  $ smartthings edge:drivers:install                                         # use Q&A format to enter required values
+
+  $ smartthings edge:drivers:install -H <hub-id>                             # specify the hub on the command line, other fields will be asked for
+
+  $ smartthings edge:drivers:install -H <hub-id> -C <channel-id> <driver-id> # install a driver from a channel on an enrolled hub
+```
+
+_See code: [src/commands/edge/drivers/install.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/install.ts)_
+
+## `smartthings edge:drivers:installed [IDORINDEX]`
+
+list all drivers installed on a given hub
+
+```
+USAGE
+  $ smartthings edge:drivers:installed [IDORINDEX] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-j]
+    [-y] [-o <value>] [-H <value>] [--device <value>]
+
+ARGUMENTS
+  IDORINDEX  the driver id or number in list
+
+FLAGS
+  -H, --hub=<UUID>            hub id
+  -O, --organization=<value>  the organization ID to use for this command
+  --device=<UUID>             return drivers matching the specified device
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  list all drivers installed on a given hub
+```
+
+_See code: [src/commands/edge/drivers/installed.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/installed.ts)_
+
+## `smartthings edge:drivers:logcat [DRIVERID]`
+
+stream logs from installed drivers
+
+```
+USAGE
+  $ smartthings edge:drivers:logcat [DRIVERID] [-h] [-p <value>] [-t <value>] [--language <value>] [-a] [--hub-address
+    <value>] [--connect-timeout <value>] [--log-level <value>]
+
+ARGUMENTS
+  DRIVERID  a specific driver to stream logs from
+
+FLAGS
+  -a, --all                         stream from all installed drivers
+  --connect-timeout=<milliseconds>  [default: 30000] max time allowed when connecting to hub
+  --hub-address=<value>             IPv4 address of hub with optionally appended port number
+  --log-level=<string>              [default: TRACE] minimum level of event to log
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  stream logs from installed drivers
+```
+
+_See code: [src/commands/edge/drivers/logcat.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/logcat.ts)_
+
+## `smartthings edge:drivers:package [PROJECTDIRECTORY]`
+
+build and upload an edge package
+
+```
+USAGE
+  $ smartthings edge:drivers:package [PROJECTDIRECTORY] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+    [-j] [-y] [-o <value>] [-a | --channel <value> | [-b <value> | -u <value>]] [-I | --hub <value> | ]
+
+ARGUMENTS
+  PROJECTDIRECTORY  [default: .] directory containing project to upload
+
+FLAGS
+  -I, --install               prompt for hub to install to after assigning it to the channel, implies --assign if
+                              --assign or --channel not included
+  -O, --organization=<value>  the organization ID to use for this command
+  -a, --assign                prompt for a channel to assign the driver to after upload
+  -b, --build-only=<value>    save package to specified zip file but skip upload
+  -u, --upload=<value>        upload zip file previously built with --build flag
+  --channel=<UUID>            automatically assign driver to specified channel after upload
+  --hub=<UUID>                automatically install driver to specified hub, implies --assign if --assign or --channel
+                              not included
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -j, --json             use JSON format of input and/or output
+  -o, --output=<value>   specify output file
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  -y, --yaml             use YAML format of input and/or output
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  build and upload an edge package
+
+EXAMPLES
+  # build and upload driver found in current directory:
+  $ smartthings edge:drivers:package
+  # build and upload driver found in current directory, assign it to a channel, and install it;
+  # user will be prompted for channel and hub
+  $ smartthings edge:drivers:package -I
+  # build and upload driver found in current directory then assign it to the specified channel
+  # and install it to the specified hub
+  $ smartthings edge:drivers:package --channel <channel-id> --hub <hubId>
+  # build and upload driver found in the my-driver directory
+  $ smartthings edge:drivers:package my-driver
+  # build the driver in the my-package directory and save it as driver.zip
+  $ smartthings edge:drivers:package -b driver.zip my-package
+
+  # upload the previously built driver found in driver.zip
+
+    $ smartthings edge:drivers:package -u driver.zip
+```
+
+_See code: [src/commands/edge/drivers/package.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/package.ts)_
+
+## `smartthings edge:drivers:publish [DRIVERID] [VERSION]`
+
+assign a driver to a channel
+
+```
+USAGE
+  $ smartthings edge:drivers:publish [DRIVERID] [VERSION] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>]
+    [-C <value>]
+
+ARGUMENTS
+  DRIVERID  driver id
+  VERSION   driver version
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  assign a driver to a channel
+
+ALIASES
+  $ smartthings edge:drivers:publish
+```
+
+## `smartthings edge:drivers:switch [DEVICEID]`
+
+change the driver used by an installed device
+
+```
+USAGE
+  $ smartthings edge:drivers:switch [DEVICEID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-H
+    <value>] [-d <value>] [-I]
+
+ARGUMENTS
+  DEVICEID  id of device to update
+
+FLAGS
+  -H, --hub=<UUID>            hub id
+  -I, --include-non-matching  when presenting a list of drivers to switch to, include drivers that do not match the
+                              device
+  -O, --organization=<value>  the organization ID to use for this command
+  -d, --driver=<UUID>         id of new driver to use
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  change the driver used by an installed device
+
+EXAMPLES
+  # switch driver, prompting user for all necessary input
+  $ smartthings edge:drivers:switch
+  # switch driver, including all necessary input on the command line
+  $ smartthings edge:drivers:switch --hub <hub-id> --driver <driver-id> <device-id>
+
+  # include all available drivers in prompt, even if they don't match the chosen device
+
+    $ smartthings edge:drivers:switch --include-non-matching
+```
+
+_See code: [src/commands/edge/drivers/switch.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/switch.ts)_
+
+## `smartthings edge:drivers:uninstall [DRIVERID]`
+
+uninstall an edge driver from a hub
+
+```
+USAGE
+  $ smartthings edge:drivers:uninstall [DRIVERID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-H
+    <value>]
+
+ARGUMENTS
+  DRIVERID  id of driver to uninstall
+
+FLAGS
+  -H, --hub=<UUID>            hub id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  uninstall an edge driver from a hub
+```
+
+_See code: [src/commands/edge/drivers/uninstall.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v2.0.0-beta.0/src/commands/edge/drivers/uninstall.ts)_
+
+## `smartthings edge:drivers:unpublish [DRIVERID]`
+
+remove a driver from a channel
+
+```
+USAGE
+  $ smartthings edge:drivers:unpublish [DRIVERID] [-h] [-p <value>] [-t <value>] [--language <value>] [-O <value>] [-C
+    <value>]
+
+ARGUMENTS
+  DRIVERID  driver id
+
+FLAGS
+  -C, --channel=<UUID>        channel id
+  -O, --organization=<value>  the organization ID to use for this command
+
+COMMON FLAGS
+  -h, --help             Show CLI help.
+  -p, --profile=<value>  [default: default] configuration profile
+  -t, --token=<value>    the auth token to use
+  --language=<value>     ISO language code or "NONE" to not specify a language. Defaults to the OS locale
+
+DESCRIPTION
+  remove a driver from a channel
+
+ALIASES
+  $ smartthings edge:drivers:unpublish
+```
+<!-- commandsstop -->
+
+# Building
+
+If you're a developer planning to work on the plugin, you can build and install
+it this way.
+
+## Prerequisites
+
+* Node version 12 or later
+* The latest release of the [SmartThings CLI](https://github.com/SmartThingsCommunity/smartthings-cli/blob/master/packages/cli/README.md)
+
+## Building
+
+1. npm install
+1. npm run build
+
+## Using Your Developer Build
+
+Install the plugin by linking it:
+
+    smartthings plugins:link ~path/to/this/repo
diff --git a/packages/edge/global.d.ts b/packages/edge/global.d.ts
new file mode 100644
index 000000000..b68ae0770
--- /dev/null
+++ b/packages/edge/global.d.ts
@@ -0,0 +1 @@
+import 'jest-extended'
diff --git a/packages/edge/jest.config.js b/packages/edge/jest.config.js
new file mode 100644
index 000000000..8874c9775
--- /dev/null
+++ b/packages/edge/jest.config.js
@@ -0,0 +1,11 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const rootConfig = require('../../jest.config')
+
+
+module.exports = {
+	...rootConfig,
+	setupFilesAfterEnv: [
+		'@smartthings/cli-testlib',
+		'jest-extended',
+	],
+}
diff --git a/packages/edge/package.json b/packages/edge/package.json
new file mode 100644
index 000000000..ad61b5c26
--- /dev/null
+++ b/packages/edge/package.json
@@ -0,0 +1,94 @@
+{
+	"name": "@smartthings/plugin-cli-edge",
+	"version": "2.0.0-beta.0",
+	"description": "Edge-related SmartThings CLI commands",
+	"author": "SmartThings, Inc.",
+	"bugs": {
+		"url": "https://github.com/SmartThingsCommunity/smartthings-cli/issues"
+	},
+	"homepage": "https://github.com/SmartThingsCommunity/smartthings-cli",
+	"license": "Apache-2.0",
+	"main": "lib/index",
+	"types": "lib/index",
+	"engines": {
+		"node": ">=16.14.2 <17",
+		"npm": ">=8"
+	},
+	"files": [
+		"lib",
+		"README.md",
+		"oclif.manifest.json",
+		"!*/__tests__"
+	],
+	"publishConfig": {
+		"access": "public"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/SmartThingsCommunity/smartthings-cli.git",
+		"directory": "packages/edge"
+	},
+	"keywords": [
+		"oclif-plugin"
+	],
+	"oclif": {
+		"commands": "./lib/commands",
+		"bin": "smartthings",
+		"devPlugins": [
+			"@oclif/plugin-help"
+		]
+	},
+	"dependencies": {
+		"@log4js-node/log4js-api": "^1.0.2",
+		"@oclif/core": "^1.13.10",
+		"@smartthings/cli-lib": "^1.0.0-beta.16",
+		"@smartthings/core-sdk": "^5.1.1",
+		"axios": "^0.21.4",
+		"inquirer": "^8.2.4",
+		"js-yaml": "^4.1.0",
+		"jszip": "^3.9.1",
+		"picomatch": "^2.3.1",
+		"tslib": "^2.3.1"
+	},
+	"devDependencies": {
+		"@smartthings/cli-testlib": "^1.0.0-beta.10",
+		"@types/cli-table": "^0.3.0",
+		"@types/eventsource": "^1.1.8",
+		"@types/inquirer": "^8.2.1",
+		"@types/jest": "^28.1.5",
+		"@types/js-yaml": "^4.0.5",
+		"@types/node": "^16.11.44",
+		"@types/picomatch": "^2.3.0",
+		"@typescript-eslint/eslint-plugin": "^5.30.6",
+		"@typescript-eslint/parser": "^5.30.6",
+		"eslint": "^8.19.0",
+		"eslint-plugin-eslint-comments": "^3.2.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-jest": "^26.6.0",
+		"eventsource": "^2.0.0",
+		"jest": "^28.1.3",
+		"jest-extended": "^0.11.5",
+		"oclif": "^3.1.2",
+		"rimraf": "^3.0.2",
+		"strip-ansi": "^6.0.1",
+		"ts-jest": "^28.0.6",
+		"ts-node": "^10.9.1",
+		"typescript": "^4.7.4"
+	},
+	"scripts": {
+		"lint": "eslint --ext .ts src",
+		"format": "eslint --ext .ts src --fix",
+		"clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
+		"full-clean": "rimraf node_modules && rimraf coverage && npm run clean",
+		"compile": "tsc -b",
+		"watch": "tsc -b -w",
+		"readme": "oclif readme",
+		"build": "npm run clean && npm run compile && npm run readme",
+		"test": "jest",
+		"test-watch": "jest --watch",
+		"test-coverage": "jest --coverage",
+		"postpack": "rimraf oclif.manifest.json",
+		"prepack": "tsc -b && oclif manifest && oclif readme",
+		"version": "oclif readme && git add README.md"
+	}
+}
diff --git a/packages/edge/src/__tests__/commands/edge/channels.test.ts b/packages/edge/src/__tests__/commands/edge/channels.test.ts
new file mode 100644
index 000000000..7e4f21027
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/channels.test.ts
@@ -0,0 +1,107 @@
+import { Channel, ChannelsEndpoint, SmartThingsClient } from '@smartthings/core-sdk'
+
+import { outputItemOrList } from '@smartthings/cli-lib'
+
+import ChannelsCommand from '../../../commands/edge/channels'
+import { listChannels } from '../../../lib/commands/channels-util'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputItemOrList: jest.fn(),
+	}
+})
+jest.mock('../../../../src/lib/commands/channels-util')
+
+describe('ChannelsCommand', () => {
+	const outputItemOrListMock = jest.mocked(outputItemOrList)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('uses outputItemOrList', async () => {
+		await expect(ChannelsCommand.run([])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(ChannelsCommand),
+			expect.objectContaining({
+				primaryKeyName: 'channelId',
+				listTableFieldDefinitions: expect.not.arrayContaining(['organization']),
+			}),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('includes organization in listing output', async () => {
+		await expect(ChannelsCommand.run(['--all-organizations'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(ChannelsCommand),
+			expect.objectContaining({
+				primaryKeyName: 'channelId',
+				listTableFieldDefinitions: expect.arrayContaining(['organization']),
+			}),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('passes subscriber type and id on to listChannels', async () => {
+		await expect(ChannelsCommand.run([
+			'--subscriber-type=HUB',
+			'--subscriber-id=subscriber-id',
+		])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(ChannelsCommand),
+			expect.objectContaining({ primaryKeyName: 'channelId' }),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const listFunction = outputItemOrListMock.mock.calls[0][3]
+
+		const channelList = [{ channelId: 'channel-in-list-id' }] as Channel[]
+		const listChannelsMock = jest.mocked(listChannels).mockResolvedValueOnce(channelList)
+
+		expect(await listFunction()).toBe(channelList)
+
+		expect(listChannelsMock).toHaveBeenCalledTimes(1)
+		expect(listChannelsMock).toHaveBeenCalledWith(expect.any(SmartThingsClient),
+			{ subscriberType: 'HUB', subscriberId: 'subscriber-id' })
+	})
+
+	test('get item function uses channels.get with id', async () => {
+		await expect(ChannelsCommand.run(['id-from-command-line'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(ChannelsCommand),
+			expect.objectContaining({ primaryKeyName: 'channelId' }),
+			'id-from-command-line',
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const getFunction = outputItemOrListMock.mock.calls[0][4]
+
+		const channel = { channelId: 'channel-in-list-id' } as Channel
+		const getSpy = jest.spyOn(ChannelsEndpoint.prototype, 'get').mockResolvedValueOnce(channel)
+
+		expect(await getFunction('resolved-channel-id')).toBe(channel)
+
+		expect(getSpy).toHaveBeenCalledTimes(1)
+		expect(getSpy).toHaveBeenCalledWith('resolved-channel-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/channels/delete.test.ts b/packages/edge/src/__tests__/commands/edge/channels/delete.test.ts
new file mode 100644
index 000000000..991165ea6
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/channels/delete.test.ts
@@ -0,0 +1,35 @@
+import { resetManagedConfigKey } from '@smartthings/cli-lib'
+import { ChannelsEndpoint } from '@smartthings/core-sdk'
+
+import ChannelsDeleteCommand from '../../../../commands/edge/channels/delete'
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+
+
+jest.mock('../../../../../src/lib/commands/channels-util')
+
+describe('ChannelsDeleteCommand', () => {
+	const chooseDriverMock = jest.mocked(chooseChannel).mockResolvedValue('chosen-channel-id')
+	const apiChannelsDeleteSpy = jest.spyOn(ChannelsEndpoint.prototype, 'delete').mockImplementation()
+	const resetManagedConfigKeyMock = jest.mocked(resetManagedConfigKey)
+
+	it('deletes a channel', async () => {
+		await expect(ChannelsDeleteCommand.run(['cmd-line-channel-id'])).resolves.not.toThrow()
+
+		expect(chooseDriverMock).toHaveBeenCalledTimes(1)
+		expect(chooseDriverMock).toHaveBeenCalledWith(expect.any(ChannelsDeleteCommand),
+			'Choose a channel to delete.', 'cmd-line-channel-id')
+
+		expect(apiChannelsDeleteSpy).toHaveBeenCalledTimes(1)
+		expect(apiChannelsDeleteSpy).toHaveBeenCalledWith('chosen-channel-id')
+		expect(resetManagedConfigKeyMock).toHaveBeenCalledTimes(1)
+		expect(resetManagedConfigKeyMock).toHaveBeenCalledWith(
+			expect.objectContaining({ profileName: 'default' }),
+			'defaultChannel',
+			expect.any(Function),
+		)
+
+		const predicate = resetManagedConfigKeyMock.mock.calls[0][2]
+		expect(predicate('another-channel-id')).toBeFalsy()
+		expect(predicate('chosen-channel-id')).toBeTruthy()
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/channels/drivers.test.ts b/packages/edge/src/__tests__/commands/edge/channels/drivers.test.ts
new file mode 100644
index 000000000..b0266fe66
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/channels/drivers.test.ts
@@ -0,0 +1,91 @@
+import { SmartThingsClient } from '@smartthings/core-sdk'
+
+import { outputList } from '@smartthings/cli-lib'
+
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+import { DriverChannelDetailsWithName } from '../../../../lib/commands/drivers-util'
+import * as driversUtil from '../../../../lib/commands/drivers-util'
+import ChannelsDriversCommand from '../../../../commands/edge/channels/drivers'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/channels-util')
+
+describe('ChannelsDriversCommand', () => {
+	const outputListMock = jest.mocked(outputList)
+	const chooseChannelMock = jest.mocked(chooseChannel)
+		.mockResolvedValue('chosen-channel-id')
+
+	const driverChannelDetailsList = [] as DriverChannelDetailsWithName[]
+	outputListMock.mockResolvedValue(driverChannelDetailsList)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('calls outputList to do the work', async () => {
+		await expect(ChannelsDriversCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			'Select a channel.', undefined,
+			{ allowIndex: true, includeReadOnly: true, useConfigDefault: true })
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+		expect(outputListMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			expect.objectContaining({
+				primaryKeyName: 'channelId',
+				listTableFieldDefinitions: expect.arrayContaining(['name', 'driverId', 'version']),
+			}),
+			expect.any(Function))
+	})
+
+	it('passes predefined id or index to chooseChannel', async () => {
+		await expect(ChannelsDriversCommand.run(['id-or-index'])).resolves.not.toThrow()
+
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			'Select a channel.', 'id-or-index',
+			{ allowIndex: true, includeReadOnly: true, useConfigDefault: true })
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+		expect(outputListMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			expect.objectContaining({
+				primaryKeyName: 'channelId',
+				listTableFieldDefinitions: expect.arrayContaining(['name', 'driverId', 'version']),
+			}),
+			expect.any(Function))
+	})
+
+	it('passes predefined id or index to chooseChannel', async () => {
+		await expect(ChannelsDriversCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			'Select a channel.', undefined,
+			{ allowIndex: true, includeReadOnly: true, useConfigDefault: true })
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+		expect(outputListMock).toHaveBeenCalledWith(expect.any(ChannelsDriversCommand),
+			expect.objectContaining({
+				primaryKeyName: 'channelId',
+				listTableFieldDefinitions: expect.arrayContaining(['name', 'driverId', 'version']),
+			}),
+			expect.any(Function))
+
+		const getData = outputListMock.mock.calls[0][2]
+
+		const drivers = [{ name: 'driver' }] as DriverChannelDetailsWithName[]
+		const listAssignedDriversWithNamesSpy = jest.spyOn(driversUtil, 'listAssignedDriversWithNames')
+			.mockResolvedValueOnce(drivers)
+
+		expect(await getData()).toBe(drivers)
+
+		expect(listAssignedDriversWithNamesSpy).toHaveBeenCalledTimes(1)
+		expect(listAssignedDriversWithNamesSpy).toHaveBeenCalledWith(expect.any(SmartThingsClient), 'chosen-channel-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/channels/enrollments.test.ts b/packages/edge/src/__tests__/commands/edge/channels/enrollments.test.ts
new file mode 100644
index 000000000..dc7586df0
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/channels/enrollments.test.ts
@@ -0,0 +1,49 @@
+import { outputList } from '@smartthings/cli-lib'
+import { EnrolledChannel, HubdevicesEndpoint } from '@smartthings/core-sdk'
+
+import ChannelsEnrollmentsCommand from '../../../../commands/edge/channels/enrollments'
+import { chooseHub } from '../../../../lib/commands/drivers-util'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('ChannelsEnrollmentsCommand', () => {
+	const chooseHubMock = jest.mocked(chooseHub)
+	const outputListMock = jest.mocked(outputList)
+	const apiEnrolledChannelsSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'enrolledChannels')
+
+	it('displays enrolled channels', async () => {
+		chooseHubMock.mockResolvedValueOnce('chosen-hub-id')
+		outputListMock.mockResolvedValueOnce([])
+
+		await expect(ChannelsEnrollmentsCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(ChannelsEnrollmentsCommand),
+			'Select a hub.', undefined, { allowIndex: true, useConfigDefault: true })
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+		expect(outputListMock).toHaveBeenCalledWith(expect.any(ChannelsEnrollmentsCommand),
+			expect.objectContaining({ primaryKeyName: 'channelId' }), expect.any(Function))
+	})
+
+	it('uses enrolledChannels to list enrolled channels', async () => {
+		chooseHubMock.mockResolvedValueOnce('chosen-hub-id')
+		outputListMock.mockResolvedValueOnce([])
+
+		await expect(ChannelsEnrollmentsCommand.run([])).resolves.not.toThrow()
+
+		const channelList = [{ channelId: 'enrolled-channel-id' } as EnrolledChannel]
+		apiEnrolledChannelsSpy.mockResolvedValueOnce(channelList)
+		const listItems = outputListMock.mock.calls[0][2]
+
+		expect(await listItems()).toBe(channelList)
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/channels/metainfo.test.ts b/packages/edge/src/__tests__/commands/edge/channels/metainfo.test.ts
new file mode 100644
index 000000000..c376fdd35
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/channels/metainfo.test.ts
@@ -0,0 +1,132 @@
+import { ChannelsEndpoint, DriverChannelDetails, EdgeDriver } from '@smartthings/core-sdk'
+
+import { CustomCommonOutputProducer, DefaultTableGenerator, outputItemOrList } from '@smartthings/cli-lib'
+
+import ChannelsMetaInfoCommand from '../../../../commands/edge/channels/metainfo'
+import { buildTableOutput } from '../../../../lib/commands/drivers-util'
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputItemOrList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/channels-util')
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('ChannelsMetaInfoCommand', () => {
+	const outputItemOrListMock = jest.mocked(outputItemOrList)
+
+	const chooseChannelMock = jest.mocked(chooseChannel).mockResolvedValue('resolved-channel-id')
+
+	const listAssignedDriversSpy = jest.spyOn(ChannelsEndpoint.prototype, 'listAssignedDrivers')
+	const getDriverChannelMetaInfoSpy = jest.spyOn(ChannelsEndpoint.prototype, 'getDriverChannelMetaInfo')
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('uses outputItemOrList', async () => {
+		await expect(ChannelsMetaInfoCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock).toHaveBeenCalledWith(expect.any(ChannelsMetaInfoCommand),
+			'Choose a channel to get meta info for.', undefined, { useConfigDefault: true })
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(ChannelsMetaInfoCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('passes channel from command line to chooseChannel', async () => {
+		await expect(ChannelsMetaInfoCommand.run(['--channel=channel-id-from-cmd-line']))
+			.resolves.not.toThrow()
+
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock).toHaveBeenCalledWith(expect.any(ChannelsMetaInfoCommand),
+			'Choose a channel to get meta info for.', 'channel-id-from-cmd-line', { useConfigDefault: true })
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+	})
+
+	describe('listDriversMetaInfo', () => {
+		it('returns empty list when no drivers assigned to channel', async () => {
+			await expect(ChannelsMetaInfoCommand.run([])).resolves.not.toThrow()
+
+			expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+			const listDriversMetaInfo = outputItemOrListMock.mock.calls[0][3] as () => Promise<EdgeDriver[]>
+			listAssignedDriversSpy.mockResolvedValueOnce([])
+
+			expect(await listDriversMetaInfo()).toEqual([])
+
+			expect(listAssignedDriversSpy).toHaveBeenCalledTimes(1)
+			expect(listAssignedDriversSpy).toHaveBeenCalledWith('resolved-channel-id')
+			expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledTimes(0)
+		})
+
+		it('combines meta info for all drivers in a channel', async () => {
+			await expect(ChannelsMetaInfoCommand.run([])).resolves.not.toThrow()
+
+			expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+			const listDriversMetaInfo = outputItemOrListMock.mock.calls[0][3] as () => Promise<EdgeDriver[]>
+			const assignedDrivers = [
+				{ driverId: 'assigned-driver-1' },
+				{ driverId: 'assigned-driver-2' },
+			] as DriverChannelDetails[]
+			listAssignedDriversSpy.mockResolvedValueOnce(assignedDrivers)
+			const metaInfo1 = { driverId: 'driver-1-with-meta-info-id' } as EdgeDriver
+			const metaInfo2 = { driverId: 'driver-2-with-meta-info-id' } as EdgeDriver
+			getDriverChannelMetaInfoSpy.mockResolvedValueOnce(metaInfo1)
+			getDriverChannelMetaInfoSpy.mockResolvedValueOnce(metaInfo2)
+
+			expect(await listDriversMetaInfo()).toStrictEqual([metaInfo1, metaInfo2])
+
+			expect(listAssignedDriversSpy).toHaveBeenCalledTimes(1)
+			expect(listAssignedDriversSpy).toHaveBeenCalledWith('resolved-channel-id')
+			expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledTimes(2)
+			expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledWith('resolved-channel-id', 'assigned-driver-1')
+			expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledWith('resolved-channel-id', 'assigned-driver-2')
+		})
+	})
+
+	test('get item function uses channels.getDriverChannelMetaInfo', async () => {
+		await expect(ChannelsMetaInfoCommand.run(['id-from-command-line'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+		const getFunction = outputItemOrListMock.mock.calls[0][4]
+
+		const driver = { driverId: 'driver-id' } as EdgeDriver
+		getDriverChannelMetaInfoSpy.mockResolvedValueOnce(driver)
+
+		expect(await getFunction('resolved-driver-id')).toBe(driver)
+
+		expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledTimes(1)
+		expect(getDriverChannelMetaInfoSpy).toHaveBeenCalledWith('resolved-channel-id', 'resolved-driver-id')
+	})
+
+	it('uses buildTableOutput from drivers-util', async () => {
+		await expect(ChannelsMetaInfoCommand.run(['id-from-command-line'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+		const config = outputItemOrListMock.mock.calls[0][1] as CustomCommonOutputProducer<EdgeDriver>
+		const driver = { driverId: 'driver-id' } as EdgeDriver
+
+		const buildTableOutputMock = jest.mocked(buildTableOutput).mockReturnValueOnce('table output')
+
+		expect(config.buildTableOutput(driver)).toBe('table output')
+
+		expect(buildTableOutputMock).toHaveBeenCalledTimes(1)
+		expect(buildTableOutputMock).toHaveBeenCalledWith(expect.any(DefaultTableGenerator), driver)
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers.test.ts b/packages/edge/src/__tests__/commands/edge/drivers.test.ts
new file mode 100644
index 000000000..e2a739551
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers.test.ts
@@ -0,0 +1,152 @@
+import { DriversEndpoint, EdgeDriver, SmartThingsClient } from '@smartthings/core-sdk'
+
+import { CustomCommonOutputProducer, DefaultTableGenerator, outputItemOrList } from '@smartthings/cli-lib'
+
+import DriversCommand from '../../../commands/edge/drivers'
+import { buildTableOutput, listDrivers } from '../../../lib/commands/drivers-util'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputItemOrList: jest.fn(),
+	}
+})
+jest.mock('../../../../src/lib/commands/drivers-util')
+
+describe('DriversCommand', () => {
+	const outputItemOrListMock = jest.mocked(outputItemOrList)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('uses outputItemOrList', async () => {
+		await expect(DriversCommand.run([])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({
+				primaryKeyName: 'driverId',
+				listTableFieldDefinitions: expect.not.arrayContaining(['organization']),
+			}),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('includes organization in listing output', async () => {
+		await expect(DriversCommand.run(['--all-organizations'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({
+				primaryKeyName: 'driverId',
+				listTableFieldDefinitions: expect.arrayContaining(['organization']),
+			}),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('uses listDrivers to list drivers', async () => {
+		await expect(DriversCommand.run(['--all-organizations'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const listFunction = outputItemOrListMock.mock.calls[0][3]
+
+		const driverList = [{ driverId: 'driver-in-list-id' }] as EdgeDriver[]
+		const listDriversMock = jest.mocked(listDrivers).mockResolvedValueOnce(driverList)
+
+		expect(await listFunction()).toBe(driverList)
+
+		expect(listDriversMock).toHaveBeenCalledTimes(1)
+		expect(listDriversMock).toHaveBeenCalledWith(expect.any(SmartThingsClient), true)
+	})
+
+	test('get item function uses drivers.get with id', async () => {
+		await expect(DriversCommand.run(['id-from-command-line'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			'id-from-command-line',
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const getFunction = outputItemOrListMock.mock.calls[0][4]
+
+		const driver = { driverId: 'driver-id' } as EdgeDriver
+		const getSpy = jest.spyOn(DriversEndpoint.prototype, 'get').mockResolvedValueOnce(driver)
+
+		expect(await getFunction('resolved-driver-id')).toBe(driver)
+
+		expect(getSpy).toHaveBeenCalledTimes(1)
+		expect(getSpy).toHaveBeenCalledWith('resolved-driver-id')
+	})
+
+	test('get item function uses drivers.getRevision with id version flag', async () => {
+		await expect(DriversCommand.run([
+			'id-from-command-line',
+			'--version=version-from-command-line',
+		])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			'id-from-command-line',
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const getFunction = outputItemOrListMock.mock.calls[0][4]
+
+		const driver = { driverId: 'driver-id' } as EdgeDriver
+		const getRevision = jest.spyOn(DriversEndpoint.prototype, 'getRevision').mockResolvedValueOnce(driver)
+
+		expect(await getFunction('resolved-driver-id')).toBe(driver)
+
+		expect(getRevision).toHaveBeenCalledTimes(1)
+		expect(getRevision).toHaveBeenCalledWith('resolved-driver-id', 'version-from-command-line')
+	})
+
+	it('uses buildTableOutput from drivers-util', async () => {
+		await expect(DriversCommand.run(['id-from-command-line'])).resolves.not.toThrow()
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			'id-from-command-line',
+			expect.any(Function),
+			expect.any(Function),
+		)
+
+		const config = outputItemOrListMock.mock.calls[0][1] as CustomCommonOutputProducer<EdgeDriver>
+		const driver = { driverId: 'driver-id' } as EdgeDriver
+
+		const buildTableOutputMock = jest.mocked(buildTableOutput).mockReturnValueOnce('table output')
+
+		expect(config.buildTableOutput(driver)).toBe('table output')
+
+		expect(buildTableOutputMock).toHaveBeenCalledTimes(1)
+		expect(buildTableOutputMock).toHaveBeenCalledWith(expect.any(DefaultTableGenerator), driver)
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/default.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/default.test.ts
new file mode 100644
index 000000000..0c2f31064
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/default.test.ts
@@ -0,0 +1,52 @@
+import { DriversEndpoint, EdgeDriverSummary } from '@smartthings/core-sdk'
+
+import { outputList } from '@smartthings/cli-lib'
+
+import DriversDefaultCommand from '../../../../commands/edge/drivers/default'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('DriversDefaultCommand', () => {
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	const outputListMock = jest.mocked(outputList)
+
+	it('uses outputList', async () => {
+		await expect(DriversDefaultCommand.run([])).resolves.not.toThrow()
+
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+		expect(outputListMock).toHaveBeenCalledWith(
+			expect.any(DriversDefaultCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			expect.any(Function),
+		)
+	})
+
+	it('uses listDefaultDrivers to list drivers', async () => {
+		await expect(DriversDefaultCommand.run([])).resolves.not.toThrow()
+
+		expect(outputListMock).toHaveBeenCalledTimes(1)
+
+		const listFunction = outputListMock.mock.calls[0][2]
+
+		const driverList = [{ driverId: 'driver-in-list-id' }] as EdgeDriverSummary[]
+		const listDefaultSpy = jest.spyOn(DriversEndpoint.prototype, 'listDefault')
+			.mockResolvedValueOnce(driverList)
+
+		expect(await listFunction()).toBe(driverList)
+
+		expect(listDefaultSpy).toHaveBeenCalledTimes(1)
+		expect(listDefaultSpy).toHaveBeenCalledWith()
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/delete.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/delete.test.ts
new file mode 100644
index 000000000..1ef6d8caf
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/delete.test.ts
@@ -0,0 +1,27 @@
+import { DriversEndpoint } from '@smartthings/core-sdk'
+
+import DriversDeleteCommand from '../../../../commands/edge/drivers/delete'
+import { chooseDriver } from '../../../../lib/commands/drivers-util'
+
+
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('DriversDeleteCommand', () => {
+	const chooseDriverMock = jest.mocked(chooseDriver).mockResolvedValue('chosen-driver-id')
+	const apiDriversDeleteSpy = jest.spyOn(DriversEndpoint.prototype, 'delete').mockImplementation()
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('deletes driver', async () => {
+		await expect(DriversDeleteCommand.run(['cmd-line-driver-id'])).resolves.not.toThrow()
+
+		expect(chooseDriverMock).toHaveBeenCalledTimes(1)
+		expect(chooseDriverMock).toHaveBeenCalledWith(expect.any(DriversDeleteCommand),
+			'Select a driver to delete.', 'cmd-line-driver-id')
+
+		expect(apiDriversDeleteSpy).toHaveBeenCalledTimes(1)
+		expect(apiDriversDeleteSpy).toHaveBeenCalledWith('chosen-driver-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/install.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/install.test.ts
new file mode 100644
index 000000000..9b0b5522f
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/install.test.ts
@@ -0,0 +1,82 @@
+import { EnrolledChannel, HubdevicesEndpoint } from '@smartthings/core-sdk'
+
+import { selectFromList } from '@smartthings/cli-lib'
+
+import { chooseDriverFromChannel, chooseHub } from '../../../../lib/commands/drivers-util'
+import DriversInstallCommand from '../../../../commands/edge/drivers/install'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		selectFromList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('DriversInstallCommand', () => {
+	const chooseHubMock = jest.mocked(chooseHub)
+	const chooseDriverFromChannelMock = jest.mocked(chooseDriverFromChannel)
+	const selectFromListMock = jest.mocked(selectFromList)
+	const enrolledChannelsSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'enrolledChannels')
+	const installDriverSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'installDriver')
+	const logSpy = jest.spyOn(DriversInstallCommand.prototype, 'log').mockImplementation()
+
+	chooseHubMock.mockResolvedValue('chosen-hub-id')
+	selectFromListMock.mockResolvedValue('chosen-channel-id')
+	chooseDriverFromChannelMock.mockResolvedValue('chosen-driver-id')
+	installDriverSpy.mockImplementation(async () => {
+		// empty
+	})
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('installs driver and logs message', async () => {
+		await expect(DriversInstallCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstallCommand),
+			'Select a hub to install to.', undefined, { useConfigDefault: true })
+		expect(selectFromListMock).toHaveBeenCalledTimes(1)
+		expect(selectFromListMock).toHaveBeenCalledWith(expect.any(DriversInstallCommand),
+			expect.objectContaining({ primaryKeyName: 'channelId' }),
+			expect.objectContaining({ promptMessage: 'Select a channel to install the driver from.' }))
+		expect(chooseDriverFromChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseDriverFromChannelMock).toHaveBeenCalledWith(expect.any(DriversInstallCommand),
+			'chosen-channel-id', undefined)
+		expect(installDriverSpy).toHaveBeenCalledTimes(1)
+		expect(installDriverSpy).toHaveBeenCalledWith('chosen-driver-id', 'chosen-hub-id',
+			'chosen-channel-id')
+		expect(logSpy).toHaveBeenCalledWith('driver chosen-driver-id installed to hub chosen-hub-id')
+
+		const channelsList = [{ name: 'channel' }] as EnrolledChannel[]
+		enrolledChannelsSpy.mockResolvedValue(channelsList)
+
+		const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+		expect(await listItems()).toBe(channelsList)
+
+		expect(enrolledChannelsSpy).toHaveBeenCalledTimes(1)
+		expect(enrolledChannelsSpy).toHaveBeenCalledWith('chosen-hub-id')
+	})
+
+	it('uses hub from command line if specified', async () => {
+		await expect(DriversInstallCommand.run(['--hub', 'command-line-hub-id'])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstallCommand),
+			'Select a hub to install to.', 'command-line-hub-id', { useConfigDefault: true })
+	})
+
+	it('uses channel from command line if specified', async () => {
+		await expect(DriversInstallCommand.run(['--channel', 'command-line-channel-id'])).resolves.not.toThrow()
+
+		expect(selectFromListMock).toHaveBeenCalledTimes(0)
+		expect(chooseDriverFromChannelMock).toHaveBeenCalledWith(expect.any(DriversInstallCommand),
+			'command-line-channel-id', undefined)
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/installed.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/installed.test.ts
new file mode 100644
index 000000000..4b9f8124a
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/installed.test.ts
@@ -0,0 +1,90 @@
+import { HubdevicesEndpoint, InstalledDriver } from '@smartthings/core-sdk'
+
+import { outputItemOrList } from '@smartthings/cli-lib'
+
+import DriversInstalledCommand from '../../../../commands/edge/drivers/installed'
+import { chooseHub } from '../../../../lib/commands/drivers-util'
+
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputItemOrList: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('DriversInstalledCommand', () => {
+	const hub = { name: 'Hub' } as InstalledDriver
+	const chooseHubMock = jest.mocked(chooseHub).mockResolvedValue('chosen-hub-id')
+	const apiHubsListInstalledSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'listInstalled').mockResolvedValue([hub])
+	const apiHubsGetInstalledSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'getInstalled').mockResolvedValue(hub)
+	const outputItemOrListMock = jest.mocked(outputItemOrList)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it('uses outputItemOrList', async () => {
+		await expect(DriversInstalledCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstalledCommand),
+			'Select a hub.', undefined, { allowIndex: true, useConfigDefault: true })
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+		expect(outputItemOrListMock).toHaveBeenCalledWith(
+			expect.any(DriversInstalledCommand),
+			expect.objectContaining({ primaryKeyName: 'driverId' }),
+			undefined,
+			expect.any(Function),
+			expect.any(Function),
+		)
+	})
+
+	it('uses hub id from command line', async () => {
+		await expect(DriversInstalledCommand.run(['--hub', 'cmd-line-hub-id'])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstalledCommand),
+			'Select a hub.', 'cmd-line-hub-id', { allowIndex: true, useConfigDefault: true })
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+	})
+
+	test('list function', async () => {
+		await expect(DriversInstalledCommand.run(['--device', 'cmd-line-device-id'])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstalledCommand),
+			'Select a hub.', undefined, { allowIndex: true, useConfigDefault: true })
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+		const listFunction = outputItemOrListMock.mock.calls[0][3]
+
+		expect(await listFunction()).toStrictEqual([hub])
+
+		expect(apiHubsListInstalledSpy).toHaveBeenCalledTimes(1)
+		expect(apiHubsListInstalledSpy).toHaveBeenCalledWith('chosen-hub-id', 'cmd-line-device-id')
+	})
+
+	test('get function', async () => {
+		await expect(DriversInstalledCommand.run(['cmd-line-driver-id'])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversInstalledCommand),
+			'Select a hub.', undefined, { allowIndex: true, useConfigDefault: true })
+
+		expect(outputItemOrListMock).toHaveBeenCalledTimes(1)
+
+		const getFunction = outputItemOrListMock.mock.calls[0][4]
+
+		expect(await getFunction('chosen-device-id')).toBe(hub)
+
+		expect(apiHubsGetInstalledSpy).toHaveBeenCalledTimes(1)
+		expect(apiHubsGetInstalledSpy).toHaveBeenCalledWith('chosen-hub-id', 'chosen-device-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/logcat.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/logcat.test.ts
new file mode 100644
index 000000000..370b19d05
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/logcat.test.ts
@@ -0,0 +1,514 @@
+import LogCatCommand from '../../../../commands/edge/drivers/logcat'
+import { promises as fs } from 'fs'
+import inquirer from 'inquirer'
+import { DriverInfo, handleConnectionErrors, LiveLogClient, liveLogMessageFormatter, parseIpAndPort } from '../../../../lib/live-logging'
+import { PeerCertificate } from 'tls'
+import { askForRequiredString, convertToId, logEvent, selectFromList, Sorting, SseCommand, stringTranslateToId } from '@smartthings/cli-lib'
+import EventSource from 'eventsource'
+import { CliUx, Errors } from '@oclif/core'
+import { runForever } from '../../../../lib/commands/drivers/logcat-util'
+
+
+
+const MOCK_IPV4 = '192.168.0.1'
+const MOCK_HOSTNAME = `${MOCK_IPV4}:9495`
+const MOCK_SOURCE_URL = `https://${MOCK_HOSTNAME}/drivers/logs`
+const MOCK_FINGERPRINT = '00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00'
+const MOCK_KNOWN_HUBS = JSON.stringify({
+	[MOCK_HOSTNAME]: {
+		hostname: MOCK_HOSTNAME,
+		fingerprint: MOCK_FINGERPRINT,
+	},
+})
+const MOCK_PEER_CERT = {
+	fingerprint: MOCK_FINGERPRINT,
+} as PeerCertificate
+
+jest.mock('inquirer')
+
+jest.mock('fs', () => {
+	// if this isn't done, something breaks with sub-dependency 'fs-extra'
+	const originalLib = jest.requireActual('fs')
+
+	return {
+		...originalLib,
+		promises: {
+			readFile: jest.fn(() => {
+				const error: NodeJS.ErrnoException = new Error()
+				error.code = 'ENOENT'
+				throw error
+			}),
+			writeFile: jest.fn(),
+		},
+	}
+})
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		stringTranslateToId: jest.fn(),
+		selectFromList: jest.fn(),
+		askForRequiredString: jest.fn(),
+		logEvent: jest.fn(),
+		convertToId: jest.fn().mockResolvedValue('driverId'),
+		handleSignals: jest.fn(),
+	}
+})
+
+jest.mock('eventsource')
+
+const mockLiveLogClient = {
+	getDrivers: jest.fn().mockResolvedValue([]),
+	getLogSource: jest.fn().mockReturnValue(MOCK_SOURCE_URL),
+} as unknown as LiveLogClient
+
+jest.mock('../../../../../src/lib/live-logging', () => ({
+	LiveLogClient: jest.fn(() => (mockLiveLogClient)),
+	parseIpAndPort: jest.fn(() => [MOCK_IPV4, undefined]),
+	handleConnectionErrors: jest.fn(),
+	LogLevel: {
+		TRACE: 100,
+		DEBUG: 200,
+		INFO: 300,
+		WARN: 400,
+		ERROR: 500,
+		FATAL: 600,
+		PRINT: 1000,
+	},
+}))
+
+jest.mock('../../../../../src/lib/commands/drivers/logcat-util')
+
+describe('LogCatCommand', () => {
+	const mockStringTranslateToId = jest.mocked(stringTranslateToId).mockResolvedValue('all')
+	const mockSelectFromList = jest.mocked(selectFromList).mockRejectedValue(new Errors.ExitError(0))
+	const mockAskForRequiredString = jest.mocked(askForRequiredString).mockResolvedValue(MOCK_IPV4)
+	const mockPrompt = jest.mocked(inquirer.prompt)
+	const mockReadFile = jest.mocked(fs.readFile)
+	const mockGetLogSource = jest.mocked(mockLiveLogClient.getLogSource)
+	const mockGetDrivers = jest.mocked(mockLiveLogClient.getDrivers)
+	const mockParseIpAndPort = jest.mocked(parseIpAndPort)
+	const mockRunForever = jest.mocked(runForever).mockImplementation()
+	const setTimeoutSpy = jest.spyOn(global, 'setTimeout')
+	const clearTimeoutSpy = jest.spyOn(global, 'clearTimeout')
+	const initSourceSpy = jest.spyOn(LogCatCommand.prototype, 'initSource').mockImplementation()
+	const sourceSpy = jest.spyOn(LogCatCommand.prototype, 'source', 'get').mockReturnValue({} as EventSource)
+	const teardownSpy = jest.spyOn(LogCatCommand.prototype, 'teardown').mockImplementation()
+	const errorSpy = jest.spyOn(LogCatCommand.prototype, 'error').mockImplementation()
+	const warnSpy = jest.spyOn(LogCatCommand.prototype, 'warn').mockImplementation()
+	const parseEventSpy = jest.spyOn(LogCatCommand.prototype, 'parseEvent').mockImplementation()
+
+	jest.spyOn(CliUx.ux.action, 'start').mockImplementation()
+	jest.spyOn(CliUx.ux.action, 'stop').mockImplementation()
+	jest.spyOn(CliUx.ux.action, 'pauseAsync').mockImplementation(async (fn) => {
+		return fn()
+	})
+	jest.spyOn(process.stdout, 'write').mockImplementation(() => true)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	describe('initialization', () => {
+		it('initializes SseCommand correctly', async () => {
+			const initSseSpy = jest.spyOn(SseCommand.prototype, 'init')
+
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(initSseSpy).toBeCalledTimes(1)
+		})
+
+		it('sets a timeout for eventsource that is cleared when connected', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+
+			expect(setTimeoutSpy).toBeCalledWith(expect.any(Function), 30000)
+
+			const callback = setTimeoutSpy.mock.calls[0][0]
+			callback()
+
+			expect(handleConnectionErrors).toBeCalledWith(MOCK_HOSTNAME, 'ETIMEDOUT')
+
+			const openHandler = sourceSpy.mock.results[0].value.onopen
+			openHandler({} as MessageEvent)
+
+			const timeoutID: NodeJS.Timeout = setTimeoutSpy.mock.results[0].value
+
+			expect(clearTimeoutSpy).toBeCalledWith(timeoutID)
+		})
+
+		it('initializes a LogClient with a host verifier function and timeout', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(LiveLogClient).toBeCalledWith(
+				expect.objectContaining({
+					verifier: expect.any(Function),
+					timeout: expect.any(Number),
+				}),
+			)
+		})
+
+		it('accepts connect-timeout flag to use with both clients', async () => {
+			const oneSecondTimeout = 1000
+			await expect(LogCatCommand.run([`--connect-timeout=${oneSecondTimeout}`, '--all'])).resolves.not.toThrow()
+
+			expect(LiveLogClient).toBeCalledWith(
+				expect.objectContaining({
+					timeout: oneSecondTimeout,
+				}),
+			)
+
+			expect(setTimeoutSpy).toBeCalledWith(expect.any(Function), oneSecondTimeout)
+		})
+	})
+
+	describe('host verification', () => {
+		const logClientMock = jest.mocked(LiveLogClient)
+
+		beforeAll(() => {
+			logClientMock.mockImplementation((config) => ({
+				...mockLiveLogClient,
+				getDrivers: jest.fn(async () => {
+					await config.verifier?.(MOCK_PEER_CERT)
+					return Promise.resolve([])
+				}),
+			} as unknown as LiveLogClient))
+
+			// answer "yes" to every host verification prompt
+			mockPrompt.mockResolvedValue({ connect: true })
+		})
+
+		afterAll(() => {
+			// reset to default mock
+			logClientMock.mockImplementation(jest.fn(() => mockLiveLogClient))
+			mockPrompt.mockReset()
+		})
+
+		it('checks server identity and prompts user to validate fingerprint', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(fs.readFile).toBeCalledWith(expect.stringContaining('known_hubs.json'), 'utf-8')
+			expect(warnSpy).toBeCalledWith(expect.stringContaining(MOCK_FINGERPRINT))
+			expect(inquirer.prompt).toBeCalledWith(
+				expect.objectContaining(
+					{ default: false, message: 'Are you sure you want to continue connecting?' },
+				),
+			)
+		})
+
+		it('calls command error when user denies connection', async () => {
+			// user answers "no" this time
+			mockPrompt.mockResolvedValueOnce({ connect: false })
+
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(errorSpy).toBeCalledWith('Hub verification failed.')
+		})
+
+		it('caches host details when user confirms connection', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(fs.writeFile).toBeCalledWith(expect.stringContaining('known_hubs.json'), MOCK_KNOWN_HUBS)
+		})
+
+		it('does not modify other host details when writing to cache', async () => {
+			const knownHubsRead = JSON.stringify({
+				/* eslint-disable @typescript-eslint/naming-convention */
+				'192.168.0.0:9495': {
+					hostname: '192.168.0.0:9495',
+					fingerprint: 'A0:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00',
+				},
+				'192.168.0.2:9495': {
+					hostname: '192.168.0.2:9495',
+					fingerprint: 'B0:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00',
+				},
+				/* eslint-enable @typescript-eslint/naming-convention */
+			})
+
+			const knownHubsWrite = {
+				...JSON.parse(knownHubsRead),
+				...JSON.parse(MOCK_KNOWN_HUBS),
+			}
+
+			mockReadFile.mockResolvedValueOnce(knownHubsRead)
+
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(fs.writeFile).toBeCalledWith(expect.stringContaining('known_hubs.json'), JSON.stringify(knownHubsWrite))
+		})
+
+		it('overwrites cached details when changed', async () => {
+			const knownHubsRead = JSON.stringify({
+				[MOCK_HOSTNAME]: {
+					hostname: MOCK_HOSTNAME,
+					// cert changed this time
+					fingerprint: 'A0:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00',
+				},
+			})
+
+			mockReadFile.mockResolvedValueOnce(knownHubsRead)
+
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(warnSpy).toBeCalledWith(expect.stringContaining(MOCK_FINGERPRINT))
+			expect(inquirer.prompt).toBeCalledWith(
+				expect.objectContaining(
+					{ default: false, message: 'Are you sure you want to continue connecting?' },
+				),
+			)
+			expect(fs.writeFile).toBeCalledWith(expect.stringContaining('known_hubs.json'), MOCK_KNOWN_HUBS)
+		})
+
+		it('skips user verification on known fingerprint', async () => {
+			mockReadFile.mockResolvedValueOnce(MOCK_KNOWN_HUBS)
+
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+			expect(warnSpy).not.toBeCalled()
+			expect(inquirer.prompt).not.toBeCalled()
+		})
+	})
+
+	it('awaits forever Promise to prevent run from resolving', async () => {
+		await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+
+		expect(mockRunForever).toBeCalled()
+	})
+
+	it('should exit gracefully when no drivers found to list', async () => {
+		const catchSpy = jest.spyOn(LogCatCommand.prototype, 'catch')
+
+		await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`])).resolves.not.toThrow()
+
+		expect(catchSpy).toBeCalledWith(new Errors.ExitError(0))
+		expect(mockRunForever).not.toBeCalled()
+	})
+
+	it('should warn after connection when --all specified and no drivers installed', async () => {
+		await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+
+		const openHandler = sourceSpy.mock.results[0].value.onopen
+		openHandler({} as MessageEvent)
+
+		expect(warnSpy).toBeCalledWith('No drivers currently installed.')
+	})
+
+	it('uses correct source URL when --all is specified', async () => {
+		await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+
+		expect(mockLiveLogClient.getLogSource).toBeCalledTimes(1)
+		expect(mockLiveLogClient.getLogSource).toBeCalledWith()
+		expect(initSourceSpy).toBeCalledWith(MOCK_SOURCE_URL)
+	})
+
+	it('prompts user for hub address when not specified', async () => {
+		await expect(LogCatCommand.run(['--all'])).resolves.not.toThrow()
+
+		expect(mockAskForRequiredString).toBeCalledWith('Enter hub IP address with optionally appended port number:')
+	})
+
+	it('uses correct source URL when driverId is specified', async () => {
+		const driverId = 'driverId'
+		const driverLogSource = `${MOCK_SOURCE_URL}?driver_id=${driverId}`
+		mockStringTranslateToId.mockResolvedValueOnce(driverId)
+		mockSelectFromList.mockResolvedValueOnce(driverId)
+		mockGetLogSource.mockReturnValueOnce(driverLogSource)
+
+		await expect(LogCatCommand.run([driverId])).resolves.not.toThrow()
+
+		expect(mockGetLogSource).toBeCalledTimes(1)
+		expect(mockGetLogSource).toBeCalledWith('driverId')
+		expect(initSourceSpy).toBeCalledWith(driverLogSource)
+	})
+
+	it('prompts user to select an installed driver when not specified', async () => {
+		const driverList = [{}] as DriverInfo[]
+		const driverId = 'driverId'
+		mockGetDrivers.mockResolvedValueOnce(driverList)
+		mockStringTranslateToId.mockResolvedValueOnce(undefined)
+		mockPrompt.mockResolvedValueOnce({ itemIdOrIndex: driverId })
+
+		await expect(LogCatCommand.run([])).resolves.not.toThrow()
+
+		const expectedConfig = expect.objectContaining({
+			itemName: 'driver',
+			primaryKeyName: 'driver_id',
+			sortKeyName: 'driver_name',
+		})
+
+		expect(mockStringTranslateToId).toBeCalledWith(
+			expectedConfig,
+			undefined,
+			expect.any(Function),
+		)
+
+		const stringTranslateListDataFunction = mockStringTranslateToId.mock.calls[0][2]
+
+		expect(await stringTranslateListDataFunction()).toStrictEqual(driverList)
+
+		expect(mockSelectFromList).toBeCalledWith(
+			expect.any(LogCatCommand),
+			expectedConfig,
+			expect.objectContaining({ getIdFromUser: expect.any(Function) }),
+		)
+
+		const selectGenericListDataFunction = mockSelectFromList.mock.calls[0][2].listItems
+
+		expect(await selectGenericListDataFunction()).toStrictEqual(driverList)
+
+		const idRetrievalFunction = mockSelectFromList.mock.calls[0][2].getIdFromUser
+
+		expect(idRetrievalFunction).toBeDefined()
+		expect(await idRetrievalFunction?.({ primaryKeyName: 'primaryKeyName' } as Sorting<object>, driverList))
+			.toBe('driverId')
+
+		expect(inquirer.prompt).toBeCalledWith(
+			expect.objectContaining({
+				type: 'input',
+				message: 'Enter id or index',
+				default: 'all',
+			}),
+		)
+
+		expect(convertToId).toBeCalledWith(driverId, 'primaryKeyName', driverList)
+	})
+
+	it('uses correct source URL when "all" is specified during prompt', async () => {
+		mockSelectFromList.mockResolvedValueOnce('all')
+
+		await expect(LogCatCommand.run([])).resolves.not.toThrow()
+
+		expect(mockLiveLogClient.getLogSource).toBeCalledTimes(1)
+		expect(mockLiveLogClient.getLogSource).toBeCalledWith()
+		expect(initSourceSpy).toBeCalledWith(MOCK_SOURCE_URL)
+	})
+
+	it('throws errors from LogClient', async () => {
+		const timeoutError = new Errors.CLIError('Timeout')
+		mockGetDrivers.mockRejectedValueOnce(timeoutError)
+
+		await expect(LogCatCommand.run([])).rejects.toThrow(timeoutError)
+	})
+
+	it('handles messages with correct event formatter', async () => {
+		await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+
+		const onmessage = sourceSpy.mock.results[0].value.onmessage
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		const liveLogMessage = JSON.stringify({ log_level: 100 })
+		const messageEvent = { data: liveLogMessage }
+		parseEventSpy.mockReturnValueOnce(JSON.parse(liveLogMessage))
+
+		onmessage(messageEvent)
+
+		expect(logEvent).toBeCalledTimes(1)
+		expect(logEvent).toBeCalledWith(messageEvent, liveLogMessageFormatter)
+	})
+
+	it('accepts log-level flag to only log important events', async () => {
+		const MED_LEVEL = 'info' // LogLevel.INFO == 300
+
+		/* eslint-disable @typescript-eslint/naming-convention */
+		const lowLiveLogMessage = JSON.stringify({ log_level: 200 })
+		const highLiveLogMessage = JSON.stringify({ log_level: 400 })
+		/* eslint-enable @typescript-eslint/naming-convention */
+
+		const lowMessageEvent = { data: lowLiveLogMessage }
+		const highMessageEvent = { data: highLiveLogMessage }
+
+		await expect(LogCatCommand.run([`--log-level=${MED_LEVEL}`, '--all'])).resolves.not.toThrow()
+
+		const onmessage = sourceSpy.mock.results[0].value.onmessage
+		parseEventSpy
+			.mockReturnValueOnce(JSON.parse(lowLiveLogMessage))
+			.mockReturnValueOnce(JSON.parse(highLiveLogMessage))
+
+		onmessage(lowMessageEvent)
+		onmessage(highMessageEvent)
+
+		expect(logEvent).toBeCalledTimes(1)
+		expect(logEvent).toBeCalledWith(highMessageEvent, liveLogMessageFormatter)
+	})
+
+	it('defaults to logging all events if log-level flag not valid value', async () => {
+		const BAD_LOG_LEVEL = 'invalid'
+
+		/* eslint-disable @typescript-eslint/naming-convention */
+		const lowLiveLogMessage = JSON.stringify({ log_level: 200 })
+		const highLiveLogMessage = JSON.stringify({ log_level: 400 })
+		/* eslint-enable @typescript-eslint/naming-convention */
+
+		const lowMessageEvent = { data: lowLiveLogMessage }
+		const highMessageEvent = { data: highLiveLogMessage }
+
+		await expect(LogCatCommand.run([`--log-level=${BAD_LOG_LEVEL}`, '--all'])).resolves.not.toThrow()
+
+		const onmessage = sourceSpy.mock.results[0].value.onmessage
+		parseEventSpy
+			.mockReturnValueOnce(JSON.parse(lowLiveLogMessage))
+			.mockReturnValueOnce(JSON.parse(highLiveLogMessage))
+
+		onmessage(lowMessageEvent)
+		onmessage(highMessageEvent)
+
+		expect(logEvent).toBeCalledTimes(2)
+		expect(logEvent).toBeCalledWith(lowMessageEvent, liveLogMessageFormatter)
+		expect(logEvent).toBeCalledWith(highMessageEvent, liveLogMessageFormatter)
+		expect(warnSpy).toBeCalledWith(`${BAD_LOG_LEVEL} is not a valid log-level. Logging all events.`)
+	})
+
+	describe('eventsource onerror handler', () => {
+		type EventSourceError = MessageEvent & Partial<{ status: number; message: string }>
+
+		it('calls teardown on sse command', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+			const onerror = sourceSpy.mock.results[0].value.onerror
+
+			onerror({} as MessageEvent)
+
+			expect(teardownSpy).toBeCalled()
+		})
+
+		it('calls command error if status is 401, 403', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+			const onerror = sourceSpy.mock.results[0].value.onerror
+
+			onerror({ status: 401 } as EventSourceError)
+
+			expect(errorSpy).toBeCalledWith(expect.stringContaining('Unauthorized'))
+
+			errorSpy.mockClear()
+			onerror({ status: 403 } as EventSourceError)
+
+			expect(errorSpy).toBeCalledWith(expect.stringContaining('Unauthorized'))
+		})
+
+		it('calls handleConnectionErrors if message is defined', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+			const onerror = sourceSpy.mock.results[0].value.onerror
+
+			onerror({ message: 'something failed' } as EventSourceError)
+
+			expect(handleConnectionErrors).toBeCalledWith(MOCK_HOSTNAME, 'something failed')
+		})
+
+		it('calls command error with generic message if unable to handle', async () => {
+			await expect(LogCatCommand.run([`--hub-address=${MOCK_IPV4}`, '--all'])).resolves.not.toThrow()
+			const onerror = sourceSpy.mock.results[0].value.onerror
+
+			onerror({} as EventSourceError)
+
+			expect(errorSpy).toBeCalledWith(expect.stringContaining('Unexpected error'))
+		})
+	})
+
+	it('throws errors from parseIpAndPort', async () => {
+		const invalidError = new Errors.CLIError('Invalid IPv4 address format.')
+		mockParseIpAndPort.mockImplementationOnce(() => {
+			throw invalidError
+		})
+
+		await expect(LogCatCommand.run([])).rejects.toThrow(invalidError)
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/package.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/package.test.ts
new file mode 100644
index 000000000..824196667
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/package.test.ts
@@ -0,0 +1,312 @@
+import fs from 'fs'
+
+import JSZip from 'jszip'
+
+import { ChannelsEndpoint, DriverChannelDetails, DriversEndpoint, EdgeDriver, HubdevicesEndpoint }
+	from '@smartthings/core-sdk'
+
+import { outputItem, readFile } from '@smartthings/cli-lib'
+
+import PackageCommand from '../../../../commands/edge/drivers/package'
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+import { chooseHub } from '../../../../lib/commands/drivers-util'
+import { buildTestFileMatchers, processConfigFile, processFingerprintsFile, processProfiles,
+	processSrcDir, resolveProjectDirName } from '../../../../lib/commands/drivers/package-util'
+
+
+jest.mock('fs', () => {
+	// if this isn't done, something breaks with sub-dependency 'fs-extra'
+	const originalLib = jest.requireActual('fs')
+
+	return {
+		...originalLib,
+		createWriteStream: jest.fn(),
+		promises: {
+			readFile: jest.fn(() => {
+				const error: NodeJS.ErrnoException = new Error()
+				error.code = 'ENOENT'
+				throw error
+			}),
+			writeFile: jest.fn(),
+		},
+	}
+})
+jest.mock('jszip')
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		outputItem: jest.fn(),
+		readFile: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/channels-util')
+jest.mock('../../../../../src/lib/commands/drivers-util')
+jest.mock('../../../../../src/lib/commands/drivers/package-util')
+
+describe('PackageCommand', () => {
+	const zipContents = {} as Uint8Array
+	const jsZipMock = jest.mocked(JSZip)
+	const pipeMock = jest.fn()
+	const readableStream = {
+		pipe: pipeMock,
+	} as unknown as NodeJS.ReadableStream
+	const generateNodeStreamMock = jest.fn().mockReturnValue(readableStream)
+	const generateAsyncMock = jest.fn().mockReturnValue(zipContents)
+	const mockJSZip = {
+		generateNodeStream: generateNodeStreamMock,
+		generateAsync: generateAsyncMock,
+	} as unknown as JSZip
+
+	const resolveProjectDirNameMock = jest.mocked(resolveProjectDirName)
+	const processConfigFileMock = jest.mocked(processConfigFile)
+	const processFingerprintsFileMock = jest.mocked(processFingerprintsFile)
+	const buildTestFileMatchersMock = jest.mocked(buildTestFileMatchers)
+	const processSrcDirMock = jest.mocked(processSrcDir)
+	const processProfilesMock = jest.mocked(processProfiles)
+
+	const driver = { driverId: 'driver id', version: 'driver version' } as EdgeDriver
+	const outputItemMock = jest.mocked(outputItem)
+		.mockImplementation(async (_command, _config, actionFunction): Promise<EdgeDriver> => {
+			await actionFunction()
+			return Promise.resolve(driver)
+		})
+	const uploadSpy = jest.spyOn(DriversEndpoint.prototype, 'upload').mockResolvedValue(driver)
+
+	const chooseChannelMock = jest.mocked(chooseChannel)
+		.mockResolvedValue('channel id')
+	const assignDriverSpy = jest.spyOn(ChannelsEndpoint.prototype, 'assignDriver')
+		.mockResolvedValue({} as DriverChannelDetails)
+
+	const chooseHubSpy = jest.mocked(chooseHub).mockResolvedValue('hub id')
+	const installDriverSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'installDriver').mockResolvedValue()
+
+	const logSpy = jest.spyOn(PackageCommand.prototype, 'log').mockImplementation()
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	const mockProjectDirectoryProcessing = (): void => {
+		resolveProjectDirNameMock.mockResolvedValueOnce('project dir')
+		jsZipMock.mockReturnValueOnce(mockJSZip)
+		processConfigFileMock.mockResolvedValueOnce({})
+		processFingerprintsFileMock.mockImplementation()
+		buildTestFileMatchersMock.mockReturnValueOnce([])
+		processSrcDirMock.mockResolvedValue(true)
+		processProfilesMock.mockImplementation()
+	}
+	const expectProjectDirectoryProcessing = (): void => {
+		expect(resolveProjectDirNameMock).toHaveBeenCalledTimes(1)
+		expect(resolveProjectDirNameMock).toHaveBeenCalledWith('.')
+		expect(processConfigFileMock).toHaveBeenCalledTimes(1)
+		expect(processConfigFileMock).toHaveBeenCalledWith('project dir', mockJSZip)
+		expect(processFingerprintsFileMock).toHaveBeenCalledTimes(1)
+		expect(processFingerprintsFileMock).toHaveBeenCalledWith('project dir', mockJSZip)
+		expect(buildTestFileMatchersMock).toHaveBeenCalledTimes(1)
+		expect(buildTestFileMatchersMock).toHaveBeenCalledWith(['test/**', 'tests/**'])
+		expect(processSrcDirMock).toHaveBeenCalledTimes(1)
+		expect(processSrcDirMock).toHaveBeenCalledWith('project dir', mockJSZip, [])
+		expect(processProfilesMock).toHaveBeenCalledTimes(1)
+		expect(processProfilesMock).toHaveBeenCalledWith('project dir', mockJSZip)
+	}
+
+	it('generates zip file with --build-only', async () => {
+		const writeStreamOnMock = jest.fn()
+		const writeStreamMock: fs.WriteStream = {
+			on: writeStreamOnMock,
+		} as unknown as fs.WriteStream
+		const createWriteStreamMock = jest.mocked(fs.createWriteStream)
+
+		mockProjectDirectoryProcessing()
+		createWriteStreamMock.mockReturnValueOnce(writeStreamMock)
+		pipeMock.mockReturnValueOnce(writeStreamMock)
+		writeStreamOnMock.mockImplementationOnce((_event, action): void => {
+			action()
+		})
+
+		await expect(PackageCommand.run(['--build-only', 'driver.zip'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateNodeStreamMock).toHaveBeenCalledTimes(1)
+		expect(generateNodeStreamMock)
+			.toHaveBeenCalledWith({ type: 'nodebuffer', streamFiles: true, compression: 'DEFLATE' })
+		expect(createWriteStreamMock).toHaveBeenCalledTimes(1)
+		expect(createWriteStreamMock).toHaveBeenCalledWith('driver.zip')
+		expect(pipeMock).toHaveBeenCalledTimes(1)
+		expect(pipeMock).toHaveBeenCalledWith(writeStreamMock)
+		expect(writeStreamOnMock).toHaveBeenCalledTimes(1)
+		expect(writeStreamOnMock).toHaveBeenCalledWith('finish', expect.any(Function))
+		expect(outputItemMock).toHaveBeenCalledTimes(0)
+		expect(logSpy).toHaveBeenCalledWith('wrote driver.zip')
+		expect(uploadSpy).toHaveBeenCalledTimes(0)
+	})
+
+	it('uploads pre-built zip file', async () => {
+		const archiveData = {} as unknown as Buffer
+		const readFileMock = jest.mocked(readFile)
+			.mockResolvedValueOnce(archiveData)
+
+		await expect(PackageCommand.run(['--upload', 'driver.zip'])).resolves.not.toThrow()
+
+		expect(readFileMock).toHaveBeenCalledTimes(1)
+		expect(readFileMock).toHaveBeenCalledWith('driver.zip')
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(archiveData)
+		expect(chooseChannelMock).toHaveBeenCalledTimes(0)
+		expect(assignDriverSpy).toHaveBeenCalledTimes(0)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(0)
+		expect(installDriverSpy).toHaveBeenCalledTimes(0)
+	})
+
+	it('displays error message when zip file missing', async () => {
+		const readFileMock = jest.mocked(readFile)
+			.mockImplementationOnce(() => { throw { code: 'ENOENT' } })
+
+		await expect(PackageCommand.run(['--upload', 'driver.zip'])).resolves.not.toThrow()
+
+		expect(readFileMock).toHaveBeenCalledTimes(1)
+		expect(readFileMock).toHaveBeenCalledWith('driver.zip')
+		expect(outputItemMock).toHaveBeenCalledTimes(0)
+		expect(logSpy).toHaveBeenCalledWith('No file named "driver.zip" found.')
+	})
+
+	it('throws unexpected error when zipping file', async () => {
+		const readFileMock = jest.mocked(readFile)
+			.mockImplementationOnce(() => { throw Error('failure') })
+
+		await expect(PackageCommand.run(['--upload', 'driver.zip'])).rejects.toThrow(Error('failure'))
+
+		expect(readFileMock).toHaveBeenCalledTimes(1)
+		expect(readFileMock).toHaveBeenCalledWith('driver.zip')
+		expect(outputItemMock).toHaveBeenCalledTimes(0)
+	})
+
+	it('generates and uploads', async () => {
+		mockProjectDirectoryProcessing()
+
+		await expect(PackageCommand.run(['--token', 'bearer-token'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateAsyncMock).toHaveBeenCalledTimes(1)
+		expect(generateAsyncMock).toHaveBeenCalledWith({ type: 'uint8array', compression: 'DEFLATE' })
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(zipContents)
+		expect(chooseChannelMock).toHaveBeenCalledTimes(0)
+		expect(assignDriverSpy).toHaveBeenCalledTimes(0)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(0)
+		expect(installDriverSpy).toHaveBeenCalledTimes(0)
+	})
+
+	it('assigns when --assign specified', async () => {
+		mockProjectDirectoryProcessing()
+
+		await expect(PackageCommand.run(['--assign'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateAsyncMock).toHaveBeenCalledTimes(1)
+		expect(generateAsyncMock).toHaveBeenCalledWith({ type: 'uint8array', compression: 'DEFLATE' })
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a channel for the driver.',
+				undefined, { useConfigDefault: true })
+		expect(assignDriverSpy).toHaveBeenCalledTimes(1)
+		expect(assignDriverSpy)
+			.toHaveBeenCalledWith('channel id', 'driver id', 'driver version')
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(zipContents)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(0)
+		expect(installDriverSpy).toHaveBeenCalledTimes(0)
+	})
+
+	it('assigns when channel specified', async () => {
+		mockProjectDirectoryProcessing()
+
+		await expect(PackageCommand.run(['--channel', 'channel id arg'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateAsyncMock).toHaveBeenCalledTimes(1)
+		expect(generateAsyncMock).toHaveBeenCalledWith({ type: 'uint8array', compression: 'DEFLATE' })
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a channel for the driver.',
+				'channel id arg', { useConfigDefault: true })
+		expect(assignDriverSpy).toHaveBeenCalledTimes(1)
+		expect(assignDriverSpy)
+			.toHaveBeenCalledWith('channel id', 'driver id', 'driver version')
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(zipContents)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(0)
+		expect(installDriverSpy).toHaveBeenCalledTimes(0)
+	})
+
+	it('installs when --install specified', async () => {
+		mockProjectDirectoryProcessing()
+
+		await expect(PackageCommand.run(['--install'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateAsyncMock).toHaveBeenCalledTimes(1)
+		expect(generateAsyncMock).toHaveBeenCalledWith({ type: 'uint8array', compression: 'DEFLATE' })
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a channel for the driver.',
+				undefined, { useConfigDefault: true })
+		expect(assignDriverSpy).toHaveBeenCalledTimes(1)
+		expect(assignDriverSpy)
+			.toHaveBeenCalledWith('channel id', 'driver id', 'driver version')
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(zipContents)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(1)
+		expect(chooseHubSpy)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a hub to install to.',
+				undefined, { useConfigDefault: true })
+		expect(installDriverSpy).toHaveBeenCalledTimes(1)
+		expect(installDriverSpy).toHaveBeenCalledWith('driver id', 'hub id', 'channel id')
+	})
+
+	it('installs when hub specified', async () => {
+		mockProjectDirectoryProcessing()
+
+		await expect(PackageCommand.run(['--hub', 'hub id arg'])).resolves.not.toThrow()
+
+		expectProjectDirectoryProcessing()
+		expect(generateAsyncMock).toHaveBeenCalledTimes(1)
+		expect(generateAsyncMock).toHaveBeenCalledWith({ type: 'uint8array', compression: 'DEFLATE' })
+		expect(outputItemMock).toHaveBeenCalledTimes(1)
+		expect(outputItemMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), expect.anything(), expect.any(Function))
+		expect(chooseChannelMock).toHaveBeenCalledTimes(1)
+		expect(chooseChannelMock)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a channel for the driver.',
+				undefined, { useConfigDefault: true })
+		expect(assignDriverSpy).toHaveBeenCalledTimes(1)
+		expect(assignDriverSpy)
+			.toHaveBeenCalledWith('channel id', 'driver id', 'driver version')
+		expect(uploadSpy).toHaveBeenCalledTimes(1)
+		expect(uploadSpy).toHaveBeenCalledWith(zipContents)
+		expect(chooseHubSpy).toHaveBeenCalledTimes(1)
+		expect(chooseHubSpy)
+			.toHaveBeenCalledWith(expect.any(PackageCommand), 'Select a hub to install to.',
+				'hub id arg', { useConfigDefault: true })
+		expect(installDriverSpy).toHaveBeenCalledTimes(1)
+		expect(installDriverSpy).toHaveBeenCalledWith('driver id', 'hub id', 'channel id')
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/switch.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/switch.test.ts
new file mode 100644
index 000000000..29b73c85d
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/switch.test.ts
@@ -0,0 +1,150 @@
+import { Device, DeviceIntegrationType, HubdevicesEndpoint, SmartThingsClient } from '@smartthings/core-sdk'
+
+import { chooseDevice } from '@smartthings/cli-lib'
+
+import DriversSwitchCommand from '../../../../commands/edge/drivers/switch'
+import { chooseDriver, chooseHub, listAllAvailableDrivers, listMatchingDrivers }
+	from '../../../../lib/commands/drivers-util'
+
+
+const edgeDeviceIntegrationTypes = [
+	DeviceIntegrationType.LAN,
+	DeviceIntegrationType.MATTER,
+	DeviceIntegrationType.ZIGBEE,
+	DeviceIntegrationType.ZWAVE,
+]
+
+jest.mock('@smartthings/cli-lib', () => {
+	const originalLib = jest.requireActual('@smartthings/cli-lib')
+
+	return {
+		...originalLib,
+		chooseDevice: jest.fn(),
+	}
+})
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+describe('DriversSwitchCommand', () => {
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	const changeDriverSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'switchDriver').mockImplementation()
+	const chooseHubMock = jest.mocked(chooseHub).mockResolvedValue('chosen-hub-id')
+	const chooseDeviceMock = jest.mocked(chooseDevice).mockResolvedValue('chosen-device-id')
+	const chooseDriverMock = jest.mocked(chooseDriver).mockResolvedValue('chosen-driver-id')
+
+	it('calls changeDriver', async () => {
+		await expect(DriversSwitchCommand.run([
+			'--hub', 'arg-hub-id',
+			'--driver', 'arg-driver-id',
+			'arg-device-id',
+		])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversSwitchCommand),
+			'Which hub is the device connected to?', 'arg-hub-id',
+			{ useConfigDefault: true })
+
+		expect(chooseDeviceMock).toHaveBeenCalledTimes(1)
+		expect(chooseDeviceMock).toHaveBeenCalledWith(
+			expect.any(DriversSwitchCommand),
+			'arg-device-id',
+			expect.objectContaining({
+				deviceListOptions: expect.objectContaining({
+					type: edgeDeviceIntegrationTypes }),
+				deviceListFilter: expect.any(Function) },
+			),
+		)
+
+		expect(chooseDriverMock).toHaveBeenCalledTimes(1)
+		expect(chooseDriverMock).toHaveBeenCalledWith(
+			expect.any(DriversSwitchCommand),
+			'Choose a driver to use.',
+			'arg-driver-id',
+			expect.objectContaining({ listItems: expect.any(Function) }),
+		)
+
+		expect(changeDriverSpy).toHaveBeenCalledTimes(1)
+		expect(changeDriverSpy).toHaveBeenCalledWith('chosen-driver-id', 'chosen-hub-id', 'chosen-device-id')
+	})
+
+	describe('deviceFilter', () => {
+		it.each(edgeDeviceIntegrationTypes)('includes %s devices on specified hub', async (deviceIntegrationType) => {
+			await expect(DriversSwitchCommand.run([])).resolves.not.toThrow()
+
+			const deviceListFilter = chooseDeviceMock.mock.calls[0][2]?.deviceListFilter
+			expect(deviceListFilter).toBeDefined()
+
+			const device = {
+				type: deviceIntegrationType,
+				[deviceIntegrationType.toString().toLowerCase()]: { hubId: 'chosen-hub-id' },
+			} as unknown as Device
+			expect(deviceListFilter?.(device, 0, [])).toBe(true)
+		})
+
+		it('rejects non-edge devices', async () => {
+			await expect(DriversSwitchCommand.run([])).resolves.not.toThrow()
+
+			const deviceListFilter = chooseDeviceMock.mock.calls[0][2]?.deviceListFilter
+			expect(deviceListFilter).toBeDefined()
+
+			const device = {
+				type: DeviceIntegrationType.ENDPOINT_APP,
+				app: { hubId: 'chosen-hub-id' },
+			} as unknown as Device
+			expect(deviceListFilter?.(device, 0, [])).toBe(false)
+		})
+
+		it('rejects edge devices on different hub', async () => {
+			await expect(DriversSwitchCommand.run([])).resolves.not.toThrow()
+
+			const deviceListFilter = chooseDeviceMock.mock.calls[0][2]?.deviceListFilter
+			expect(deviceListFilter).toBeDefined()
+
+			const device = {
+				type: DeviceIntegrationType.ZIGBEE,
+				zigbee: { hubId: 'other-hub-id' },
+			} as unknown as Device
+			expect(deviceListFilter?.(device, 0, [])).toBe(false)
+		})
+	})
+
+	describe('listItems', () => {
+		const matchingDriver = { driverId: 'matching-driver-id', name: 'Matching Driver' }
+		const matchingDrivers = [matchingDriver]
+		const listMatchingDriversMock = jest.mocked(listMatchingDrivers)
+			.mockResolvedValue(matchingDrivers)
+		const otherDriver = { driverId: 'other-driver-id', name: 'Other Driver' }
+		const allDrivers = [matchingDriver, otherDriver]
+		const listAllAvailableDriversMock = jest.mocked(listAllAvailableDrivers)
+			.mockResolvedValue(allDrivers)
+		it('uses listMatchingDrivers normally', async () => {
+			await expect(DriversSwitchCommand.run([])).resolves.not.toThrow()
+
+			const listItems = chooseDriverMock.mock.calls[0][3]?.listItems
+			expect(listItems).toBeDefined()
+			expect(await listItems?.()).toStrictEqual(matchingDrivers)
+
+			expect(listMatchingDriversMock).toHaveBeenCalledTimes(1)
+			expect(listMatchingDriversMock).toHaveBeenCalledWith(
+				expect.any(SmartThingsClient),
+				'chosen-device-id', 'chosen-hub-id')
+			expect(listAllAvailableDriversMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('lists all drivers when requested', async () => {
+			await expect(DriversSwitchCommand.run(['--include-non-matching'])).resolves.not.toThrow()
+
+			const listItems = chooseDriverMock.mock.calls[0][3]?.listItems
+			expect(listItems).toBeDefined()
+			expect(await listItems?.()).toStrictEqual(allDrivers)
+
+			expect(listMatchingDriversMock).toHaveBeenCalledTimes(0)
+			expect(listAllAvailableDriversMock).toHaveBeenCalledTimes(1)
+			expect(listAllAvailableDriversMock).toHaveBeenCalledWith(
+				expect.any(SmartThingsClient),
+				'chosen-device-id', 'chosen-hub-id')
+		})
+	})
+})
diff --git a/packages/edge/src/__tests__/commands/edge/drivers/uninstall.test.ts b/packages/edge/src/__tests__/commands/edge/drivers/uninstall.test.ts
new file mode 100644
index 000000000..bbbbd7e66
--- /dev/null
+++ b/packages/edge/src/__tests__/commands/edge/drivers/uninstall.test.ts
@@ -0,0 +1,33 @@
+import { HubdevicesEndpoint } from '@smartthings/core-sdk'
+
+import DriversUninstallCommand from '../../../../commands/edge/drivers/uninstall'
+import { chooseHub, chooseInstalledDriver } from '../../../../lib/commands/drivers-util'
+
+
+jest.mock('../../../../../src/lib/commands/drivers-util')
+
+// ignore console output
+jest.spyOn(process.stdout, 'write').mockImplementation(() => true)
+
+describe('DriversUninstallCommand', () => {
+	const chooseHubMock = jest.mocked(chooseHub)
+	const chooseInstalledDriverMock = jest.mocked(chooseInstalledDriver)
+	const apiUninstallDriverSpy = jest.spyOn(HubdevicesEndpoint.prototype, 'uninstallDriver')
+
+	it('prompts user with list of installed drivers', async () => {
+		chooseHubMock.mockResolvedValue('chosen-hub-id')
+		chooseInstalledDriverMock.mockResolvedValueOnce('chosen-driver-id')
+		apiUninstallDriverSpy.mockImplementationOnce(() => Promise.resolve())
+
+		await expect(DriversUninstallCommand.run([])).resolves.not.toThrow()
+
+		expect(chooseHubMock).toHaveBeenCalledTimes(1)
+		expect(chooseHubMock).toHaveBeenCalledWith(expect.any(DriversUninstallCommand),
+			'Select a hub to uninstall from.', undefined, { useConfigDefault: true })
+		expect(chooseInstalledDriver).toHaveBeenCalledTimes(1)
+		expect(chooseInstalledDriver).toHaveBeenCalledWith( expect.any(DriversUninstallCommand),
+			'chosen-hub-id', 'Select a driver to uninstall.', undefined)
+		expect(apiUninstallDriverSpy).toHaveBeenCalledTimes(1)
+		expect(apiUninstallDriverSpy).toHaveBeenCalledWith('chosen-driver-id', 'chosen-hub-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/file-util.test.ts b/packages/edge/src/__tests__/file-util.test.ts
new file mode 100644
index 000000000..957a4b2e1
--- /dev/null
+++ b/packages/edge/src/__tests__/file-util.test.ts
@@ -0,0 +1,236 @@
+import fs from 'fs'
+
+import { Errors } from '@oclif/core'
+import yaml from 'js-yaml'
+
+import { fileExists, findYAMLFilename, isDir, isFile, readYAMLFile, requireDir, YAMLFileData }
+	from '../lib/file-util'
+import * as fileUtil from '../lib/file-util'
+
+
+jest.mock('fs', () => {
+	// if this isn't done, something breaks with sub-dependency 'fs-extra'
+	const originalLib = jest.requireActual('fs')
+
+	return {
+		...originalLib,
+		readFileSync: jest.fn(),
+		promises: {
+			stat: jest.fn(),
+		},
+	}
+})
+jest.mock('js-yaml')
+
+describe('file-util', () => {
+	const statMock = jest.mocked(fs.promises.stat)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	describe('fileExists', () => {
+		it('returns true when file exists', async () => {
+			statMock.mockResolvedValue({} as fs.Stats)
+
+			expect(await fileExists('file-path')).toBe(true)
+
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('file-path')
+		})
+
+		it('returns false when file does not exist', async () => {
+			statMock.mockRejectedValueOnce({ code: 'ENOENT' })
+
+			expect(await fileExists('file-path')).toBe(false)
+
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('file-path')
+		})
+
+		it('passes on unexpected exceptions', async () => {
+			statMock.mockRejectedValueOnce(Error('unexpected-error'))
+
+			await expect(fileExists('file-path')).rejects.toThrow('unexpected-error')
+
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('file-path')
+		})
+	})
+
+	const fileExistsSpy = jest.spyOn(fileUtil, 'fileExists')
+
+	describe('isFile', () => {
+		it('returns false if does not exist', async () => {
+			fileExistsSpy.mockResolvedValue(false)
+
+			expect(await isFile('non-existent.stl')).toBe(false)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('non-existent.stl')
+			expect(statMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('returns false if exists but is not a file', async () => {
+			fileExistsSpy.mockResolvedValue(true)
+			const statsIsFileMock = jest.fn().mockReturnValue(false)
+			statMock.mockResolvedValue({ isFile: statsIsFileMock } as unknown as fs.Stats)
+
+			expect(await isFile('directory')).toBe(false)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('directory')
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('directory')
+			expect(statsIsFileMock).toHaveBeenCalledTimes(1)
+			expect(statsIsFileMock).toHaveBeenCalledWith()
+		})
+
+		it('returns true if exists and is a file', async () => {
+			fileExistsSpy.mockResolvedValue(true)
+			const statsIsFileMock = jest.fn().mockReturnValue(true)
+			statMock.mockResolvedValue({ isFile: statsIsFileMock } as unknown as fs.Stats)
+
+			expect(await isFile('file')).toBe(true)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('file')
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('file')
+			expect(statsIsFileMock).toHaveBeenCalledTimes(1)
+			expect(statsIsFileMock).toHaveBeenCalledWith()
+		})
+	})
+
+	describe('isDir', () => {
+		it('returns false if does not exist', async () => {
+			fileExistsSpy.mockResolvedValue(false)
+
+			expect(await isDir('non-existent')).toBe(false)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('non-existent')
+			expect(statMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('returns false if exists but is not a directory', async () => {
+			fileExistsSpy.mockResolvedValue(true)
+			const statsIsDirectoryMock = jest.fn().mockReturnValue(false)
+			statMock.mockResolvedValue({ isDirectory: statsIsDirectoryMock } as unknown as fs.Stats)
+
+			expect(await isDir('file')).toBe(false)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('file')
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('file')
+		})
+
+		it('returns true if exists and is a directory', async () => {
+			fileExistsSpy.mockResolvedValue(true)
+			const statsIsDirectoryMock = jest.fn().mockReturnValue(true)
+			statMock.mockResolvedValue({ isDirectory: statsIsDirectoryMock } as unknown as fs.Stats)
+
+			expect(await isDir('directory')).toBe(true)
+
+			expect(fileExistsSpy).toHaveBeenCalledTimes(1)
+			expect(fileExistsSpy).toHaveBeenCalledWith('directory')
+			expect(statMock).toHaveBeenCalledTimes(1)
+			expect(statMock).toHaveBeenCalledWith('directory')
+		})
+	})
+
+	const isFileSpy = jest.spyOn(fileUtil, 'isFile')
+
+	describe('findYAMLFilename', () => {
+		it('returns filename with yaml extension if that is found', async () => {
+			isFileSpy.mockResolvedValueOnce(true)
+
+			expect(await findYAMLFilename('filename')).toBe('filename.yaml')
+
+			expect(isFileSpy).toBeCalledTimes(1)
+			expect(isFileSpy).toBeCalledWith('filename.yaml')
+		})
+
+		it('returns filename with yml extension if that is found', async () => {
+			isFileSpy.mockResolvedValueOnce(false)
+			isFileSpy.mockResolvedValueOnce(true)
+
+			expect(await findYAMLFilename('filename')).toBe('filename.yml')
+
+			expect(isFileSpy).toBeCalledTimes(2)
+			expect(isFileSpy).toBeCalledWith('filename.yaml')
+			expect(isFileSpy).toBeCalledWith('filename.yml')
+		})
+
+		it('returns false when no matching file found', async () => {
+			isFileSpy.mockResolvedValue(false)
+
+			expect(await findYAMLFilename('filename')).toBe(false)
+
+			expect(isFileSpy).toBeCalledTimes(2)
+			expect(isFileSpy).toBeCalledWith('filename.yaml')
+			expect(isFileSpy).toBeCalledWith('filename.yml')
+		})
+	})
+
+	const isDirSpy = jest.spyOn(fileUtil, 'isDir')
+
+	describe('requireDir', () => {
+		it('returns directory when it exists and is a directory', async () => {
+			isDirSpy.mockResolvedValue(true)
+
+			expect(await requireDir('my-dir')).toBe('my-dir')
+
+			expect(isDirSpy).toBeCalledTimes(1)
+			expect(isDirSpy).toBeCalledWith('my-dir')
+		})
+
+		it('throws exception when directory does not exist', async () => {
+			isDirSpy.mockResolvedValue(false)
+
+			await expect(requireDir('not-a-dir')).rejects.toThrow('missing required directory: not-a-dir')
+		})
+	})
+
+	describe('readYAMLFile', () => {
+		const readFileSyncMock = jest.mocked(fs.readFileSync)
+		const yamlLoadMock = jest.mocked(yaml.load)
+
+		it('returns processed file', () => {
+			const yamlFile: YAMLFileData = { key: 'value' }
+			readFileSyncMock.mockReturnValueOnce('file contents')
+			yamlLoadMock.mockReturnValueOnce(yamlFile)
+
+			expect(readYAMLFile('filename')).toBe(yamlFile)
+
+			expect(readFileSyncMock).toHaveBeenCalledTimes(1)
+			expect(readFileSyncMock).toHaveBeenCalledWith('filename', 'utf-8')
+			expect(yamlLoadMock).toHaveBeenCalledTimes(1)
+			expect(yamlLoadMock).toHaveBeenCalledWith('file contents')
+		})
+
+		it('passes error message into user-facing error', () => {
+			readFileSyncMock.mockImplementation(() => { throw Error('read failure') })
+
+			expect(() => readYAMLFile('filename'))
+				.toThrow(new Errors.CLIError('error "read failure" reading filename'))
+
+			expect(readFileSyncMock).toHaveBeenCalledTimes(1)
+			expect(readFileSyncMock).toHaveBeenCalledWith('filename', 'utf-8')
+		})
+
+		it.each`
+			invalidYaml | errorMessage
+			${{}}       | ${'error "invalid file" reading filename'}
+			${null}     | ${'error "empty file" reading filename'}
+			${''}       | ${'error "invalid file" reading filename'}
+			${0}        | ${'error "invalid file" reading filename'}
+		`('throws $errorMessage when reading $invalidYaml', ({ invalidYaml, errorMessage }) => {
+			readFileSyncMock.mockReturnValueOnce('file contents')
+			yamlLoadMock.mockReturnValueOnce(invalidYaml)
+
+			expect(() => readYAMLFile('filename')).toThrow(new Errors.CLIError(errorMessage))
+		})
+	})
+})
diff --git a/packages/edge/src/__tests__/lib/commands/channels-util.test.ts b/packages/edge/src/__tests__/lib/commands/channels-util.test.ts
new file mode 100644
index 000000000..3c1430296
--- /dev/null
+++ b/packages/edge/src/__tests__/lib/commands/channels-util.test.ts
@@ -0,0 +1,217 @@
+import { Channel, OrganizationResponse, SmartThingsClient } from '@smartthings/core-sdk'
+
+import { APICommand, ChooseOptions, chooseOptionsWithDefaults, forAllOrganizations, selectFromList,
+	stringTranslateToId } from '@smartthings/cli-lib'
+
+import { chooseChannel, listChannels, ChooseChannelOptions, chooseChannelOptionsWithDefaults }
+	from '../../../lib/commands/channels-util'
+import * as channelsUtil from '../../../lib/commands/channels-util'
+
+
+jest.mock('@smartthings/cli-lib', () => ({
+	...jest.requireActual('@smartthings/cli-lib'),
+	chooseOptionsWithDefaults: jest.fn(),
+	stringTranslateToId: jest.fn(),
+	selectFromList: jest.fn(),
+	forAllOrganizations: jest.fn(),
+}))
+
+
+describe('channels-util', () => {
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	describe('chooseChannelOptionsWithDefaults', () => {
+		const chooseOptionsWithDefaultsMock = jest.mocked(chooseOptionsWithDefaults)
+
+		it('has a reasonable default', () => {
+			chooseOptionsWithDefaultsMock.mockReturnValue({} as unknown as ChooseOptions)
+
+			expect(chooseChannelOptionsWithDefaults())
+				.toEqual(expect.objectContaining({ includeReadOnly: false }))
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledWith(undefined)
+		})
+
+		it('accepts true value', () => {
+			chooseOptionsWithDefaultsMock.mockReturnValue({ includeReadOnly: true } as unknown as ChooseOptions)
+
+			expect(chooseChannelOptionsWithDefaults({ includeReadOnly: true }))
+				.toEqual(expect.objectContaining({ includeReadOnly: true }))
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledWith({ includeReadOnly: true })
+		})
+	})
+
+	describe('chooseChannel', () => {
+		const selectFromListMock = jest.mocked(selectFromList)
+
+		const listChannelsMock = jest.fn()
+		const client = { channels: { list: listChannelsMock } }
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		const flags = { 'all-organizations': false, 'include-read-only': false }
+		const command = { client, flags } as unknown as APICommand<typeof APICommand.flags>
+
+		const chooseChannelOptionsWithDefaultsSpy = jest.spyOn(channelsUtil, 'chooseChannelOptionsWithDefaults')
+		const stringTranslateToIdMock = jest.mocked(stringTranslateToId)
+
+		it('uses default channel if specified', async () => {
+			chooseChannelOptionsWithDefaultsSpy.mockReturnValueOnce(
+				{ allowIndex: false, useConfigDefault: true } as ChooseChannelOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-channel-id')
+
+			expect(await chooseChannel(command, 'prompt message', undefined, { useConfigDefault: true }))
+				.toBe('chosen-channel-id')
+
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledTimes(1)
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledWith({ useConfigDefault: true })
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'channelId', sortKeyName: 'name' }),
+				expect.objectContaining({ configKeyForDefaultValue: 'defaultChannel',
+					promptMessage: 'prompt message' }))
+		})
+
+		it('translates id from index if allowed', async () => {
+			chooseChannelOptionsWithDefaultsSpy.mockReturnValueOnce(
+				{ allowIndex: true } as ChooseChannelOptions)
+			stringTranslateToIdMock.mockResolvedValueOnce('translated-id')
+			selectFromListMock.mockImplementation(async () => 'chosen-channel-id')
+
+			expect(await chooseChannel(command, 'prompt message', 'command-line-channel-id',
+				{ allowIndex: true })).toBe('chosen-channel-id')
+
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledTimes(1)
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledWith({ allowIndex: true })
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(1)
+			expect(stringTranslateToIdMock).toHaveBeenCalledWith(
+				expect.objectContaining({ primaryKeyName: 'channelId', sortKeyName: 'name' }),
+				'command-line-channel-id', expect.any(Function))
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'channelId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'translated-id' }))
+		})
+
+		it('uses list function that lists channels', async () => {
+			chooseChannelOptionsWithDefaultsSpy.mockReturnValueOnce(
+				{ allowIndex: false, includeReadOnly: false } as ChooseChannelOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-channel-id')
+
+			expect(await chooseChannel(command, 'prompt message', 'command-line-channel-id'))
+				.toBe('chosen-channel-id')
+
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledTimes(1)
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledWith(undefined)
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'channelId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-channel-id' }))
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			const list = [{ name: 'Channel' }] as Channel[]
+			listChannelsMock.mockResolvedValueOnce(list)
+
+			expect(await listItems()).toBe(list)
+
+			expect(listChannelsMock).toHaveBeenCalledTimes(1)
+			expect(listChannelsMock).toHaveBeenCalledWith({ includeReadOnly: false })
+		})
+
+		it('requests read-only channels when needed', async () => {
+			chooseChannelOptionsWithDefaultsSpy.mockReturnValueOnce(
+				{ allowIndex: false, includeReadOnly: true } as ChooseChannelOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-channel-id')
+
+			expect(await chooseChannel(command, 'prompt message', 'command-line-channel-id'))
+				.toBe('chosen-channel-id')
+
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledTimes(1)
+			expect(chooseChannelOptionsWithDefaultsSpy).toHaveBeenCalledWith(undefined)
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'channelId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-channel-id' }))
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			const list = [{ name: 'Channel' }] as Channel[]
+			listChannelsMock.mockResolvedValueOnce(list)
+
+			expect(await listItems()).toBe(list)
+
+			expect(listChannelsMock).toHaveBeenCalledTimes(1)
+			expect(listChannelsMock).toHaveBeenCalledWith({ includeReadOnly: true })
+		})
+	})
+
+	describe('listChannels', () => {
+		const apiListChannelsMock = jest.fn()
+		const client = {
+			channels: {
+				list: apiListChannelsMock,
+			},
+		} as unknown as SmartThingsClient
+
+		const result = [
+			{
+				'channelId': 'channel-id',
+				'name': 'Channel Name',
+			},
+		]
+		apiListChannelsMock.mockResolvedValue(result)
+
+		it('lists channels', async () => {
+			expect(await listChannels(client)).toBe(result)
+
+			expect(apiListChannelsMock).toHaveBeenCalledTimes(1)
+			expect(apiListChannelsMock).toHaveBeenCalledWith(expect.not.objectContaining({ includeReadOnly: true }))
+		})
+
+		it('lists channels including read-only', async () => {
+			expect(await listChannels(client, { allOrganizations: false, includeReadOnly: true })).toBe(result)
+
+			expect(apiListChannelsMock).toHaveBeenCalledTimes(1)
+			expect(apiListChannelsMock).toHaveBeenCalledWith({ includeReadOnly: true })
+		})
+
+		it('passes subscriber filters on', async () => {
+			expect(await listChannels(client, { subscriberType: 'HUB', subscriberId: 'subscriber-id', allOrganizations: false, includeReadOnly: false })).toBe(result)
+
+			expect(apiListChannelsMock).toHaveBeenCalledTimes(1)
+			expect(apiListChannelsMock).toHaveBeenCalledWith({
+				includeReadOnly: false, subscriberType: 'HUB', subscriberId: 'subscriber-id',
+			})
+		})
+
+		it('lists channels in all organizations', async () => {
+			const thisResult = [
+				{ ...result[0], organization: 'Organization One' },
+				{ ...result[0], organization: 'Organization Two' },
+			]
+			const forAllOrganizationsMock = jest.mocked(forAllOrganizations).mockResolvedValueOnce(thisResult)
+
+			expect(await listChannels(client, { allOrganizations: true, includeReadOnly: false })).toStrictEqual(thisResult)
+
+			expect(forAllOrganizationsMock).toHaveBeenCalledTimes(1)
+			expect(forAllOrganizationsMock).toHaveBeenCalledWith(client, expect.any(Function))
+			expect(apiListChannelsMock).toHaveBeenCalledTimes(0)
+
+			const listChannelsFunction = forAllOrganizationsMock.mock.calls[0][1]
+
+			expect(await listChannelsFunction(client, { organizationId: 'unused' } as OrganizationResponse)).toBe(result)
+		})
+
+		it('throws error when both allOrganizations and includeReadOnly included', async () => {
+			await expect(listChannels(client, { allOrganizations: true, includeReadOnly: true }))
+				.rejects.toThrow('includeReadOnly and allOrganizations options are incompatible')
+		})
+	})
+})
diff --git a/packages/edge/src/__tests__/lib/commands/drivers-util.test.ts b/packages/edge/src/__tests__/lib/commands/drivers-util.test.ts
new file mode 100644
index 000000000..57a828e26
--- /dev/null
+++ b/packages/edge/src/__tests__/lib/commands/drivers-util.test.ts
@@ -0,0 +1,650 @@
+import { Device, DeviceIntegrationType, DriverChannelDetails, EdgeDeviceIntegrationProfileKey,
+	EdgeDriver, EdgeDriverPermissions, EdgeDriverSummary, InstalledDriver, Location,
+	OrganizationResponse, SmartThingsClient } from '@smartthings/core-sdk'
+
+import { APICommand, ChooseOptions, chooseOptionsWithDefaults, forAllOrganizations, selectFromList,
+	stringTranslateToId, TableGenerator, WithOrganization } from '@smartthings/cli-lib'
+
+import { buildTableOutput, chooseDriver, chooseDriverFromChannel, chooseHub,
+	DriverChannelDetailsWithName, listAllAvailableDrivers, listAssignedDriversWithNames,
+	listDrivers, listMatchingDrivers, permissionsValue, withoutCurrentDriver }
+	from '../../../lib/commands/drivers-util'
+import * as driversUtil from '../../../lib/commands/drivers-util'
+
+
+jest.mock('@smartthings/cli-lib', () => ({
+	chooseOptionsWithDefaults: jest.fn(),
+	stringTranslateToId: jest.fn(),
+	selectFromList: jest.fn(),
+	forAllOrganizations: jest.fn(),
+	summarizedText: 'summarized text',
+}))
+
+describe('drivers-util', () => {
+	const selectFromListMock = jest.mocked(selectFromList)
+	const stringTranslateToIdMock = jest.mocked(stringTranslateToId)
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	describe('permissionsValue', () => {
+		it('returns none with no permissions at all', () => {
+			expect(permissionsValue({} as EdgeDriver)).toBe('none')
+		})
+
+		it('returns none with empty permissions array', () => {
+			expect(permissionsValue({ permissions: [] as EdgeDriverPermissions[] } as EdgeDriver)).toBe('none')
+		})
+
+		it('combines permissions names', () => {
+			expect(permissionsValue({ permissions: [
+				{ name: 'r:locations' },
+				{ name: 'r:devices' },
+			] } as EdgeDriver)).toBe('r:locations\nr:devices')
+		})
+	})
+
+	describe('buildTableOutput', () => {
+		const buildTableFromItem = jest.fn().mockReturnValue('basic info')
+		const buildTableFromList = jest.fn()
+		const tableGenerator = {
+			buildTableFromItem,
+			buildTableFromList,
+		} as unknown as TableGenerator
+		const minimalDriver: EdgeDriver = {
+			driverId: 'driver-id',
+			name: 'Driver Name',
+			version: 'driver-version',
+			packageKey: 'package key',
+			deviceIntegrationProfiles: [{ id: 'profile-id' } as EdgeDeviceIntegrationProfileKey],
+		}
+
+		it('works with minimal fields', () => {
+			buildTableFromList.mockReturnValueOnce('profiles table')
+
+			expect(buildTableOutput(tableGenerator, minimalDriver))
+				.toBe('Basic Information\nbasic info\n\n' +
+					'Device Integration Profiles\nprofiles table\n\n' +
+					'No fingerprints specified.\n\n' +
+					'summarized text')
+
+			expect(buildTableFromItem).toHaveBeenCalledTimes(1)
+			expect(buildTableFromItem).toHaveBeenCalledWith(minimalDriver,
+				expect.arrayContaining(['driverId', 'name', 'version', 'packageKey']))
+			expect(buildTableFromList).toHaveBeenCalledTimes(1)
+			expect(buildTableFromList).toHaveBeenCalledWith(minimalDriver.deviceIntegrationProfiles,
+				['id', 'majorVersion'])
+		})
+
+		it('includes fingerprints when specified', () => {
+			const driver = { ...minimalDriver, fingerprints: [{ id: 'fingerprint-id' }] } as EdgeDriver
+			buildTableFromList.mockReturnValueOnce('profiles table')
+			buildTableFromList.mockReturnValueOnce('fingerprints table')
+
+			expect(buildTableOutput(tableGenerator, driver))
+				.toBe('Basic Information\nbasic info\n\n' +
+					'Device Integration Profiles\nprofiles table\n\n' +
+					'Fingerprints\nfingerprints table\n\n' +
+					'summarized text')
+
+			expect(buildTableFromItem).toHaveBeenCalledTimes(1)
+			expect(buildTableFromItem).toHaveBeenCalledWith(driver,
+				expect.arrayContaining(['driverId', 'name', 'version', 'packageKey']))
+			expect(buildTableFromList).toHaveBeenCalledTimes(2)
+			expect(buildTableFromList).toHaveBeenCalledWith(driver.deviceIntegrationProfiles,
+				['id', 'majorVersion'])
+			expect(buildTableFromList).toHaveBeenCalledWith(driver.fingerprints,
+				['id', 'type', 'deviceLabel'])
+		})
+	})
+
+	const client = {
+		drivers: { list: jest.fn(), listDefault: jest.fn() },
+		devices: { get: jest.fn() },
+		hubdevices: { listInstalled: jest.fn() },
+	} as unknown as SmartThingsClient
+	const apiDriversListMock = jest.mocked(client.drivers.list)
+	const apiDriversListDefaultMock = jest.mocked(client.drivers.listDefault)
+	const apiDevicesGetMock = jest.mocked(client.devices.get)
+	const apiHubdevicesListInstalledMock = jest.mocked(client.hubdevices.listInstalled)
+
+	const driverList = [{ name: 'Driver' }] as EdgeDriverSummary[]
+
+	describe('listDrivers', () => {
+		const forAllOrganizationsMock = jest.mocked(forAllOrganizations)
+
+		it('normally uses drivers.list', async () => {
+			apiDriversListMock.mockResolvedValueOnce(driverList)
+
+			expect(await listDrivers(client)).toBe(driverList)
+
+			expect(apiDriversListMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListMock).toHaveBeenCalledWith()
+			expect(forAllOrganizationsMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('lists drivers for all organizations when requested', async () => {
+			const withOrg = [{ name: 'driver', organization: 'organization-name' }] as (EdgeDriverSummary & WithOrganization)[]
+			forAllOrganizationsMock.mockResolvedValueOnce(withOrg)
+
+			expect(await listDrivers(client, true)).toBe(withOrg)
+
+			expect(apiDriversListMock).toHaveBeenCalledTimes(0)
+			expect(forAllOrganizationsMock).toHaveBeenCalledTimes(1)
+			expect(forAllOrganizationsMock).toHaveBeenCalledWith(client, expect.any(Function))
+
+			const listDriversFunction = forAllOrganizationsMock.mock.calls[0][1]
+			apiDriversListMock.mockResolvedValueOnce(driverList)
+
+			expect(await listDriversFunction(client, { organizationId: 'unused' } as OrganizationResponse)).toBe(driverList)
+			expect(apiDriversListMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListMock).toHaveBeenCalledWith()
+		})
+	})
+
+	test.each`
+		deviceType  | expectedCount
+		${'lan'}    | ${3}
+		${'matter'} | ${3}
+		${'zigbee'} | ${3}
+		${'zwave'}  | ${3}
+		${'other'}  | ${4}
+	`('withoutCurrentDriver filters ', async ({ deviceType, expectedCount }) => {
+		const drivers = [
+			{ name: 'lan', driverId: 'lan-driver-id' },
+			{ name: 'matter', driverId: 'matter-driver-id' },
+			{ name: 'zigbee', driverId: 'zigbee-driver-id' },
+			{ name: 'zwave', driverId: 'zwave-driver-id' },
+		]
+
+		const driverId = `${deviceType}-driver-id`
+		const device = { [deviceType]: { driverId } } as unknown as Device
+		apiDevicesGetMock.mockResolvedValueOnce(device)
+
+		const result = await withoutCurrentDriver(client, 'device-id', drivers)
+		expect(result.length).toBe(expectedCount)
+		expect(result.find(driver => driver.driverId === driverId)).toBeUndefined()
+
+		expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+		expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+	})
+
+	const installedDriver = { driverId: 'installed-driver-id', name: 'Installed Driver' } as InstalledDriver
+	const defaultDriver = { driverId: 'default-driver-id', name: 'Default Driver' } as EdgeDriverSummary
+	const currentDriver = { driverId: 'current-driver-id', name: 'Current Driver' } as InstalledDriver
+	const device = { zigbee: { driverId: 'current-driver-id' } } as Device
+
+	describe('listAllAvailableDrivers', () => {
+		it('combines default and installed drivers lists', async () => {
+			apiDevicesGetMock.mockResolvedValueOnce(device)
+
+			apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver])
+			apiDriversListDefaultMock.mockResolvedValueOnce([defaultDriver])
+
+			const result = await listAllAvailableDrivers(client, 'device-id', 'hub-id')
+			expect(result.length).toBe(2)
+			expect(result).toEqual(expect.arrayContaining([defaultDriver, installedDriver]))
+
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id')
+			expect(apiDriversListDefaultMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListDefaultMock).toHaveBeenCalledWith()
+			expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+			expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+		})
+
+		it('filters out current driver', async () => {
+			apiDevicesGetMock.mockResolvedValueOnce(device)
+
+			apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver, currentDriver])
+			apiDriversListDefaultMock.mockResolvedValueOnce([defaultDriver])
+
+			const result = await listAllAvailableDrivers(client, 'device-id', 'hub-id')
+			expect(result.length).toBe(2)
+			expect(result).toEqual(expect.arrayContaining([defaultDriver, installedDriver]))
+
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id')
+			expect(apiDriversListDefaultMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListDefaultMock).toHaveBeenCalledWith()
+			expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+			expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+		})
+
+		it('filters out duplicates', async () => {
+			apiDevicesGetMock.mockResolvedValueOnce(device)
+
+			apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver, defaultDriver as unknown as InstalledDriver])
+			apiDriversListDefaultMock.mockResolvedValueOnce([defaultDriver])
+
+			const result = await listAllAvailableDrivers(client, 'device-id', 'hub-id')
+			expect(result.length).toBe(2)
+			expect(result).toEqual(expect.arrayContaining([defaultDriver, installedDriver]))
+
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id')
+			expect(apiDriversListDefaultMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListDefaultMock).toHaveBeenCalledWith()
+			expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+			expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+		})
+	})
+
+	describe('listMatchingDrivers', () => {
+		it('lists matching drivers', async () => {
+			apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver])
+			apiDevicesGetMock.mockResolvedValueOnce(device)
+
+			expect(await listMatchingDrivers(client, 'device-id', 'hub-id'))
+				.toStrictEqual([installedDriver])
+
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id', 'device-id')
+			expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+			expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+		})
+
+		it('filters out current driver', async () => {
+			apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver, currentDriver])
+			apiDevicesGetMock.mockResolvedValueOnce(device)
+
+			expect(await listMatchingDrivers(client, 'device-id', 'hub-id'))
+				.toStrictEqual([installedDriver])
+
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+			expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id', 'device-id')
+			expect(apiDevicesGetMock).toHaveBeenCalledTimes(1)
+			expect(apiDevicesGetMock).toHaveBeenCalledWith('device-id')
+		})
+	})
+
+	describe('chooseDriver', () => {
+		const command = { client } as APICommand<typeof APICommand.flags>
+
+		it('presents user with list of drivers', async () => {
+			selectFromListMock.mockImplementation(async () => 'chosen-driver-id')
+
+			expect(await chooseDriver(command, 'prompt message', 'command-line-driver-id')).toBe('chosen-driver-id')
+
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-driver-id', promptMessage: 'prompt message' }))
+		})
+
+		it('translates id from index if allowed', async () => {
+			stringTranslateToIdMock.mockResolvedValueOnce('translated-id')
+			selectFromListMock.mockImplementation(async () => 'chosen-driver-id')
+
+			expect(await chooseDriver(command, 'prompt message', 'command-line-driver-id',
+				{ allowIndex: true })).toBe('chosen-driver-id')
+
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(1)
+			expect(stringTranslateToIdMock).toHaveBeenCalledWith(
+				expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+				'command-line-driver-id', expect.any(Function))
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'translated-id', promptMessage: 'prompt message' }))
+		})
+
+		it('uses list function that lists drivers', async () => {
+			selectFromListMock.mockImplementation(async () => 'chosen-driver-id')
+
+			expect(await chooseDriver(command, 'prompt message', 'command-line-driver-id'))
+				.toBe('chosen-driver-id')
+
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-driver-id', promptMessage: 'prompt message' }))
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			apiDriversListMock.mockResolvedValueOnce(driverList)
+
+			expect(await listItems()).toBe(driverList)
+
+			expect(apiDriversListMock).toHaveBeenCalledTimes(1)
+			expect(apiDriversListMock).toHaveBeenCalledWith()
+		})
+
+		it('uses supplied list function', async () => {
+			selectFromListMock.mockImplementation(async () => 'chosen-driver-id')
+
+			const listItemsMock = jest.fn()
+			expect(await chooseDriver(command, 'prompt message', 'command-line-driver-id', { listItems: listItemsMock }))
+				.toBe('chosen-driver-id')
+
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-driver-id', promptMessage: 'prompt message' }))
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			listItemsMock.mockResolvedValueOnce(driverList)
+
+			expect(await listItems()).toBe(driverList)
+
+			expect(apiDriversListMock).toHaveBeenCalledTimes(0)
+			expect(listItemsMock).toHaveBeenCalledTimes(1)
+			expect(listItemsMock).toHaveBeenCalledWith()
+		})
+	})
+
+	describe('chooseHub', () => {
+		const listDevicesMock = jest.fn()
+		const getLocationsMock = jest.fn()
+		const client = { devices: { list: listDevicesMock }, locations: { get: getLocationsMock } }
+		const command = { client, logger: { warn: jest.fn() } } as unknown as APICommand<typeof APICommand.flags>
+
+		const chooseOptionsWithDefaultsMock = jest.mocked(chooseOptionsWithDefaults)
+		const stringTranslateToIdMock = jest.mocked(stringTranslateToId)
+
+		it('uses default hub if specified', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false, useConfigDefault: true } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', undefined,
+				{ useConfigDefault: true })).toBe('chosen-hub-id')
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledWith({ useConfigDefault: true })
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'deviceId', sortKeyName: 'name' }),
+				expect.objectContaining({ configKeyForDefaultValue: 'defaultHub', promptMessage: 'prompt message' }))
+		})
+
+		it('prefers command line over default', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false, useConfigDefault: true } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id',
+				{ useConfigDefault: true })).toBe('chosen-hub-id')
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledWith({ useConfigDefault: true })
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'deviceId', sortKeyName: 'name' }),
+				expect.objectContaining({
+					preselectedId: 'command-line-hub-id',
+					configKeyForDefaultValue: 'defaultHub',
+					promptMessage: 'prompt message',
+				}))
+		})
+
+		it('translates id from index if allowed', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: true } as ChooseOptions)
+			stringTranslateToIdMock.mockResolvedValueOnce('translated-id')
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id',
+				{ useConfigDefault: true, allowIndex: true })).toBe('chosen-hub-id')
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock)
+				.toHaveBeenCalledWith({ allowIndex: true, useConfigDefault: true })
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(1)
+			expect(stringTranslateToIdMock).toHaveBeenCalledWith(
+				expect.objectContaining({ primaryKeyName: 'deviceId', sortKeyName: 'name' }),
+				'command-line-hub-id', expect.any(Function))
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'deviceId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'translated-id', promptMessage: 'prompt message' }))
+		})
+
+		it('uses list function that specifies hubs', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id')).toBe('chosen-hub-id')
+
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledTimes(1)
+			expect(chooseOptionsWithDefaultsMock).toHaveBeenCalledWith(undefined)
+			expect(stringTranslateToIdMock).toHaveBeenCalledTimes(0)
+			expect(selectFromListMock).toHaveBeenCalledTimes(1)
+			expect(selectFromListMock).toHaveBeenCalledWith(command,
+				expect.objectContaining({ primaryKeyName: 'deviceId', sortKeyName: 'name' }),
+				expect.objectContaining({ preselectedId: 'command-line-hub-id', promptMessage: 'prompt message' }))
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			const list = [{ name: 'Hub', locationId: 'locationId' }] as Device[]
+			listDevicesMock.mockResolvedValueOnce(list)
+			getLocationsMock.mockResolvedValueOnce({
+				'allowed': [
+					'd:locations',
+				],
+				'locationId': 'locationId',
+			})
+
+			expect(await listItems()).toStrictEqual(list)
+
+			expect(listDevicesMock).toHaveBeenCalledTimes(1)
+			expect(listDevicesMock).toHaveBeenCalledWith({ type: DeviceIntegrationType.HUB })
+		})
+
+		test('list function checks hub locations for ownership', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id')).toBe('chosen-hub-id')
+
+			const hubList = [
+				{ name: 'Hub', locationId: 'locationId' },
+				{ name: 'AnotherHub', locationId: 'locationId' },
+				{ name: 'SecondLocationHub', locationId: 'secondLocationId' },
+			] as Device[]
+
+			const location = {
+				'allowed': [
+					'd:locations',
+				],
+			} as Location
+
+			listDevicesMock.mockResolvedValueOnce(hubList)
+			getLocationsMock.mockResolvedValue(location)
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			expect(await listItems()).toStrictEqual(hubList)
+
+			expect(getLocationsMock).toBeCalledTimes(2)
+			expect(getLocationsMock).toBeCalledWith('locationId', { allowed: true })
+			expect(getLocationsMock).toBeCalledWith('secondLocationId', { allowed: true })
+		})
+
+		test('list function filters out devices on shared locations or when allowed is null, undefined', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id')).toBe('chosen-hub-id')
+
+			const ownedHub = { name: 'Hub', locationId: 'locationId' }
+			const hubList = [
+				ownedHub,
+				{ name: 'SharedHub', locationId: 'sharedLocationId' },
+				{ name: 'NullAllowedHub', locationId: 'nullAllowedLocationId' },
+				{ name: 'UndefinedAllowedHub', locationId: 'undefinedAllowedLocationId' },
+			] as Device[]
+
+			listDevicesMock.mockResolvedValueOnce(hubList)
+
+			const location = {
+				'allowed': [
+					'd:locations',
+				],
+				'locationId': 'locationId',
+			}
+
+			const sharedLocation = {
+				'allowed': [
+				],
+				'locationId': 'sharedLocationId',
+			}
+
+			const nullAllowedLocation = {
+				'allowed': null,
+				'locationId': 'nullAllowedLocationId',
+			}
+
+			const undefinedAllowedLocation = {
+				'locationId': 'undefinedAllowedLocationId',
+			}
+
+			getLocationsMock
+				.mockResolvedValueOnce(location)
+				.mockResolvedValueOnce(sharedLocation)
+				.mockResolvedValueOnce(nullAllowedLocation)
+				.mockResolvedValueOnce(undefinedAllowedLocation)
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			expect(await listItems()).toStrictEqual([ownedHub])
+
+			expect(getLocationsMock).toBeCalledTimes(4)
+			expect(command.logger.warn).toBeCalledWith('filtering out location', sharedLocation)
+			expect(command.logger.warn).toBeCalledWith('filtering out location', nullAllowedLocation)
+			expect(command.logger.warn).toBeCalledWith('filtering out location', undefinedAllowedLocation)
+		})
+
+		test('list function warns when hub does not have locationId', async () => {
+			chooseOptionsWithDefaultsMock.mockReturnValueOnce({ allowIndex: false } as ChooseOptions)
+			selectFromListMock.mockImplementation(async () => 'chosen-hub-id')
+
+			expect(await chooseHub(command, 'prompt message', 'command-line-hub-id')).toBe('chosen-hub-id')
+
+			const hub = { name: 'Hub' } as Device
+
+			listDevicesMock.mockResolvedValueOnce([hub])
+
+			const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+			expect(await listItems()).toStrictEqual([])
+
+			expect(command.logger.warn).toBeCalledWith('hub record found without locationId', hub)
+		})
+	})
+
+	describe('listAssignedDriversWithNames', () => {
+		const driverChannelDetailsList = [{ channelId: 'channel-id', driverId: 'driver-id' }] as
+			unknown as DriverChannelDetails[]
+		const listAssignedDriversMock = jest.fn()
+		const getDriverChannelMetaInfoMock = jest.fn()
+		const client = { channels: {
+			listAssignedDrivers: listAssignedDriversMock,
+			getDriverChannelMetaInfo: getDriverChannelMetaInfoMock,
+		} } as unknown as SmartThingsClient
+
+		it('lists drivers with their names', async () => {
+			listAssignedDriversMock.mockReturnValueOnce(driverChannelDetailsList)
+			getDriverChannelMetaInfoMock.mockResolvedValueOnce({ name: 'driver name' })
+
+			const result = await listAssignedDriversWithNames(client, 'channel-id')
+
+			expect(result).toEqual([{ channelId: 'channel-id', driverId: 'driver-id', name: 'driver name' }])
+
+			expect(listAssignedDriversMock).toHaveBeenCalledTimes(1)
+			expect(listAssignedDriversMock).toHaveBeenCalledWith('channel-id')
+			expect(getDriverChannelMetaInfoMock).toHaveBeenCalledTimes(1)
+			expect(getDriverChannelMetaInfoMock).toHaveBeenCalledWith('channel-id', 'driver-id')
+		})
+
+		it('skips deleted drivers', async () => {
+			const driverChannelDetailsList = [
+				{ channelId: 'channel-id', driverId: 'driver-id' },
+				{ channelId: 'channel-id', driverId: 'deleted-driver-id' },
+			] as unknown as DriverChannelDetails[]
+			listAssignedDriversMock.mockReturnValueOnce(driverChannelDetailsList)
+			getDriverChannelMetaInfoMock.mockResolvedValueOnce({ name: 'driver name' })
+			getDriverChannelMetaInfoMock.mockRejectedValueOnce({ response: { status: 404 } })
+
+			const result = await listAssignedDriversWithNames(client, 'channel-id')
+
+			expect(result).toEqual([{ channelId: 'channel-id', driverId: 'driver-id', name: 'driver name' }])
+
+			expect(listAssignedDriversMock).toHaveBeenCalledTimes(1)
+			expect(listAssignedDriversMock).toHaveBeenCalledWith('channel-id')
+			expect(getDriverChannelMetaInfoMock).toHaveBeenCalledTimes(2)
+			expect(getDriverChannelMetaInfoMock).toHaveBeenCalledWith('channel-id', 'driver-id')
+			expect(getDriverChannelMetaInfoMock).toHaveBeenCalledWith('channel-id', 'deleted-driver-id')
+		})
+
+		it('passes on other errors from getDriverChannelMetaInfo', async () => {
+			listAssignedDriversMock.mockReturnValueOnce(driverChannelDetailsList)
+			getDriverChannelMetaInfoMock.mockRejectedValueOnce(Error('random error'))
+
+			await expect(listAssignedDriversWithNames(client, 'channel-id')).rejects.toThrow(Error('random error'))
+
+			expect(listAssignedDriversMock).toHaveBeenCalledTimes(1)
+			expect(listAssignedDriversMock).toHaveBeenCalledWith('channel-id')
+		})
+	})
+
+	test('chooseDriverFromChannel presents user with list of drivers with names', async () => {
+		const command = { client } as APICommand<typeof APICommand.flags>
+		selectFromListMock.mockResolvedValueOnce('chosen-driver-id')
+
+		expect(await chooseDriverFromChannel(command, 'channel-id', 'preselected-driver-id')).toBe('chosen-driver-id')
+
+		expect(selectFromListMock).toHaveBeenCalledTimes(1)
+		expect(selectFromListMock).toHaveBeenCalledWith(command,
+			expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+			expect.objectContaining({
+				preselectedId: 'preselected-driver-id',
+				promptMessage: 'Select a driver to install.',
+			}))
+
+		const drivers = [{ name: 'driver' }] as DriverChannelDetailsWithName[]
+		const listAssignedDriversWithNamesSpy = jest.spyOn(driversUtil, 'listAssignedDriversWithNames')
+			.mockResolvedValueOnce(drivers)
+
+		const listItems = selectFromListMock.mock.calls[0][2].listItems
+
+		expect(await listItems()).toBe(drivers)
+
+		expect(listAssignedDriversWithNamesSpy).toHaveBeenCalledTimes(1)
+		expect(listAssignedDriversWithNamesSpy).toHaveBeenCalledWith(client, 'channel-id')
+	})
+
+	test('chooseInstalledDriver presents user with list of drivers with names', async () => {
+		const command = { client } as APICommand<typeof APICommand.flags>
+		selectFromListMock.mockResolvedValueOnce('chosen-driver-id')
+		stringTranslateToIdMock.mockResolvedValueOnce('preselected-driver-id')
+
+		expect(await driversUtil.chooseInstalledDriver(command, 'hub-id', 'prompt message', 'command-line-driver-id'))
+			.toBe('chosen-driver-id')
+
+		expect(stringTranslateToIdMock).toHaveBeenCalledTimes(1)
+		expect(stringTranslateToIdMock).toHaveBeenCalledWith(
+			expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+			'command-line-driver-id', expect.any(Function))
+		expect(selectFromListMock).toHaveBeenCalledTimes(1)
+		expect(selectFromListMock).toHaveBeenCalledWith(command,
+			expect.objectContaining({ primaryKeyName: 'driverId', sortKeyName: 'name' }),
+			expect.objectContaining({
+				preselectedId: 'preselected-driver-id',
+				promptMessage: 'prompt message',
+			}))
+		expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(0)
+
+		const listItems = stringTranslateToIdMock.mock.calls[0][2]
+		apiHubdevicesListInstalledMock.mockResolvedValueOnce([installedDriver])
+
+		expect(await listItems()).toStrictEqual([installedDriver])
+
+		expect(apiHubdevicesListInstalledMock).toHaveBeenCalledTimes(1)
+		expect(apiHubdevicesListInstalledMock).toHaveBeenCalledWith('hub-id')
+	})
+})
diff --git a/packages/edge/src/__tests__/lib/commands/drivers/package-util.test.ts b/packages/edge/src/__tests__/lib/commands/drivers/package-util.test.ts
new file mode 100644
index 000000000..d6fa54c94
--- /dev/null
+++ b/packages/edge/src/__tests__/lib/commands/drivers/package-util.test.ts
@@ -0,0 +1,480 @@
+import fs from 'fs'
+
+import { CliUx, Errors } from '@oclif/core'
+import JSZip from 'jszip'
+import picomatch from 'picomatch'
+
+import { fileExists, findYAMLFilename, isDir, isFile, isSymbolicLink, readYAMLFile, realPathForSymbolicLink, requireDir } from '../../../../lib/file-util'
+import { buildTestFileMatchers, processConfigFile, processFingerprintsFile, processProfiles,
+	processSrcDir, resolveProjectDirName } from '../../../../lib/commands/drivers/package-util'
+
+
+jest.mock('fs')
+jest.mock('js-yaml')
+jest.mock('picomatch')
+jest.mock('../../../../../src/lib/file-util')
+
+describe('package-utils', () => {
+	// For some reason jest.mocked produces the wrong type signature for readdirSyncMock
+	const readdirSyncMock = fs.readdirSync as unknown as jest.Mock<string[], [string]>
+	const readStreamMock: fs.ReadStream = {} as fs.ReadStream
+	const createReadStreamMock = jest.mocked(fs.createReadStream)
+
+	const isFileMock = jest.mocked(isFile)
+	const isDirMock = jest.mocked(isDir)
+	const findYAMLFilenameMock = jest.mocked(findYAMLFilename)
+	const requireDirMock = jest.mocked(requireDir)
+	const readYAMLFileMock = jest.mocked(readYAMLFile)
+	const fileExistsMock = jest.mocked(fileExists)
+	const isSymbolicLinkMock = jest.mocked(isSymbolicLink)
+	const realPathForSymbolicLinkMock = jest.mocked(realPathForSymbolicLink)
+
+	const zipFileMock = jest.fn()
+	const zipMock = {
+		file: zipFileMock,
+	} as unknown as JSZip
+
+	const errorSpy = jest.spyOn(CliUx.ux, 'error').mockImplementation()
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+
+	describe('resolveProjectDirName', () => {
+		it('returns directory from arg if it exists', async () => {
+			isDirMock.mockResolvedValueOnce(true)
+
+			expect(await resolveProjectDirName('my-project-dir')).toBe('my-project-dir')
+
+			expect(isDirMock).toHaveBeenCalledTimes(1)
+			expect(isDirMock).toHaveBeenCalledWith('my-project-dir')
+		})
+
+		it('strips trailing slash', async () => {
+			isDirMock.mockResolvedValueOnce(true)
+
+			expect(await resolveProjectDirName('my-project-dir/')).toBe('my-project-dir')
+
+			expect(isDirMock).toHaveBeenCalledTimes(1)
+			expect(isDirMock).toHaveBeenCalledWith('my-project-dir')
+		})
+
+		it('throws exception if directory does not exist', async () => {
+			isDirMock.mockResolvedValueOnce(false)
+
+			await expect(resolveProjectDirName('my-bad-directory')).rejects.toThrow(Errors.CLIError)
+		})
+	})
+
+	describe('processConfigFile', () => {
+		it('returns parsed config yaml file data', async () => {
+			findYAMLFilenameMock.mockResolvedValueOnce('config.yaml filename')
+			readYAMLFileMock.mockReturnValueOnce({ yaml: 'file contents' })
+			createReadStreamMock.mockReturnValueOnce(readStreamMock)
+
+			expect(await processConfigFile('my-project-dir', zipMock))
+				.toEqual({ yaml: 'file contents' })
+
+			expect(findYAMLFilenameMock).toHaveBeenCalledTimes(1)
+			expect(findYAMLFilenameMock).toHaveBeenCalledWith('my-project-dir/config')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(1)
+			expect(readYAMLFileMock).toHaveBeenCalledWith('config.yaml filename')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('config.yaml filename')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('config.yml', readStreamMock)
+		})
+
+		it('throws error when config file is missing', async () => {
+			findYAMLFilenameMock.mockResolvedValueOnce(false)
+
+			await expect(processConfigFile('my-project-dir', zipMock))
+				.rejects.toThrow(new Errors.CLIError('missing main config.yaml (or config.yml) file'))
+
+			expect(findYAMLFilenameMock).toHaveBeenCalledTimes(1)
+			expect(findYAMLFilenameMock).toHaveBeenCalledWith('my-project-dir/config')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+	})
+
+	describe('processFingerprintsFile', () => {
+		it('includes fingerprint file if found', async () => {
+			findYAMLFilenameMock.mockResolvedValueOnce('fingerprints filename')
+			readYAMLFileMock.mockReturnValueOnce({ yaml: 'file contents' })
+			createReadStreamMock.mockReturnValueOnce(readStreamMock)
+
+			await processFingerprintsFile('project dir', zipMock)
+
+			expect(findYAMLFilenameMock).toHaveBeenCalledTimes(1)
+			expect(findYAMLFilenameMock).toHaveBeenCalledWith('project dir/fingerprints')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(1)
+			expect(readYAMLFileMock).toHaveBeenCalledWith('fingerprints filename')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('fingerprints filename')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('fingerprints.yml', readStreamMock)
+		})
+
+		it('skips fingerprint file if none', async () => {
+			findYAMLFilenameMock.mockResolvedValueOnce(false)
+
+			await processFingerprintsFile('project dir', zipMock)
+
+			expect(findYAMLFilenameMock).toHaveBeenCalledTimes(1)
+			expect(findYAMLFilenameMock).toHaveBeenCalledWith('project dir/fingerprints')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+	})
+
+	test('buildTestFileMatchers converts to matchers', () => {
+		const picomatchMock = jest.mocked(picomatch)
+		const matcher1 = (): boolean => true
+		const matcher2 = (): boolean => false
+
+		picomatchMock.mockReturnValueOnce(matcher1)
+		picomatchMock.mockReturnValueOnce(matcher2)
+
+		expect(buildTestFileMatchers(['1', '2'])).toEqual([matcher1, matcher2])
+
+		expect(picomatchMock).toHaveBeenCalledTimes(2)
+		expect(picomatchMock).toHaveBeenCalledWith('1')
+		expect(picomatchMock).toHaveBeenCalledWith('2')
+	})
+
+	describe('processSrcDir', () => {
+		createReadStreamMock.mockReturnValue(readStreamMock)
+
+		it('throws error when there is no init.lua file', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(false)
+
+			await expect(() => processSrcDir('project dir', zipMock, []))
+				.rejects.toThrow(Errors.CLIError)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+		})
+
+		it('includes files at top level', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+			readdirSyncMock.mockReturnValueOnce(['init.lua'])
+			fileExistsMock.mockResolvedValueOnce(true) // init.lua
+			isSymbolicLinkMock.mockResolvedValueOnce(false)
+			isDirMock.mockResolvedValueOnce(false) // init.lua is not a directory
+			createReadStreamMock.mockReturnValueOnce(readStreamMock)
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(true)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(fileExistsMock).toHaveBeenCalledTimes(1)
+			expect(fileExistsMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(isSymbolicLinkMock).toHaveBeenCalledTimes(1)
+			expect(isSymbolicLinkMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(isDirMock).toHaveBeenCalledTimes(1)
+			expect(isDirMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('src/init.lua', readStreamMock)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('includes nested files', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+			readdirSyncMock.mockReturnValueOnce(['init.lua', 'subdirectory'])
+			fileExistsMock.mockResolvedValueOnce(true) // init.lua
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // init.lua
+			isDirMock.mockResolvedValueOnce(false) // init.lua is not a directory
+			createReadStreamMock.mockReturnValueOnce(readStreamMock) // init.lua
+			fileExistsMock.mockResolvedValueOnce(true) // subdirectory
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // subdirectory
+			isDirMock.mockResolvedValueOnce(true) // subdirectory is a directory
+			readdirSyncMock.mockReturnValueOnce(['lib.lua'])
+			fileExistsMock.mockResolvedValueOnce(true) // lib.lua
+			isDirMock.mockResolvedValueOnce(false) // lib.lua
+			createReadStreamMock.mockReturnValueOnce(readStreamMock) // lib.lua
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(true)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(2)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir/subdirectory')
+			expect(isDirMock).toHaveBeenCalledTimes(3)
+			expect(isDirMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(isDirMock).toHaveBeenCalledWith('src dir/subdirectory')
+			expect(isDirMock).toHaveBeenCalledWith('src dir/subdirectory/lib.lua')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(2)
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/subdirectory/lib.lua')
+			expect(zipFileMock).toHaveBeenCalledTimes(2)
+			expect(zipFileMock).toHaveBeenCalledWith('src/init.lua', readStreamMock)
+			expect(zipFileMock).toHaveBeenCalledWith('src/subdirectory/lib.lua', readStreamMock)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('follows sym links to files', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+			readdirSyncMock.mockReturnValueOnce(['file link'])
+			fileExistsMock.mockResolvedValueOnce(true)
+			isSymbolicLinkMock.mockResolvedValueOnce(true)
+			realPathForSymbolicLinkMock.mockResolvedValueOnce('real file')
+			isDirMock.mockResolvedValueOnce(false)
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(true)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(fileExistsMock).toHaveBeenCalledTimes(1)
+			expect(fileExistsMock).toHaveBeenCalledWith('src dir/file link')
+			expect(isSymbolicLinkMock).toHaveBeenCalledTimes(1)
+			expect(isSymbolicLinkMock).toHaveBeenCalledWith('src dir/file link')
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(1)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledWith('src dir/file link')
+			expect(isDirMock).toHaveBeenCalledTimes(1)
+			expect(isDirMock).toHaveBeenCalledWith('real file')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/file link')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('src/file link', readStreamMock)
+			expect(errorSpy).toHaveBeenCalledTimes(0)
+		})
+
+		it('skips files that match test dir pattern', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+
+			readdirSyncMock.mockReturnValueOnce(['init.lua', 'test.lua'])
+			fileExistsMock.mockResolvedValueOnce(true) // init.lua
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // init.lua
+			isDirMock.mockResolvedValueOnce(false) // init.lua is not a directory
+			fileExistsMock.mockResolvedValueOnce(true) // test.lua
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // test.lua
+			isDirMock.mockResolvedValueOnce(false) // test.lua is not a directory
+
+			const matcher = jest.fn()
+				.mockReturnValueOnce(false) // init.lua is not a test file
+				.mockReturnValueOnce(true) // test.lua is a test file
+
+			expect(await processSrcDir('project dir', zipMock, [matcher])).toBe(true)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(isDirMock).toHaveBeenCalledTimes(2)
+			expect(isDirMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(isDirMock).toHaveBeenCalledWith('src dir/test.lua')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(zipFileMock).toHaveBeenCalledTimes(1) // NOT 2! :-)
+			expect(zipFileMock).toHaveBeenCalledWith('src/init.lua', readStreamMock)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('throws error if nesting is too deep', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua exists
+
+			readdirSyncMock.mockReturnValueOnce(['init.lua', 'subdirectory'])
+			fileExistsMock.mockResolvedValueOnce(true) // init.lua
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // init.lua
+			isDirMock.mockResolvedValueOnce(false) // init.lua is not a directory
+			fileExistsMock.mockResolvedValueOnce(true) // subdirectory
+			isSymbolicLinkMock.mockResolvedValueOnce(false) // subdirectory
+			isDirMock.mockResolvedValueOnce(true) // subdirectory is a directory
+			// The services limit nesting to 10 but count both the main directory and the source
+			// directory, so we only need to add a total of 9 directories to get one too many.
+			for (let count = 1; count <= 8; count++) {
+				readdirSyncMock.mockReturnValueOnce(['subdirectory'])
+				fileExistsMock.mockResolvedValueOnce(true) // subdirectory
+				isSymbolicLinkMock.mockResolvedValueOnce(false) // subdirectory
+				isDirMock.mockResolvedValueOnce(true)
+			}
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(false)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(9)
+			expect(isDirMock).toHaveBeenCalledTimes(10)
+			expect(isDirMock).toHaveBeenCalledWith('src dir/init.lua')
+			for (let count = 0; count <= 8; count++) {
+				expect(readdirSyncMock).toHaveBeenCalledWith(`src dir${'/subdirectory'.repeat(count)}`)
+				expect(isDirMock).toHaveBeenCalledWith(`src dir${'/subdirectory'.repeat(count + 1)}`)
+			}
+			expect(errorSpy).toHaveBeenCalledTimes(1)
+			expect(errorSpy).toHaveBeenCalledWith(
+				`drivers directory nested too deeply (at src dir${'/subdirectory'.repeat(9)}); max depth is 10`,
+				{ 'exit': false },
+			)
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('src/init.lua', readStreamMock)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('logs error for sym link to directory', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+			readdirSyncMock.mockReturnValueOnce(['dir link'])
+			fileExistsMock.mockResolvedValueOnce(true)
+			isSymbolicLinkMock.mockResolvedValueOnce(true)
+			realPathForSymbolicLinkMock.mockResolvedValueOnce('real dir')
+			isDirMock.mockResolvedValueOnce(true)
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(false)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(fileExistsMock).toHaveBeenCalledTimes(1)
+			expect(fileExistsMock).toHaveBeenCalledWith('src dir/dir link')
+			expect(isSymbolicLinkMock).toHaveBeenCalledTimes(1)
+			expect(isSymbolicLinkMock).toHaveBeenCalledWith('src dir/dir link')
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(1)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledWith('src dir/dir link')
+			expect(isDirMock).toHaveBeenCalledTimes(1)
+			expect(isDirMock).toHaveBeenCalledWith('real dir')
+			expect(errorSpy).toHaveBeenCalledTimes(1)
+			expect(errorSpy).toHaveBeenCalledWith(
+				'sym links to directories are not allowed (src dir/dir link)',
+				{ 'exit': false },
+			)
+			expect(createReadStreamMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('logs error for broken sym link', async () => {
+			requireDirMock.mockResolvedValueOnce('src dir')
+			isFileMock.mockResolvedValueOnce(true) // init.lua specific check
+			readdirSyncMock.mockReturnValueOnce(['file link'])
+			fileExistsMock.mockResolvedValueOnce(false)
+
+			expect(await processSrcDir('project dir', zipMock, [])).toBe(false)
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/src')
+			expect(isFileMock).toHaveBeenCalledTimes(1)
+			expect(isFileMock).toHaveBeenCalledWith('src dir/init.lua')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('src dir')
+			expect(fileExistsMock).toHaveBeenCalledTimes(1)
+			expect(fileExistsMock).toHaveBeenCalledWith('src dir/file link')
+			expect(isSymbolicLinkMock).toHaveBeenCalledTimes(0)
+			expect(realPathForSymbolicLinkMock).toHaveBeenCalledTimes(0)
+			expect(isDirMock).toHaveBeenCalledTimes(0)
+			expect(errorSpy).toHaveBeenCalledTimes(1)
+			expect(errorSpy).toHaveBeenCalledWith(
+				'sym link src dir/file link points to non-existent file',
+				{ 'exit': false },
+			)
+			expect(createReadStreamMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+	})
+
+	describe('processProfiles', () => {
+		readYAMLFileMock.mockReturnValue({})
+
+		it('adds nothing with no profiles', async () => {
+			requireDirMock.mockResolvedValueOnce('profiles dir')
+			readdirSyncMock.mockReturnValueOnce([])
+
+			await expect(processProfiles('project dir', zipMock)).resolves.not.toThrow()
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/profiles')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('profiles dir')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(0)
+			expect(createReadStreamMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+
+		it('adds yaml files with .yml extension', async () => {
+			requireDirMock.mockResolvedValueOnce('profiles dir')
+			readdirSyncMock.mockReturnValueOnce(['profile1.yml', 'profile2.yml'])
+			createReadStreamMock.mockReturnValueOnce(readStreamMock)
+
+			await expect(processProfiles('project dir', zipMock)).resolves.not.toThrow()
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/profiles')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('profiles dir')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(2)
+			expect(readYAMLFileMock).toHaveBeenCalledWith('profiles dir/profile1.yml')
+			expect(readYAMLFileMock).toHaveBeenCalledWith('profiles dir/profile2.yml')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(2)
+			expect(createReadStreamMock).toHaveBeenCalledWith('profiles dir/profile1.yml')
+			expect(createReadStreamMock).toHaveBeenCalledWith('profiles dir/profile2.yml')
+			expect(zipFileMock).toHaveBeenCalledTimes(2)
+			expect(zipFileMock).toHaveBeenCalledWith('profiles/profile1.yml', readStreamMock)
+			expect(zipFileMock).toHaveBeenCalledWith('profiles/profile2.yml', readStreamMock)
+		})
+
+		it('adds yaml files with .yaml extension as .yml', async () => {
+			requireDirMock.mockResolvedValueOnce('profiles dir')
+			readdirSyncMock.mockReturnValueOnce(['profile.yaml'])
+			createReadStreamMock.mockReturnValueOnce(readStreamMock)
+
+			await expect(processProfiles('project dir', zipMock)).resolves.not.toThrow()
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/profiles')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('profiles dir')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(1)
+			expect(readYAMLFileMock).toHaveBeenCalledWith('profiles dir/profile.yaml')
+			expect(createReadStreamMock).toHaveBeenCalledTimes(1)
+			expect(createReadStreamMock).toHaveBeenCalledWith('profiles dir/profile.yaml')
+			expect(zipFileMock).toHaveBeenCalledTimes(1)
+			expect(zipFileMock).toHaveBeenCalledWith('profiles/profile.yml', readStreamMock)
+		})
+
+		it('throws exception for non-yaml files in profiles directory', async () => {
+			requireDirMock.mockResolvedValueOnce('profiles dir')
+			readdirSyncMock.mockReturnValueOnce(['profile.exe'])
+
+			await expect(processProfiles('project dir', zipMock))
+				.rejects
+				.toThrow(new Errors.CLIError('invalid profile file "profiles dir/profile.exe" (must have .yaml or .yml extension)'))
+
+			expect(requireDirMock).toHaveBeenCalledTimes(1)
+			expect(requireDirMock).toHaveBeenCalledWith('project dir/profiles')
+			expect(readdirSyncMock).toHaveBeenCalledTimes(1)
+			expect(readdirSyncMock).toHaveBeenCalledWith('profiles dir')
+			expect(readYAMLFileMock).toHaveBeenCalledTimes(0)
+			expect(createReadStreamMock).toHaveBeenCalledTimes(0)
+			expect(zipFileMock).toHaveBeenCalledTimes(0)
+		})
+	})
+})
diff --git a/packages/edge/src/__tests__/lib/live-logging.test.ts b/packages/edge/src/__tests__/lib/live-logging.test.ts
new file mode 100644
index 000000000..db72c0ae9
--- /dev/null
+++ b/packages/edge/src/__tests__/lib/live-logging.test.ts
@@ -0,0 +1,285 @@
+import { DriverInfo, DriverInfoStatus, handleConnectionErrors, LiveLogClient, LiveLogClientConfig, LiveLogMessage, liveLogMessageFormatter, LogLevel, parseIpAndPort } from '../../lib/live-logging'
+import stripAnsi from 'strip-ansi'
+import axios, { AxiosResponse } from 'axios'
+import { BearerTokenAuthenticator, NoOpAuthenticator } from '@smartthings/core-sdk'
+import { PeerCertificate, TLSSocket } from 'tls'
+import { Socket } from 'net'
+import { ClientRequest } from 'http'
+
+
+jest.mock('axios', () => ({
+	toJSON: jest.fn(),
+	request: jest.fn(),
+}))
+
+describe('live-logging', () => {
+	const driverId = 'driverId'
+
+	describe('liveLogMessageFormatter', () => {
+		const errorEvent: LiveLogMessage = {
+			timestamp: new Date().toISOString(),
+			/* eslint-disable @typescript-eslint/naming-convention */
+			driver_id: driverId,
+			driver_name: 'Driver',
+			log_level: LogLevel.ERROR,
+			/* eslint-enable @typescript-eslint/naming-convention */
+			message: 'Something bad happened.',
+		}
+
+		const randomEvent = {
+			field1: 'one',
+			field2: 2,
+		}
+
+		it('returns timestamp in event format', () => {
+			const format = liveLogMessageFormatter(errorEvent)
+			expect(format.time).toBe(errorEvent.timestamp)
+		})
+
+		it('errors out if passed bad event type', () => {
+			expect(() => liveLogMessageFormatter(randomEvent)).toThrowError('Unexpected log message type.')
+		})
+
+		it('has expected formatString', () => {
+			const format = liveLogMessageFormatter(errorEvent)
+
+			// remove ANSI color codes
+			const rawFormat = stripAnsi(format.formatString)
+
+			expect(rawFormat).toBe(`ERROR ${errorEvent.driver_name}  ${errorEvent.message}`)
+		})
+	})
+
+	describe('parseIpAndPort', () => {
+		it.each`
+			address                | expected
+			${'192.168.0.1'}       | ${['192.168.0.1', undefined]}
+			${'192.168.0.1:0'}     | ${['192.168.0.1', '0']}
+			${'192.168.0.1:1234'}  | ${['192.168.0.1', '1234']}
+			${'192.168.0.1:65535'} | ${['192.168.0.1', '65535']}
+		`('returns $expected when $address is parsed', ({ address, expected }) => {
+			expect(parseIpAndPort(address)).toStrictEqual(expected)
+		})
+
+		it.each([
+			'192.168.0.1::1234',
+			'fe80::af:7f6a:9613:aa15',
+			'[fe80::af:7f6a:9613:aa15]:1234',
+		])('throws invalid address and port error when %s is parsed', (address) => {
+			expect(() => parseIpAndPort(address)).toThrow('Invalid IPv4 address and port format.')
+		})
+
+		it.each([
+			'',
+			'123',
+			'abc',
+		])('throws invalid address error when %s is parsed', (address) => {
+			expect(() => parseIpAndPort(address)).toThrow('Invalid IPv4 address format.')
+		})
+
+		it.each([
+			'192.168.0.1:123.4',
+			'192.168.0.1:-1',
+			'192.168.0.1:abc',
+			`192.168.0.1: ${Number.MAX_SAFE_INTEGER + 1}`,
+			`192.168.0.1: ${Number.MIN_SAFE_INTEGER - 1}`,
+		])('throws invalid port error when %s is parsed', (address) => {
+			expect(() => parseIpAndPort(address)).toThrow('Invalid port format.')
+		})
+	})
+
+	describe('handleConnectionErrors', () => {
+		it.each`
+			error             | message
+			${'ECONNREFUSED'} | ${'Unable to connect'}
+			${'EHOSTUNREACH'} | ${'Unable to connect'}
+			${'ETIMEDOUT'}    | ${'timed out'}
+			${'EHOSTDOWN'}    | ${'192.168.0.1 is down'}
+		`('throws $message when $error is handled', ({ error, message }) => {
+			expect(() => handleConnectionErrors('192.168.0.1', error)).toThrow(message)
+		})
+
+		it.each([
+			'ETIME',
+			'econnrefused',
+			'Unauthorized',
+		])('does not throw when %s is handled', (error) => {
+			expect(() => handleConnectionErrors('192.168.0.1', error)).not.toThrow()
+		})
+	})
+
+	describe('LiveLogClient', () => {
+		const axiosRequestSpy = jest.spyOn(axios, 'request')
+
+		const authority = '192.168.0.1:9495'
+		const authenticator = new NoOpAuthenticator()
+		const timeout = 1000
+		const userAgent = 'userAgent'
+		const token = 'token'
+		const config: LiveLogClientConfig = {
+			authority,
+			authenticator,
+			timeout,
+			userAgent,
+		}
+		let testClient: LiveLogClient
+
+		beforeEach(() => {
+			testClient = new LiveLogClient(config)
+		})
+
+		afterEach(() => {
+			jest.clearAllMocks()
+		})
+
+		it('returns log source for all drivers', () => {
+			const sourceURL = testClient.getLogSource()
+			expect(sourceURL).not.toContain('?')
+		})
+
+		it('returns log source for a specific driver', () => {
+			const sourceURL = testClient.getLogSource(driverId)
+
+			expect(sourceURL).toContain('?')
+			expect(sourceURL).toContain(driverId)
+		})
+
+		it('calls drivers endpoint with auth and timeout', async () => {
+			const bearerAuthenticator = new BearerTokenAuthenticator(token)
+			const bearerConfig = {
+				...config,
+				authenticator: bearerAuthenticator,
+			}
+			testClient = new LiveLogClient(bearerConfig)
+
+			const axiosResponse: AxiosResponse<DriverInfo[]> = {
+				status: 200,
+				statusText: 'OK',
+				headers: {},
+				config: {},
+				data: [
+					/* eslint-disable @typescript-eslint/naming-convention */
+					{
+						driver_id: driverId,
+						driver_name: 'Driver 0',
+						archive_hash: null,
+						status: DriverInfoStatus.Installed,
+					},
+					{
+						driver_id: driverId,
+						driver_name: 'Driver 1',
+						archive_hash: null,
+						status: DriverInfoStatus.Installed,
+					},
+					/* eslint-enable @typescript-eslint/naming-convention */
+				],
+			}
+
+			axiosRequestSpy.mockResolvedValueOnce(axiosResponse)
+
+			await testClient.getDrivers()
+
+			expect(axiosRequestSpy).toBeCalledWith(
+				expect.objectContaining({
+					headers: expect.objectContaining({ Authorization: `Bearer ${token}` }),
+					timeout: timeout,
+				}),
+			)
+		})
+
+		it('calls axios with transitional options to enable ETIMEDOUT', async () => {
+			axiosRequestSpy.mockResolvedValueOnce({ data: [] })
+
+			await testClient.getDrivers()
+
+			expect(axiosRequestSpy).toBeCalledWith(
+				expect.objectContaining({
+					transitional: expect.objectContaining({
+						clarifyTimeoutError: true,
+					}),
+				}),
+			)
+		})
+
+		it('uses CLI User-Agent in axios requests', async () => {
+			axiosRequestSpy.mockResolvedValueOnce({ data: [] })
+
+			await testClient.getDrivers()
+
+			expect(axiosRequestSpy).toBeCalledWith(
+				expect.objectContaining({
+					headers: expect.objectContaining({
+						// eslint-disable-next-line @typescript-eslint/naming-convention
+						'User-Agent': userAgent,
+					}),
+				}),
+			)
+		})
+
+		it('handles axios errors with user facing message', async () => {
+			const axiosError = {
+				message: 'connect ECONNREFUSED 192.168.0.1:9495',
+				errno: 'ECONNREFUSED',
+				code: 'ECONNREFUSED',
+				syscall: 'connect',
+				address: '192.168.0.1',
+				port: 9495,
+				config: {
+					url: 'https://192.168.0.1:9495/drivers',
+					method: 'get',
+					headers: {
+						Accept: 'application/json, text/plain, */*',
+						Authorization: `Bearer ${token}`,
+						// eslint-disable-next-line @typescript-eslint/naming-convention
+						'User-Agent': 'axios/0.21.1',
+					},
+					timeout: 5000,
+					data: undefined,
+				},
+				response: undefined,
+				isAxiosError: true,
+				toJSON: () => ({}),
+			}
+
+			axiosRequestSpy.mockRejectedValueOnce(axiosError)
+
+			await expect(testClient.getDrivers()).rejects.toThrow('Ensure hub address is correct and try again')
+		})
+
+		it('verifies host with provided verifier on first request only', async () => {
+			const cert = { fingerprint: 'fingerprint' } as PeerCertificate
+			jest.spyOn(TLSSocket.prototype, 'getPeerCertificate').mockReturnValue(cert)
+			const request: Partial<ClientRequest> = {
+				socket: new TLSSocket(new Socket()),
+			}
+
+			const certResponse: AxiosResponse = {
+				data: '',
+				status: 200,
+				statusText: 'OK',
+				headers: {},
+				config: {},
+				request: request,
+			}
+
+			const mockHostVerifier = jest.fn()
+			const verifierConfig = {
+				...config,
+				verifier: mockHostVerifier,
+			}
+			testClient = new LiveLogClient(verifierConfig)
+			axiosRequestSpy.mockResolvedValue(certResponse)
+
+			await testClient.getDrivers()
+
+			expect(mockHostVerifier).toBeCalledTimes(1)
+			expect(mockHostVerifier).toBeCalledWith(cert)
+
+			mockHostVerifier.mockClear()
+
+			await testClient.getDrivers()
+
+			expect(mockHostVerifier).not.toBeCalled()
+		})
+	})
+})
diff --git a/packages/edge/src/__tests__/tsconfig-eslint.json b/packages/edge/src/__tests__/tsconfig-eslint.json
new file mode 100644
index 000000000..c5a3f3e34
--- /dev/null
+++ b/packages/edge/src/__tests__/tsconfig-eslint.json
@@ -0,0 +1,9 @@
+{
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"types": ["jest"],
+		"rootDir": "..",
+		"noEmit": true,
+	},
+	"include": ["."],
+}
diff --git a/packages/edge/src/commands/edge/channels.ts b/packages/edge/src/commands/edge/channels.ts
new file mode 100644
index 000000000..d6f4176b1
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels.ts
@@ -0,0 +1,72 @@
+import { Flags } from '@oclif/core'
+
+import { Channel, SubscriberType } from '@smartthings/core-sdk'
+
+import { allOrganizationsFlags, outputItemOrList, OutputItemOrListConfig } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../lib/edge-command'
+import { listChannels, listTableFieldDefinitions, tableFieldDefinitions } from '../../lib/commands/channels-util'
+
+
+export default class ChannelsCommand extends EdgeCommand<typeof ChannelsCommand.flags> {
+	static description = 'list all channels owned by you or retrieve a single channel'
+
+	/* eslint-disable @typescript-eslint/naming-convention */
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItemOrList.flags,
+		...allOrganizationsFlags,
+		'include-read-only': Flags.boolean({
+			char: 'I',
+			description: 'include subscribed-to channels as well as owned channels',
+			exclusive: ['all-organizations'],
+		}),
+		'subscriber-type': Flags.string({
+			description: 'filter results based on subscriber type',
+			options: ['HUB'],
+		}),
+		'subscriber-id': Flags.string({
+			description: 'filter results based on subscriber id (e.g. hub id)',
+			dependsOn: ['subscriber-type'],
+			helpValue: '<UUID>',
+		}),
+	}
+	/* eslint-enable @typescript-eslint/naming-convention */
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the channel id or number in list',
+	}]
+
+	static examples = [`# list all user-owned channels
+$ smartthings edge:channels
+
+# list user-owned and subscribed channels
+$ smartthings edge:channels --include-read-only`,
+	`
+# display details about the second channel listed when running "smartthings edge:channels"
+$ smartthings edge:channels 2
+
+# display channels subscribed to by the specified hub
+$ smartthings edge:channels --subscriber-type HUB --subscriber-id <hub-id>`]
+
+	async run(): Promise<void> {
+		const config: OutputItemOrListConfig<Channel> = {
+			primaryKeyName: 'channelId',
+			sortKeyName: 'name',
+			listTableFieldDefinitions,
+			tableFieldDefinitions,
+		}
+		if (this.flags['all-organizations']) {
+			config.listTableFieldDefinitions.push('organization')
+		}
+
+		await outputItemOrList(this, config, this.args.idOrIndex,
+			async () => listChannels(this.client, {
+				subscriberType: this.flags['subscriber-type'] as SubscriberType | undefined,
+				subscriberId: this.flags['subscriber-id'],
+				includeReadOnly: this.flags['include-read-only'],
+			}),
+			id => this.client.channels.get(id))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/assign.ts b/packages/edge/src/commands/edge/channels/assign.ts
new file mode 100644
index 000000000..bd00cc1a6
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/assign.ts
@@ -0,0 +1,45 @@
+import { Flags } from '@oclif/core'
+
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { chooseDriver } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export class ChannelsAssignCommand extends EdgeCommand<typeof ChannelsAssignCommand.flags> {
+	static description = 'assign a driver to a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [
+		{
+			name: 'driverId',
+			description: 'driver id',
+		},
+		{
+			name: 'version',
+			description: 'driver version',
+		},
+	]
+
+	static aliases = ['edge:drivers:publish']
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this, 'Select a channel for the driver.',
+			this.flags.channel, { useConfigDefault: true })
+		const driverId = await chooseDriver(this, 'Select a driver to assign.', this.args.driverId)
+
+		// If the version wasn't specified, grab it from the driver.
+		const version = this.args.version ?? (await this.client.drivers.get(driverId)).version
+
+		await this.client.channels.assignDriver(channelId, driverId, version)
+
+		this.log(`${driverId} ${this.args.version ? `(version ${this.args.version})` : ''} assigned to channel ${channelId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/create.ts b/packages/edge/src/commands/edge/channels/create.ts
new file mode 100644
index 000000000..fdce6bb2a
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/create.ts
@@ -0,0 +1,51 @@
+import inquirer from 'inquirer'
+
+import { Channel, ChannelCreate } from '@smartthings/core-sdk'
+
+import { inputAndOutputItem, userInputProcessor } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+const tableFieldDefinitions = ['channelId', 'name', 'description', 'type', 'termsOfServiceUrl',
+	'createdDate', 'lastModifiedDate']
+
+export default class ChannelsCreateCommand extends EdgeCommand<typeof ChannelsCreateCommand.flags> {
+	static description = 'create a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...inputAndOutputItem.flags,
+	}
+
+	async getInputFromUser(): Promise<ChannelCreate> {
+		const name = (await inquirer.prompt({
+			type: 'input',
+			name: 'name',
+			message: 'Channel name:',
+			validate: input => input ? true : 'name is required',
+		})).name as string
+
+		const description = (await inquirer.prompt({
+			type: 'input',
+			name: 'description',
+			message: 'Channel description:',
+			validate: input => input ? true : 'description is required',
+		})).description as string
+
+		const termsOfServiceUrl = (await inquirer.prompt({
+			type: 'input',
+			name: 'termsOfServiceUrl',
+			message: 'Channel terms of service URL:',
+			validate: input => input ? true : 'termsOfServiceUrl is required',
+		})).termsOfServiceUrl as string
+
+		return { name, description, termsOfServiceUrl, type: 'DRIVER' }
+	}
+
+	async run(): Promise<void> {
+		await inputAndOutputItem<ChannelCreate, Channel>(this, { tableFieldDefinitions },
+			(_, input: ChannelCreate) => this.client.channels.create(input),
+			userInputProcessor(this))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/delete.ts b/packages/edge/src/commands/edge/channels/delete.ts
new file mode 100644
index 000000000..88656cf5b
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/delete.ts
@@ -0,0 +1,23 @@
+import { resetManagedConfigKey } from '@smartthings/cli-lib'
+
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class ChannelsDeleteCommand extends EdgeCommand<typeof ChannelsDeleteCommand.flags> {
+	static description = 'delete a channel'
+
+	static flags = EdgeCommand.flags
+
+	static args = [{
+		name: 'id',
+		description: 'channel id',
+	}]
+
+	async run(): Promise<void> {
+		const id = await chooseChannel(this, 'Choose a channel to delete.', this.args.id)
+		await this.client.channels.delete(id)
+		await resetManagedConfigKey(this.cliConfig, 'defaultChannel', value => value === id)
+		this.log(`Channel ${id} deleted.`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/drivers.ts b/packages/edge/src/commands/edge/channels/drivers.ts
new file mode 100644
index 000000000..eacfeedb5
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/drivers.ts
@@ -0,0 +1,35 @@
+import { outputList, OutputListConfig } from '@smartthings/cli-lib'
+
+import { DriverChannelDetailsWithName, listAssignedDriversWithNames } from '../../../lib/commands/drivers-util'
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class ChannelsDriversCommand extends EdgeCommand<typeof ChannelsDriversCommand.flags> {
+	static description = 'list all drivers assigned to a given channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputList.flags,
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the channel id or number in list',
+	}]
+
+	static aliases = ['edge:channels:assignments']
+
+	async run(): Promise<void> {
+		const config: OutputListConfig<DriverChannelDetailsWithName> = {
+			primaryKeyName: 'channelId',
+			sortKeyName: 'version',
+			listTableFieldDefinitions: ['name', 'driverId', 'version', 'createdDate', 'lastModifiedDate'],
+		}
+
+		const channelId = await chooseChannel(this, 'Select a channel.', this.args.idOrIndex,
+			{ allowIndex: true, includeReadOnly: true, useConfigDefault: true })
+
+		await outputList(this, config, () => listAssignedDriversWithNames(this.client, channelId))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/enroll.ts b/packages/edge/src/commands/edge/channels/enroll.ts
new file mode 100644
index 000000000..3b90cf3c7
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/enroll.ts
@@ -0,0 +1,36 @@
+import { Flags } from '@oclif/core'
+
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export class ChannelsEnrollCommand extends EdgeCommand<typeof ChannelsEnrollCommand.flags> {
+	static description = 'enroll a hub in a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [
+		{
+			name: 'hubId',
+			description: 'hub id',
+		},
+	]
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this, 'Select a channel.', this.flags.channel,
+			{ includeReadOnly: true })
+		const hubId = await chooseHub(this, 'Select a hub.', this.args.hubId, { useConfigDefault: true })
+
+		await this.client.channels.enrollHub(channelId, hubId)
+
+		this.log(`${hubId} enrolled in channel ${channelId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/enrollments.ts b/packages/edge/src/commands/edge/channels/enrollments.ts
new file mode 100644
index 000000000..f8e3911cd
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/enrollments.ts
@@ -0,0 +1,34 @@
+import { EnrolledChannel } from '@smartthings/core-sdk'
+
+import { outputList, OutputListConfig } from '@smartthings/cli-lib'
+
+import { chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class ChannelsEnrollmentsCommand extends EdgeCommand<typeof ChannelsEnrollmentsCommand.flags> {
+	static description = 'list all channels a given hub is enrolled in'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputList.flags,
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the hub id or number in list',
+	}]
+
+	async run(): Promise<void> {
+		const config: OutputListConfig<EnrolledChannel> = {
+			primaryKeyName: 'channelId',
+			sortKeyName: 'name',
+			listTableFieldDefinitions: ['channelId', 'name', 'description', 'createdDate', 'lastModifiedDate', 'subscriptionUrl'],
+		}
+
+		const hubId = await chooseHub(this, 'Select a hub.', this.args.idOrIndex,
+			{ allowIndex: true, useConfigDefault: true })
+
+		await outputList(this, config, () => this.client.hubdevices.enrolledChannels(hubId))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/invites.ts b/packages/edge/src/commands/edge/channels/invites.ts
new file mode 100644
index 000000000..5628a9e0f
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/invites.ts
@@ -0,0 +1,95 @@
+import { Flags } from '@oclif/core'
+
+import {
+	ChooseOptions,
+	chooseOptionsWithDefaults,
+	outputItemOrList,
+	OutputItemOrListConfig,
+	selectFromList,
+	SelectFromListConfig,
+	stringTranslateToId,
+	TableFieldDefinition,
+} from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+import { Invitation } from '../../../lib/endpoints/invites'
+
+
+export const listTableFieldDefinitions: TableFieldDefinition<Invitation>[] = [
+	'id',
+	'metadata.name',
+	{ label: 'Channel Id', prop: 'resource.components[0].id' },
+	{
+		label: 'Expiration',
+		value: ({ expiration }) => expiration ? new Date(expiration * 1000).toISOString() : '',
+	},
+	'acceptUrl',
+]
+export const tableFieldDefinitions = [
+	...listTableFieldDefinitions,
+	'profileId',
+]
+
+const buildListFunction = (command: EdgeCommand<typeof EdgeCommand.flags>, channelId?: string) => async (): Promise<Invitation[]> => {
+	const channelIds = channelId
+		? [channelId]
+		: (await command.client.channels.list()).map(channel => channel.channelId)
+	return (await Promise.all(channelIds.map(async channelId => await command.edgeClient.invites.list(channelId)))).flat()
+}
+
+export async function chooseInvite(command: EdgeCommand<typeof EdgeCommand.flags>, promptMessage: string, channelId?: string, inviteFromArg?: string, options?: Partial<ChooseOptions>): Promise<string> {
+	const opts = chooseOptionsWithDefaults(options)
+	const config: SelectFromListConfig<Invitation> = {
+		itemName: 'invitation',
+		primaryKeyName: 'id',
+		sortKeyName: 'id', // only supports simple properties so we can't sort by metadata.name even though we can use that in the table
+		listTableFieldDefinitions: ['id', 'metadata.name'],
+	}
+	const listItems = buildListFunction(command, channelId)
+	const preselectedId = opts.allowIndex
+		? await stringTranslateToId(config, inviteFromArg, listItems)
+		: inviteFromArg
+	return selectFromList(command, config, { preselectedId, listItems, promptMessage })
+}
+
+
+export default class ChannelsInvitesCommand extends EdgeCommand<typeof ChannelsInvitesCommand.flags> {
+	static description = 'list invitations or retrieve a single invitation by id or index'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItemOrList.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the invitation id or number in list',
+	}]
+
+	static aliases = ['edge:channels:invitations']
+
+	static examples = [
+		'smartthings edge:channels:invites                  # list all invites on all channels you own',
+		'smartthings edge:channels:invites 2                # list details about the second invite show when listed as in the example above',
+		'smartthings edge:channels:invites -C <channel id>  # list all invites on channel with id <channel id>',
+		'smartthings edge:channels:invites <invite id>      # list details about the invite with id <invite id>',
+	]
+
+	async run(): Promise<void> {
+		const config: OutputItemOrListConfig<Invitation> = {
+			primaryKeyName: 'id',
+			sortKeyName: 'id',
+			listTableFieldDefinitions,
+			tableFieldDefinitions,
+		}
+
+		await outputItemOrList<Invitation, Invitation>(this, config, this.args.idOrIndex,
+			buildListFunction(this, this.flags.channel),
+			id => this.edgeClient.invites.get(id))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/invites/accept.ts b/packages/edge/src/commands/edge/channels/invites/accept.ts
new file mode 100644
index 000000000..83c9bad41
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/invites/accept.ts
@@ -0,0 +1,22 @@
+import { EdgeCommand } from '../../../../lib/edge-command'
+
+
+export default class ChannelsInvitesAcceptCommand extends EdgeCommand<typeof ChannelsInvitesAcceptCommand.flags> {
+	static description = 'accept a channel invitation'
+
+	static flags = EdgeCommand.flags
+
+	static args = [{
+		name: 'id',
+		description: 'invite UUID',
+		required: true,
+	}]
+
+	static aliases = ['edge:channels:invitations:accept']
+
+	async run(): Promise<void> {
+		const id = this.args.id
+		await this.edgeClient.invites.accept(id)
+		this.log(`Invitation ${id} accepted.`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/invites/create.ts b/packages/edge/src/commands/edge/channels/invites/create.ts
new file mode 100644
index 000000000..dafd250c7
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/invites/create.ts
@@ -0,0 +1,94 @@
+import { Flags } from '@oclif/core'
+import inquirer from 'inquirer'
+
+import { inputAndOutputItem, userInputProcessor } from '@smartthings/cli-lib'
+
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../../lib/edge-command'
+import { CreateInvitation, Invitation } from '../../../../lib/endpoints/invites'
+
+
+const tableFieldDefinitions = ['id', 'metadata.name', 'profileId', 'expiration', 'acceptUrl']
+
+const defaultInvitationProfileId = '61a79569-e8fd-4a4d-9b9c-a4a55ccdd15e'
+
+export default class ChannelsInvitesCreateCommand extends EdgeCommand<typeof ChannelsInvitesCreateCommand.flags> {
+	static description = 'create an invitation'
+
+	static flags = {
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			exclusive: ['input'],
+			helpValue: '<UUID>',
+		}),
+		...EdgeCommand.flags,
+		...inputAndOutputItem.flags,
+	}
+
+	static aliases = ['edge:channels:invitations:create']
+
+	async run(): Promise<void> {
+		const create = async (_: void, input: CreateInvitation): Promise<Invitation> => {
+			const { invitationId } = await this.edgeClient.invites.create(input)
+			const invitation = await this.edgeClient.invites.get(invitationId)
+			return invitation
+		}
+
+		await inputAndOutputItem(this, { tableFieldDefinitions }, create, userInputProcessor(this))
+	}
+
+	async getInputFromUser(): Promise<CreateInvitation> {
+		const channelId = await chooseChannel(this, 'Choose a channel:', this.flags.channel,
+			{ useConfigDefault: true })
+
+		const name = (await inquirer.prompt({
+			type: 'input',
+			name: 'name',
+			message: 'Invitation name:',
+			validate: input => input ? true : 'name is required',
+		})).name as string
+
+		const description = (await inquirer.prompt({
+			type: 'input',
+			name: 'description',
+			message: 'Invitation description:',
+			validate: input => input ? true : 'description is required',
+		})).description as string
+
+		const owner = (await inquirer.prompt({
+			type: 'input',
+			name: 'owner',
+			message: 'Invitation owner:',
+			validate: input => input ? true : 'owner is required',
+		})).owner as string
+
+		const termsUrl = (await inquirer.prompt({
+			type: 'input',
+			name: 'termsUrl',
+			message: 'Invitation termsUrl:',
+			validate: input => input ? true : 'termsUrl is required',
+		})).termsUrl as string
+
+		const profileId = (this.profile.defaultInvitationProfileId as string)
+			?? defaultInvitationProfileId
+		return {
+			resource: {
+				root: {
+					service: 'developer',
+				},
+				components: [{
+					id: channelId,
+					kind: 'channel',
+				}],
+			},
+			profileId,
+			metadata: {
+				name,
+				description,
+				owner,
+				termsUrl,
+			},
+		}
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/invites/delete.ts b/packages/edge/src/commands/edge/channels/invites/delete.ts
new file mode 100644
index 000000000..67a92a4d3
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/invites/delete.ts
@@ -0,0 +1,40 @@
+import { Flags } from '@oclif/core'
+
+import { chooseChannel } from '../../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../../lib/edge-command'
+import { chooseInvite } from '../invites'
+
+
+export default class ChannelsInvitesDeleteCommand extends EdgeCommand<typeof ChannelsInvitesDeleteCommand.flags> {
+	static description = 'delete a channel invitation'
+
+	static flags = {
+		...EdgeCommand.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'id',
+		description: 'invitation UUID',
+	}]
+
+	static aliases = [
+		'edge:channels:invitations:revoke',
+		'edge:channels:invitations:delete',
+		'edge:channels:invites:revoke',
+	]
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this,
+			'Which channel is the invite you want to delete for?',
+			this.flags.channel, { useConfigDefault: true })
+
+		const id = await chooseInvite(this, 'Choose an invitation to delete.', channelId, this.args.id)
+		await this.edgeClient.invites.delete(id)
+		this.log(`Invitation ${id} deleted.`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/metainfo.ts b/packages/edge/src/commands/edge/channels/metainfo.ts
new file mode 100644
index 000000000..b1e282d72
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/metainfo.ts
@@ -0,0 +1,64 @@
+import { Flags } from '@oclif/core'
+
+import { EdgeDriver } from '@smartthings/core-sdk'
+
+import { outputItemOrList, OutputItemOrListConfig } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { buildTableOutput, listTableFieldDefinitions } from '../../../lib/commands/drivers-util'
+
+
+export default class ChannelsMetaInfoCommand extends EdgeCommand<typeof ChannelsMetaInfoCommand.flags> {
+	static description = 'list all channels owned by you or retrieve a single channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItemOrList.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			exclusive: ['input'],
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the channel id or number in list',
+	}]
+
+	static examples = [`# summarize metainfo for all drivers in a channel
+$ smartthings edge:channels:metainfo
+
+# summarize metainfo for all drivers in the specified channel
+$ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2
+
+# display metainfo about the third driver listed in the above command
+$ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2 3`,
+	`
+# display metainfo about a driver by using its id
+$ smartthings edge:channels:metainfo -C b50c0aa1-d9ea-4005-8db8-0cf9c2d9d7b2 699c7308-8c72-4363-9571-880d0f5cc725`]
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this, 'Choose a channel to get meta info for.',
+			this.flags.channel, { useConfigDefault: true })
+
+		const config: OutputItemOrListConfig<EdgeDriver> = {
+			primaryKeyName: 'driverId',
+			sortKeyName: 'name',
+			buildTableOutput: (driver: EdgeDriver) => buildTableOutput(this.tableGenerator, driver),
+			listTableFieldDefinitions,
+		}
+
+		const listDriversMetaInfo = async (): Promise<EdgeDriver[]> => {
+			const drivers = await this.client.channels.listAssignedDrivers(channelId)
+			return Promise.all(drivers.map(async driver =>
+				await this.client.channels.getDriverChannelMetaInfo(channelId, driver.driverId)))
+		}
+
+		await outputItemOrList(this, config, this.args.idOrIndex,
+			listDriversMetaInfo,
+			driverId => this.client.channels.getDriverChannelMetaInfo(channelId, driverId))
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/unassign.ts b/packages/edge/src/commands/edge/channels/unassign.ts
new file mode 100644
index 000000000..5b9211ee3
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/unassign.ts
@@ -0,0 +1,74 @@
+import { Flags } from '@oclif/core'
+
+import { DriverChannelDetails } from '@smartthings/core-sdk'
+
+import { APICommand, ChooseOptions, chooseOptionsWithDefaults, selectFromList, SelectFromListConfig, stringTranslateToId } from '@smartthings/cli-lib'
+
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export interface NamedDriverChannelDetails extends DriverChannelDetails {
+	name: string
+}
+
+export async function chooseAssignedDriver(command: APICommand<typeof APICommand.flags>, promptMessage: string,
+		channelId: string, commandLineDriverId?: string, options?: Partial<ChooseOptions>): Promise<string> {
+	const opts = chooseOptionsWithDefaults(options)
+	const config: SelectFromListConfig<NamedDriverChannelDetails> = {
+		itemName: 'driver',
+		primaryKeyName: 'driverId',
+		sortKeyName: 'name',
+	}
+	const listItems = async (): Promise<NamedDriverChannelDetails[]> => {
+		const driverDetails = await command.client.channels.listAssignedDrivers(channelId)
+		return (await Promise.all(driverDetails.map(async details => {
+			try {
+				const driver = await command.client.drivers.get(details.driverId)
+				return { ...details, name: driver.name }
+			} catch (error) {
+				if (error.response?.status === 404) {
+					return { ...details, name: '<deleted driver>' }
+				}
+				throw error
+			}
+		})))
+	}
+	const preselectedId = opts.allowIndex
+		? await stringTranslateToId(config, commandLineDriverId, listItems)
+		: commandLineDriverId
+	return selectFromList(command, config, { preselectedId, listItems, promptMessage })
+}
+
+export class ChannelsUnassignCommand extends EdgeCommand<typeof ChannelsUnassignCommand.flags> {
+	static description = 'remove a driver from a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [
+		{
+			name: 'driverId',
+			description: 'driver id',
+		},
+	]
+
+	static aliases = ['edge:drivers:unpublish']
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this, 'Select a channel for the driver.',
+			this.flags.channel, { useConfigDefault: true })
+		const driverId = await chooseAssignedDriver(this, 'Select a driver to remove from channel.',
+			channelId, this.args.driverId)
+
+		await this.client.channels.unassignDriver(channelId, driverId)
+
+		this.log(`${driverId} removed from channel ${channelId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/unenroll.ts b/packages/edge/src/commands/edge/channels/unenroll.ts
new file mode 100644
index 000000000..018d7de21
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/unenroll.ts
@@ -0,0 +1,37 @@
+import { Flags } from '@oclif/core'
+
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export class ChannelsUnenrollCommand extends EdgeCommand<typeof ChannelsUnenrollCommand.flags> {
+	static description = 'unenroll a hub from a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [
+		{
+			name: 'hubId',
+			description: 'hub id',
+		},
+	]
+
+	async run(): Promise<void> {
+		const channelId = await chooseChannel(this, 'Select a channel.', this.flags.channel,
+			{ includeReadOnly: true })
+		const hubId = await chooseHub(this, 'Select a hub.', this.args.hubId,
+			{ useConfigDefault: true })
+
+		await this.client.channels.unenrollHub(channelId, hubId)
+
+		this.log(`${hubId} unenrolled from channel ${channelId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/channels/update.ts b/packages/edge/src/commands/edge/channels/update.ts
new file mode 100644
index 000000000..f5e571d48
--- /dev/null
+++ b/packages/edge/src/commands/edge/channels/update.ts
@@ -0,0 +1,28 @@
+import { inputAndOutputItem } from '@smartthings/cli-lib'
+
+import { Channel, ChannelUpdate } from '@smartthings/core-sdk'
+
+import { chooseChannel, tableFieldDefinitions } from '../../../lib/commands/channels-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class ChannelsUpdateCommand extends EdgeCommand<typeof ChannelsUpdateCommand.flags> {
+	static description = 'update a channel'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...inputAndOutputItem.flags,
+	}
+
+	static args = [{
+		name: 'id',
+		description: 'the channel id',
+	}]
+
+	async run(): Promise<void> {
+		const id = await chooseChannel(this, 'Choose a channel to patch.', this.args.id,
+			{ useConfigDefault: true })
+		await inputAndOutputItem<ChannelUpdate, Channel>(this, { tableFieldDefinitions },
+			(_, channelMods) => this.client.channels.update(id, channelMods))
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers.ts b/packages/edge/src/commands/edge/drivers.ts
new file mode 100644
index 000000000..47aa4e6f2
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers.ts
@@ -0,0 +1,66 @@
+import { Flags } from '@oclif/core'
+
+import { EdgeDriver } from '@smartthings/core-sdk'
+
+import { allOrganizationsFlags, outputItemOrList, OutputItemOrListConfig } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../lib/edge-command'
+import { buildTableOutput, listDrivers, listTableFieldDefinitions } from '../../lib/commands/drivers-util'
+
+
+export default class DriversCommand extends EdgeCommand<typeof DriversCommand.flags> {
+	static description = `list all drivers owned by you or retrieve a single driver
+Use this command to list all drivers you own, even if they are not yet assigned to a channel.
+
+See also:
+  edge:drivers:installed to list installed drivers
+  edge:channels:drivers to list drivers that are part of a channel you own or have subscribed to
+`
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItemOrList.flags,
+		...allOrganizationsFlags,
+		version: Flags.string({
+			char: 'V',
+			description: 'driver version',
+		}),
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the driver id or number in list',
+	}]
+
+	static examples = [`# list all user-owned drivers
+$ smartthings edge:drivers
+
+# display details about the third driver listed in the above command
+$ smartthings edge:drivers 3`,
+	`
+# display details about a driver by using its id
+$ smartthings edge:drivers 699c7308-8c72-4363-9571-880d0f5cc725
+
+# get information on a specific version of a driver
+$ smartthings edge:drivers 699c7308-8c72-4363-9571-880d0f5cc725 --version 2021-10-25T00:48:23.295969`]
+
+	async run(): Promise<void> {
+		const config: OutputItemOrListConfig<EdgeDriver> = {
+			primaryKeyName: 'driverId',
+			sortKeyName: 'name',
+			buildTableOutput: (driver: EdgeDriver) => buildTableOutput(this.tableGenerator, driver),
+			listTableFieldDefinitions,
+		}
+
+		if (this.flags['all-organizations']) {
+			config.listTableFieldDefinitions.push('organization')
+		}
+
+		const getDriver = (id: string): Promise<EdgeDriver> =>
+			this.flags.version ? this.client.drivers.getRevision(id, this.flags.version) : this.client.drivers.get(id)
+
+		await outputItemOrList(this, config, this.args.idOrIndex,
+			() => listDrivers(this.client, this.flags['all-organizations']),
+			getDriver)
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/default.ts b/packages/edge/src/commands/edge/drivers/default.ts
new file mode 100644
index 000000000..ed2c69be3
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/default.ts
@@ -0,0 +1,29 @@
+import { EdgeDriverSummary } from '@smartthings/core-sdk'
+
+import { outputList, OutputListConfig } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+import { listTableFieldDefinitions } from '../../../lib/commands/drivers-util'
+
+
+export default class DriversDefaultCommand extends EdgeCommand<typeof DriversDefaultCommand.flags> {
+	static description = 'list default drivers available to all users'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputList.flags,
+	}
+
+	static examples = [`# list default drivers
+$ smartthings edge:drivers:default`]
+
+	async run(): Promise<void> {
+		const config: OutputListConfig<EdgeDriverSummary> = {
+			primaryKeyName: 'driverId',
+			sortKeyName: 'name',
+			listTableFieldDefinitions,
+		}
+
+		await outputList(this, config, () => this.client.drivers.listDefault())
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/delete.ts b/packages/edge/src/commands/edge/drivers/delete.ts
new file mode 100644
index 000000000..eb8e3c166
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/delete.ts
@@ -0,0 +1,20 @@
+import { EdgeCommand } from '../../../lib/edge-command'
+import { chooseDriver } from '../../../lib/commands/drivers-util'
+
+
+export default class DriversDeleteCommand extends EdgeCommand<typeof DriversDeleteCommand.flags> {
+	static description = 'delete an edge driver'
+
+	static flags = EdgeCommand.flags
+
+	static args = [{
+		name: 'id',
+		description: 'driver UUID',
+	}]
+
+	async run(): Promise<void> {
+		const id = await chooseDriver(this, 'Select a driver to delete.', this.args.id)
+		await this.client.drivers.delete(id)
+		this.log(`Driver ${id} deleted.`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/install.ts b/packages/edge/src/commands/edge/drivers/install.ts
new file mode 100644
index 000000000..64b428125
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/install.ts
@@ -0,0 +1,62 @@
+import { Flags } from '@oclif/core'
+
+import { EnrolledChannel } from '@smartthings/core-sdk'
+
+import { selectFromList, SelectFromListConfig } from '@smartthings/cli-lib'
+
+import { chooseDriverFromChannel, chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class DriversInstallCommand extends EdgeCommand<typeof DriversInstallCommand.flags> {
+	static description = 'install an edge driver onto a hub'
+
+	static examples = [
+		'smartthings edge:drivers:install                                         # use Q&A format to enter required values',
+		'smartthings edge:drivers:install -H <hub-id>                             # specify the hub on the command line, other fields will be asked for',
+		'smartthings edge:drivers:install -H <hub-id> -C <channel-id> <driver-id> # install a driver from a channel on an enrolled hub',
+	]
+
+	static flags = {
+		...EdgeCommand.flags,
+		hub: Flags.string({
+			char: 'H',
+			description: 'hub id',
+			helpValue: '<UUID>',
+		}),
+		channel: Flags.string({
+			char: 'C',
+			description: 'channel id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'driverId',
+		description: 'id of driver to install',
+	}]
+
+	async chooseChannelFromEnrollments(hubId: string): Promise<string> {
+		const config: SelectFromListConfig<EnrolledChannel> = {
+			itemName: 'hub-enrolled channel',
+			primaryKeyName: 'channelId',
+			sortKeyName: 'name',
+		}
+		const listItems = (): Promise<EnrolledChannel[]> =>
+			this.client.hubdevices.enrolledChannels(hubId)
+		return selectFromList(this, config, {
+			listItems,
+			promptMessage: 'Select a channel to install the driver from.',
+			configKeyForDefaultValue: 'defaultChannel',
+		})
+	}
+
+	async run(): Promise<void> {
+		const hubId = await chooseHub(this, 'Select a hub to install to.', this.flags.hub,
+			{ useConfigDefault: true })
+		const channelId = this.flags.channel ?? await this.chooseChannelFromEnrollments(hubId)
+		const driverId = await chooseDriverFromChannel(this, channelId, this.args.driverId)
+		await this.client.hubdevices.installDriver(driverId, hubId, channelId)
+		this.log(`driver ${driverId} installed to hub ${hubId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/installed.ts b/packages/edge/src/commands/edge/drivers/installed.ts
new file mode 100644
index 000000000..d0643835a
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/installed.ts
@@ -0,0 +1,50 @@
+import { Flags } from '@oclif/core'
+
+import { InstalledDriver } from '@smartthings/core-sdk'
+
+import { outputItemOrList, OutputItemOrListConfig } from '@smartthings/cli-lib'
+
+import { chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class DriversInstalledCommand extends EdgeCommand<typeof DriversInstalledCommand.flags> {
+	static description = 'list all drivers installed on a given hub'
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItemOrList.flags,
+		hub: Flags.string({
+			char: 'H',
+			description: 'hub id',
+			helpValue: '<UUID>',
+		}),
+		device: Flags.string({
+			description: 'return drivers matching the specified device',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'idOrIndex',
+		description: 'the driver id or number in list',
+	}]
+
+	async run(): Promise<void> {
+		const config: OutputItemOrListConfig<InstalledDriver> = {
+			primaryKeyName: 'driverId',
+			sortKeyName: 'name',
+			tableFieldDefinitions: ['driverId', 'name', 'description', 'version', 'channelId',
+				'developer', 'vendorSupportInformation'],
+			listTableFieldDefinitions: ['driverId', 'name', 'description', 'version', 'channelId',
+				'developer', 'vendorSupportInformation'],
+		}
+
+		const hubId = await chooseHub(this, 'Select a hub.', this.flags.hub,
+			{ allowIndex: true, useConfigDefault: true })
+
+		await outputItemOrList(this, config, this.args.idOrIndex,
+			() => this.client.hubdevices.listInstalled(hubId, this.flags.device),
+			id => this.client.hubdevices.getInstalled(hubId, id))
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/logcat.ts b/packages/edge/src/commands/edge/drivers/logcat.ts
new file mode 100644
index 000000000..ce8781c49
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/logcat.ts
@@ -0,0 +1,291 @@
+import { CliUx, Errors, Flags } from '@oclif/core'
+import inquirer from 'inquirer'
+import { promises as fs } from 'fs'
+import { PeerCertificate } from 'tls'
+import {
+	DriverInfo,
+	handleConnectionErrors,
+	isLiveLogMessage,
+	LiveLogClient,
+	LiveLogClientConfig,
+	LiveLogMessage,
+	liveLogMessageFormatter,
+	LogLevel,
+	parseIpAndPort,
+} from '../../../lib/live-logging'
+import {
+	askForRequiredString,
+	convertToId,
+	EventSourceError,
+	green,
+	logEvent,
+	red,
+	selectFromList,
+	SelectFromListConfig,
+	Sorting,
+	SseCommand,
+	stringTranslateToId,
+	TableFieldDefinition,
+} from '@smartthings/cli-lib'
+import { inspect } from 'util'
+import { runForever } from '../../../lib/commands/drivers/logcat-util'
+
+
+const DEFAULT_ALL_TEXT = 'all'
+const DEFAULT_LIVE_LOG_PORT = 9495
+const DEFAULT_LIVE_LOG_TIMEOUT = 30_000 // milliseconds
+
+/**
+ * Define labels to stay consistent with other driver commands
+ */
+const driverFieldDefinitions: TableFieldDefinition<DriverInfo>[] = [
+	{
+		prop: 'driver_id',
+		label: 'Driver Id',
+	},
+	{
+		prop: 'driver_name',
+		label: 'Name',
+	},
+]
+
+async function promptForDrivers(fieldInfo: Sorting<DriverInfo>, list: DriverInfo[], prompt?: string): Promise<string> {
+	const primaryKeyName = fieldInfo.primaryKeyName
+
+	const itemIdOrIndex: string = (await inquirer.prompt({
+		type: 'input',
+		name: 'itemIdOrIndex',
+		message: prompt ?? 'Enter id or index',
+		default: DEFAULT_ALL_TEXT,
+		validate: input => {
+			return input === DEFAULT_ALL_TEXT ||
+				convertToId(input, primaryKeyName, list)
+				? true
+				: `Invalid id or index "${input}". Please enter an index or valid id.`
+		},
+	})).itemIdOrIndex
+
+	const inputId = itemIdOrIndex == DEFAULT_ALL_TEXT ? itemIdOrIndex : convertToId(itemIdOrIndex, primaryKeyName, list)
+	if (inputId === false) {
+		throw Error(`unable to convert ${itemIdOrIndex} to id`)
+	}
+
+	return inputId
+}
+
+interface KnownHub {
+	hostname: string
+	fingerprint: string
+}
+
+export default class LogCatCommand extends SseCommand<typeof LogCatCommand.flags> {
+	private authority!: string
+	private logClient!: LiveLogClient
+
+	static description = 'stream logs from installed drivers'
+
+	/* eslint-disable @typescript-eslint/naming-convention */
+	static flags = {
+		...SseCommand.flags,
+		all: Flags.boolean({
+			char: 'a',
+			description: 'stream from all installed drivers',
+		}),
+		'hub-address': Flags.string({
+			description: 'IPv4 address of hub with optionally appended port number',
+		}),
+		'connect-timeout': Flags.integer({
+			description: 'max time allowed when connecting to hub',
+			helpValue: '<milliseconds>',
+			default: DEFAULT_LIVE_LOG_TIMEOUT,
+		}),
+		'log-level': Flags.string({
+			description: 'minimum level of event to log',
+			helpValue: '<string>',
+			default: 'TRACE',
+		}),
+	}
+	/* eslint-enable @typescript-eslint/naming-convention */
+
+	static args = [
+		{
+			name: 'driverId',
+			description: 'a specific driver to stream logs from',
+		},
+	]
+
+	private getMinLogLevel(): number {
+		const minLogLevel = this.flags['log-level'].toUpperCase() as keyof typeof LogLevel
+
+		if (Object.keys(LogLevel).includes(minLogLevel)) {
+			return LogLevel[minLogLevel]
+		}
+
+		this.warn(`${this.flags['log-level']} is not a valid log-level. Logging all events.`)
+		return 0
+	}
+
+	private async checkServerIdentity(cert: PeerCertificate): Promise<void | never> {
+		const knownHubsPath = `${this.config.cacheDir}/known_hubs.json`
+		let knownHubs: Partial<Record<string, KnownHub>> = {}
+		try {
+			knownHubs = JSON.parse(await fs.readFile(knownHubsPath, 'utf-8'))
+		} catch (error) {
+			if (error.code !== 'ENOENT') { throw error }
+		}
+
+		const known = knownHubs[this.authority]
+		if (!known || known.fingerprint !== cert.fingerprint) {
+			await CliUx.ux.action.pauseAsync(async () => {
+				this.warn(`The authenticity of ${this.authority} can't be established. Certificate fingerprint is ${cert.fingerprint}`)
+				const verified = (await inquirer.prompt({
+					type: 'confirm',
+					name: 'connect',
+					message: 'Are you sure you want to continue connecting?',
+					default: false,
+				})).connect
+
+				if (!verified) {
+					this.error('Hub verification failed.')
+				}
+
+				knownHubs[this.authority] = { hostname: this.authority, fingerprint: cert.fingerprint }
+				await fs.writeFile(knownHubsPath, JSON.stringify(knownHubs))
+
+				this.warn(`Permanently added ${this.authority} to the list of known hubs.`)
+			})
+		}
+	}
+
+	private async chooseHubDrivers(commandLineDriverId?: string, driversList?: DriverInfo[]): Promise<string> {
+		const config: SelectFromListConfig<DriverInfo> = {
+			itemName: 'driver',
+			primaryKeyName: 'driver_id',
+			sortKeyName: 'driver_name',
+			listTableFieldDefinitions: driverFieldDefinitions,
+		}
+
+		const list = driversList !== undefined ? Promise.resolve(driversList) : this.logClient.getDrivers()
+		const preselectedId = await stringTranslateToId(config, commandLineDriverId, () => list)
+		return selectFromList(this, config,
+			{ preselectedId, listItems: () => list, getIdFromUser: promptForDrivers })
+	}
+
+	async init(): Promise<void> {
+		await super.init()
+
+		const hubIpAddress = this.flags['hub-address'] ?? await askForRequiredString('Enter hub IP address with optionally appended port number:')
+		const [ipv4, port] = parseIpAndPort(hubIpAddress)
+		const liveLogPort = port ?? DEFAULT_LIVE_LOG_PORT
+		this.authority = `${ipv4}:${liveLogPort}`
+
+		const config: LiveLogClientConfig = {
+			authority: this.authority,
+			authenticator: this.authenticator,
+			verifier: this.checkServerIdentity.bind(this),
+			timeout: this.flags['connect-timeout'] ?? DEFAULT_LIVE_LOG_TIMEOUT,
+			userAgent: this.userAgent,
+		}
+
+		this.logClient = new LiveLogClient(config)
+	}
+
+	async run(): Promise<void> {
+		CliUx.ux.action.start('connecting')
+
+		// ensure host verification resolves before connecting to the event source
+		const installedDrivers = await this.logClient.getDrivers()
+
+		let sourceURL: string
+		if (this.flags.all) {
+			sourceURL = this.logClient.getLogSource()
+		} else {
+			const driverId = await CliUx.ux.action.pauseAsync(() => this.chooseHubDrivers(this.args.driverId, installedDrivers))
+			sourceURL = driverId == DEFAULT_ALL_TEXT ? this.logClient.getLogSource() : this.logClient.getLogSource(driverId)
+		}
+
+		await this.initSource(sourceURL)
+
+		const sourceTimeoutID = setTimeout(() => {
+			this.teardown()
+			CliUx.ux.action.stop(red('failed'))
+			try {
+				handleConnectionErrors(this.authority, 'ETIMEDOUT')
+			} catch (error) {
+				if (error instanceof Error) {
+					Errors.handle(error)
+				}
+			}
+		}, this.flags['connect-timeout']).unref() // unref lets Node exit before callback is invoked
+
+		this.source.onopen = () => {
+			clearTimeout(sourceTimeoutID)
+
+			if (installedDrivers.length === 0) {
+				this.warn('No drivers currently installed.')
+			}
+
+			CliUx.ux.action.stop(green('connected'))
+		}
+
+		this.source.onerror = (error: EventSourceError) => {
+			this.teardown()
+			CliUx.ux.action.stop(red('failed'))
+			this.logger.debug(`Error from eventsource. URL: ${sourceURL} Error: ${inspect(error)}`)
+			try {
+				if (error.status === 401 || error.status === 403) {
+					this.error(`Unauthorized at ${this.authority}`)
+				}
+
+				if (error.message !== undefined) {
+					handleConnectionErrors(this.authority, error.message)
+				}
+
+				this.error(`Unexpected error from event source ${inspect(error)}`)
+			} catch (error) {
+				if (error instanceof Error) {
+					Errors.handle(error)
+				}
+			}
+		}
+
+		const minLogLevel = this.getMinLogLevel()
+
+		this.source.onmessage = (event: MessageEvent<string>) => {
+			// TODO refactor cli-libs sse-io module to export parse utils
+			const message = this.parseEvent(event)
+			if (message.log_level >= minLogLevel) {
+				// TODO separate parsing and logging in sse-io so that logEvent can accept a parsed message
+				logEvent(event, liveLogMessageFormatter)
+			}
+		}
+
+		await runForever()
+	}
+
+	async catch(error: unknown): Promise<void> {
+		// exit gracefully for Command.exit(0)
+		if (error instanceof Errors.ExitError && error.oclif.exit === 0) {
+			this.teardown()
+			return
+		}
+
+		CliUx.ux.action.stop(red('failed'))
+		await super.catch(error)
+	}
+
+	parseEvent(event: MessageEvent): LiveLogMessage {
+		let message: unknown
+		try {
+			message = JSON.parse(event.data)
+		} catch (error) {
+			this.error(`Unable to parse received event. ${error.message ?? error}`)
+		}
+
+		if (isLiveLogMessage(message)) {
+			return message
+		} else {
+			throw Error('Unexpected log message type.')
+		}
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/package.ts b/packages/edge/src/commands/edge/drivers/package.ts
new file mode 100644
index 000000000..b66155ffe
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/package.ts
@@ -0,0 +1,142 @@
+import fs from 'fs'
+
+import { Flags } from '@oclif/core'
+import JSZip from 'jszip'
+
+import { outputItem, readFile } from '@smartthings/cli-lib'
+
+import { buildTestFileMatchers, processConfigFile, processFingerprintsFile, processProfiles,
+	processSrcDir, resolveProjectDirName } from '../../../lib/commands/drivers/package-util'
+import { chooseChannel } from '../../../lib/commands/channels-util'
+import { chooseHub } from '../../../lib/commands/drivers-util'
+import { EdgeCommand } from '../../../lib/edge-command'
+
+
+export default class PackageCommand extends EdgeCommand<typeof PackageCommand.flags> {
+	static description = 'build and upload an edge package'
+
+	static args = [{
+		name: 'projectDirectory',
+		description: 'directory containing project to upload',
+		default: '.',
+	}]
+
+	static flags = {
+		...EdgeCommand.flags,
+		...outputItem.flags,
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		'build-only': Flags.string({
+			char: 'b',
+			description: 'save package to specified zip file but skip upload',
+			exclusive: ['upload'],
+		}),
+		upload: Flags.string({
+			char: 'u',
+			description: 'upload zip file previously built with --build flag',
+			exclusive: ['build-only'],
+		}),
+		assign: Flags.boolean({
+			char: 'a',
+			description: 'prompt for a channel to assign the driver to after upload',
+			exclusive: ['channel', 'build-only'],
+		}),
+		channel: Flags.string({
+			description: 'automatically assign driver to specified channel after upload',
+			exclusive: ['assign', 'build-only'],
+			helpValue: '<UUID>',
+		}),
+		install: Flags.boolean({
+			char: 'I',
+			description: 'prompt for hub to install to after assigning it to the channel, implies --assign if --assign or --channel not included',
+			exclusive: ['hub', 'build-only'],
+		}),
+		hub: Flags.string({
+			description: 'automatically install driver to specified hub, implies --assign if --assign or --channel not included',
+			exclusive: ['install', 'build-only'],
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static examples = [`# build and upload driver found in current directory:
+$ smartthings edge:drivers:package
+
+# build and upload driver found in current directory, assign it to a channel, and install it;
+# user will be prompted for channel and hub
+$ smartthings edge:drivers:package -I
+
+# build and upload driver found in current directory then assign it to the specified channel
+# and install it to the specified hub
+$ smartthings edge:drivers:package --channel <channel-id> --hub <hubId>
+
+# build and upload driver found in the my-driver directory
+$ smartthings edge:drivers:package my-driver
+
+# build the driver in the my-package directory and save it as driver.zip
+$ smartthings edge:drivers:package -b driver.zip my-package`,
+	`
+# upload the previously built driver found in driver.zip
+$ smartthings edge:drivers:package -u driver.zip`]
+
+	async run(): Promise<void> {
+		const uploadAndPostProcess = async (archiveData: Uint8Array): Promise<void> => {
+			const config = {
+				tableFieldDefinitions: ['driverId', 'name', 'packageKey', 'version'],
+			}
+			const driver = await outputItem(this, config, () => this.client.drivers.upload(archiveData))
+			const doAssign = this.flags.assign || this.flags.channel || this.flags.install || this.flags.hub
+			const doInstall = this.flags.install || this.flags.hub
+			if (doAssign) {
+				const driverId = driver.driverId
+				const version = driver.version
+				const channelId = await chooseChannel(this, 'Select a channel for the driver.',
+					this.flags.channel, { useConfigDefault: true })
+				await this.client.channels.assignDriver(channelId, driverId, version)
+				this.log(`assigned driver ${driverId} ${version} to channel ${channelId}`)
+
+				if (doInstall) {
+					const hubId = await chooseHub(this, 'Select a hub to install to.', this.flags.hub,
+						{ useConfigDefault: true })
+					await this.client.hubdevices.installDriver(driverId, hubId, channelId)
+					this.log(`installed driver ${driverId} ${version} to hub ${hubId}`)
+				}
+			}
+		}
+
+		if (this.flags.upload) {
+			try {
+				const data = await readFile(this.flags.upload)
+				await uploadAndPostProcess(data)
+			} catch (error) {
+				if ((error as { code?: string }).code === 'ENOENT') {
+					this.log(`No file named "${this.flags.upload}" found.`)
+				} else {
+					throw error
+				}
+			}
+		} else {
+			const projectDirectory = await resolveProjectDirName(this.args.projectDirectory)
+
+			const zip = new JSZip()
+			await processConfigFile(projectDirectory, zip)
+
+			await processFingerprintsFile(projectDirectory, zip)
+			const edgeDriverTestDirs = this.stringArrayConfigValue('edgeDriverTestDirs', ['test/**', 'tests/**'])
+			const testFileMatchers = buildTestFileMatchers(edgeDriverTestDirs)
+			if (!await processSrcDir(projectDirectory, zip, testFileMatchers)) {
+				this.exit(1)
+			}
+
+			await processProfiles(projectDirectory, zip)
+			if (this.flags['build-only']) {
+				zip.generateNodeStream({ type: 'nodebuffer', streamFiles: true, compression: 'DEFLATE' })
+					.pipe(fs.createWriteStream(this.flags['build-only']))
+					.on('finish', () => {
+						this.log(`wrote ${this.flags['build-only']}`)
+					})
+			} else {
+				const zipContents = await zip.generateAsync({ type: 'uint8array', compression: 'DEFLATE' })
+				await uploadAndPostProcess(zipContents)
+			}
+		}
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/switch.ts b/packages/edge/src/commands/edge/drivers/switch.ts
new file mode 100644
index 000000000..68deb532a
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/switch.ts
@@ -0,0 +1,77 @@
+import { Flags } from '@oclif/core'
+
+import { Device, DeviceIntegrationType } from '@smartthings/core-sdk'
+
+import { chooseDevice } from '@smartthings/cli-lib'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+import { chooseDriver, chooseHub, listAllAvailableDrivers, listMatchingDrivers }
+	from '../../../lib/commands/drivers-util'
+
+
+export default class DriversSwitchCommand extends EdgeCommand<typeof DriversSwitchCommand.flags> {
+	static description = 'change the driver used by an installed device'
+
+	static examples = [`# switch driver, prompting user for all necessary input
+$ smartthings edge:drivers:switch
+
+# switch driver, including all necessary input on the command line
+$ smartthings edge:drivers:switch --hub <hub-id> --driver <driver-id> <device-id>`,
+	`
+# include all available drivers in prompt, even if they don't match the chosen device
+$ smartthings edge:drivers:switch --include-non-matching`,
+	]
+
+	static flags = {
+		...EdgeCommand.flags,
+		hub: Flags.string({
+			char: 'H',
+			description: 'hub id',
+			helpValue: '<UUID>',
+		}),
+		driver: Flags.string({
+			char: 'd',
+			description: 'id of new driver to use',
+			helpValue: '<UUID>',
+		}),
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		'include-non-matching': Flags.boolean({
+			char: 'I',
+			description: 'when presenting a list of drivers to switch to, include drivers that do not match the device',
+		}),
+	}
+
+	static args = [{
+		name: 'deviceId',
+		description: 'id of device to update',
+	}]
+
+	async run(): Promise<void> {
+		const hubId = await chooseHub(this, 'Which hub is the device connected to?',
+			this.flags.hub, { useConfigDefault: true })
+		const deviceListFilter = (device: Device): boolean =>
+			device.type === DeviceIntegrationType.LAN && device.lan?.hubId === hubId ||
+			device.type === DeviceIntegrationType.MATTER && device.matter?.hubId === hubId ||
+			device.type === DeviceIntegrationType.ZIGBEE && device.zigbee?.hubId === hubId ||
+			device.type === DeviceIntegrationType.ZWAVE && device.zwave?.hubId === hubId
+
+		const deviceListOptions = {
+			type: [
+				DeviceIntegrationType.LAN,
+				DeviceIntegrationType.MATTER,
+				DeviceIntegrationType.ZIGBEE,
+				DeviceIntegrationType.ZWAVE,
+			],
+		}
+		const deviceId = await chooseDevice(this, this.args.deviceId, { deviceListOptions, deviceListFilter })
+
+		const listItems = this.flags['include-non-matching']
+			? () => listAllAvailableDrivers(this.client, deviceId, hubId)
+			: () => listMatchingDrivers(this.client, deviceId, hubId)
+		const driverId = await chooseDriver(this, 'Choose a driver to use.', this.flags.driver,
+			{ listItems })
+
+		await this.client.hubdevices.switchDriver(driverId, hubId, deviceId)
+		this.log(`updated driver for device ${deviceId} to ${driverId}`)
+	}
+}
diff --git a/packages/edge/src/commands/edge/drivers/uninstall.ts b/packages/edge/src/commands/edge/drivers/uninstall.ts
new file mode 100644
index 000000000..5612974fb
--- /dev/null
+++ b/packages/edge/src/commands/edge/drivers/uninstall.ts
@@ -0,0 +1,32 @@
+import { Flags } from '@oclif/core'
+
+import { EdgeCommand } from '../../../lib/edge-command'
+import { chooseHub, chooseInstalledDriver } from '../../../lib/commands/drivers-util'
+
+
+export default class DriversUninstallCommand extends EdgeCommand<typeof DriversUninstallCommand.flags> {
+	static description = 'uninstall an edge driver from a hub'
+
+	static flags = {
+		...EdgeCommand.flags,
+		hub: Flags.string({
+			char: 'H',
+			description: 'hub id',
+			helpValue: '<UUID>',
+		}),
+	}
+
+	static args = [{
+		name: 'driverId',
+		description: 'id of driver to uninstall',
+	}]
+
+	async run(): Promise<void> {
+		const hubId = await chooseHub(this, 'Select a hub to uninstall from.', this.flags.hub,
+			{ useConfigDefault: true })
+		const driverId = await chooseInstalledDriver(this, hubId, 'Select a driver to uninstall.',
+			this.args.driverId)
+		await this.client.hubdevices.uninstallDriver(driverId, hubId)
+		this.log(`driver ${driverId} uninstalled from hub ${hubId}`)
+	}
+}
diff --git a/packages/edge/src/lib/commands/channels-util.ts b/packages/edge/src/lib/commands/channels-util.ts
new file mode 100644
index 000000000..6495e01b2
--- /dev/null
+++ b/packages/edge/src/lib/commands/channels-util.ts
@@ -0,0 +1,68 @@
+import { Channel, SmartThingsClient, SubscriberType } from '@smartthings/core-sdk'
+
+import {
+	APICommand,
+	ChooseOptions,
+	chooseOptionsWithDefaults,
+	forAllOrganizations,
+	selectFromList,
+	SelectFromListConfig,
+	stringTranslateToId,
+} from '@smartthings/cli-lib'
+
+
+export const listTableFieldDefinitions = ['channelId', 'name', 'description', 'termsOfServiceUrl',
+	'createdDate', 'lastModifiedDate']
+
+export const tableFieldDefinitions = listTableFieldDefinitions
+
+export interface ChooseChannelOptions extends ChooseOptions {
+	includeReadOnly: boolean
+}
+
+export const chooseChannelOptionsWithDefaults = (options?: Partial<ChooseChannelOptions>): ChooseChannelOptions => ({
+	includeReadOnly: false,
+	...chooseOptionsWithDefaults(options),
+})
+
+export async function chooseChannel(command: APICommand<typeof APICommand.flags>, promptMessage: string,
+		channelFromArg?: string,
+		options?: Partial<ChooseChannelOptions>): Promise<string> {
+	const opts = chooseChannelOptionsWithDefaults(options)
+	const config: SelectFromListConfig<Channel> = {
+		itemName: 'channel',
+		primaryKeyName: 'channelId',
+		sortKeyName: 'name',
+	}
+
+	const listItems = (): Promise<Channel[]> => listChannels(command.client, { includeReadOnly: opts.includeReadOnly })
+
+	const preselectedId = channelFromArg
+		? (opts.allowIndex
+			? await stringTranslateToId(config, channelFromArg, listItems)
+			: channelFromArg)
+		: undefined
+
+	const configKeyForDefaultValue = opts.useConfigDefault ? 'defaultChannel' : undefined
+	return selectFromList(command, config,
+		{ preselectedId, listItems, promptMessage, configKeyForDefaultValue })
+}
+
+export interface ListChannelOptions {
+	allOrganizations: boolean
+	includeReadOnly: boolean
+	subscriberType?: SubscriberType
+	subscriberId?: string
+}
+export async function listChannels(client: SmartThingsClient, options?: Partial<ListChannelOptions>): Promise<Channel[]> {
+	const includeReadOnly = options?.includeReadOnly
+	const subscriberType = options?.subscriberType
+	const subscriberId = options?.subscriberId
+	if (options?.allOrganizations) {
+		if (includeReadOnly) {
+			throw Error('includeReadOnly and allOrganizations options are incompatible')
+		}
+		return await forAllOrganizations(client, orgClient => orgClient.channels.list({ subscriberType, subscriberId }))
+	}
+	return client.channels.list({ includeReadOnly, subscriberType, subscriberId })
+}
diff --git a/packages/edge/src/lib/commands/drivers-util.ts b/packages/edge/src/lib/commands/drivers-util.ts
new file mode 100644
index 000000000..51b6bf9e7
--- /dev/null
+++ b/packages/edge/src/lib/commands/drivers-util.ts
@@ -0,0 +1,207 @@
+import {
+	Device,
+	DeviceIntegrationType,
+	DriverChannelDetails,
+	EdgeDriver,
+	EdgeDriverSummary,
+	InstalledDriver,
+	SmartThingsClient,
+} from '@smartthings/core-sdk'
+
+import {
+	APICommand,
+	ChooseOptions,
+	chooseOptionsDefaults,
+	chooseOptionsWithDefaults,
+	forAllOrganizations,
+	selectFromList,
+	SelectFromListConfig,
+	stringTranslateToId,
+	summarizedText,
+	TableGenerator,
+} from '@smartthings/cli-lib'
+
+
+export const listTableFieldDefinitions = ['driverId', 'name', 'version', 'packageKey']
+
+export const permissionsValue = (driver: EdgeDriver): string => driver.permissions?.map(permission => permission.name).join('\n') || 'none'
+
+export const buildTableOutput = (tableGenerator: TableGenerator, driver: EdgeDriver): string => {
+	const basicInfo = tableGenerator.buildTableFromItem(driver, [
+		'driverId', 'name', 'version', 'packageKey', 'description',
+		{ label: 'Permissions', value: permissionsValue },
+	])
+
+	const deviceIntegrationProfiles = 'Device Integration Profiles\n' +
+		tableGenerator.buildTableFromList(driver.deviceIntegrationProfiles,
+			['id', 'majorVersion'])
+	let fingerprints = 'No fingerprints specified.'
+	if (driver.fingerprints?.length) {
+		fingerprints = 'Fingerprints\n' +
+			tableGenerator.buildTableFromList(driver.fingerprints, ['id', 'type', 'deviceLabel'])
+	}
+	return `Basic Information\n${basicInfo}\n\n` +
+		`${deviceIntegrationProfiles}\n\n` +
+		`${fingerprints}\n\n` +
+		summarizedText
+}
+
+export const listDrivers = async (client: SmartThingsClient, includeAllOrganizations?: boolean): Promise<EdgeDriver[]> =>
+	includeAllOrganizations
+		? forAllOrganizations(client, orgClient => orgClient.drivers.list())
+		: client.drivers.list()
+
+/**
+ * Filter the driver currently in use by a device out of a list of drivers.
+ */
+export const withoutCurrentDriver = async (client: SmartThingsClient, deviceId: string, drivers: DriverChoice[]): Promise<DriverChoice[]> => {
+	const device = await client.devices.get(deviceId)
+	const currentDriverId = device.lan?.driverId ??
+		device.matter?.driverId ??
+		device.zigbee?.driverId ??
+		device.zwave?.driverId
+
+	return drivers.filter(driver => driver.driverId !== currentDriverId)
+}
+
+export const listAllAvailableDrivers = async (client: SmartThingsClient, deviceId: string, hubId: string): Promise<DriverChoice[]> => {
+	const installedDrivers = await client.hubdevices.listInstalled(hubId)
+	const defaultDrivers = (await client.drivers.listDefault())
+		.filter(driver => !installedDrivers.find(installed => installed.driverId === driver.driverId))
+	return withoutCurrentDriver(client, deviceId, [...installedDrivers, ...defaultDrivers ])
+}
+
+export const listMatchingDrivers = async (client: SmartThingsClient, deviceId: string, hubId: string): Promise<DriverChoice[]> =>
+	withoutCurrentDriver(client, deviceId, await client.hubdevices.listInstalled(hubId, deviceId))
+
+/**
+ * When presenting a list of drivers to choose from, we only use the `driverId` and `name` fields.
+ * Using this type instead of `EdgeDriverSummary` allows the caller of `chooseDriver` (below)
+ * to use functions that return other objects as long as they include these two fields.
+ */
+export type DriverChoice = Pick<EdgeDriverSummary, 'driverId' | 'name'>
+
+export interface ChooseDriverOptions extends ChooseOptions {
+	/**
+	 * By default drivers owned by the user are included, using `command.client.drivers.list()`
+	 * but if you need a different list of drivers, you can include your own function here.
+	 */
+	listItems: () => Promise<DriverChoice[]>
+}
+
+export async function chooseDriver(command: APICommand<typeof APICommand.flags>, promptMessage: string, commandLineDriverId?: string,
+		options?: Partial<ChooseDriverOptions>): Promise<string> {
+	const opts = {
+		...chooseOptionsDefaults,
+		listItems: (): Promise<DriverChoice[]> => command.client.drivers.list(),
+		...options,
+	}
+	const config: SelectFromListConfig<DriverChoice> = {
+		itemName: 'driver',
+		primaryKeyName: 'driverId',
+		sortKeyName: 'name',
+	}
+	const preselectedId = opts.allowIndex
+		? await stringTranslateToId(config, commandLineDriverId, opts.listItems)
+		: commandLineDriverId
+	return selectFromList(command, config, { preselectedId, listItems: opts.listItems, promptMessage })
+}
+
+export const chooseHub = async (command: APICommand<typeof APICommand.flags>, promptMessage: string,
+		commandLineHubId: string | undefined,
+		options?: Partial<ChooseOptions>): Promise<string> => {
+	const opts = chooseOptionsWithDefaults(options)
+	const config: SelectFromListConfig<Device> = {
+		itemName: 'hub',
+		primaryKeyName: 'deviceId',
+		sortKeyName: 'name',
+		listTableFieldDefinitions: ['label', 'name', 'deviceId'],
+	}
+
+	const listItems = async (): Promise<Device[]> => {
+		const hubs = await command.client.devices.list({ type: DeviceIntegrationType.HUB })
+		const locationIds = new Set<string>()
+		hubs.forEach(hub => {
+			if (hub.locationId !== undefined) {
+				locationIds.add(hub.locationId)
+			} else {
+				command.logger.warn('hub record found without locationId', hub)
+			}
+		})
+
+		// remove shared locations
+		for (const locationId of locationIds) {
+			const location = await command.client.locations.get(locationId, { allowed: true })
+
+			if (!location.allowed?.includes('d:locations')) {
+				command.logger.warn('filtering out location', location)
+				locationIds.delete(location.locationId)
+			}
+		}
+
+		const ownHubs = hubs.filter(hub => hub.locationId && locationIds.has(hub.locationId))
+
+		return ownHubs
+	}
+
+	const preselectedId = commandLineHubId
+		? (opts.allowIndex
+			? await stringTranslateToId(config, commandLineHubId, listItems)
+			: commandLineHubId)
+		: undefined
+
+	const configKeyForDefaultValue = opts.useConfigDefault ? 'defaultHub' : undefined
+	return selectFromList(command, config,
+		{ preselectedId, listItems, promptMessage, configKeyForDefaultValue })
+}
+
+export interface DriverChannelDetailsWithName extends DriverChannelDetails {
+	name: string
+}
+
+export const listAssignedDriversWithNames = async (client: SmartThingsClient, channelId: string): Promise<DriverChannelDetailsWithName[]> => {
+	const drivers = await client.channels.listAssignedDrivers(channelId)
+	return (await Promise.all(
+		drivers.map(async driver => {
+			try {
+				const driverInfo = await client.channels.getDriverChannelMetaInfo(channelId, driver.driverId)
+				return {
+					...driver,
+					name: driverInfo.name,
+				}
+			} catch (error) {
+				// There is currently a bug in the API that causes `listAssignedDrivers`
+				// to return drivers that were deleted but not removed from the channel.
+				// We can tell they have been deleted because we get a 404 on the call
+				// to `getRevision`, so we'll just skip them until the API is fixed.
+				if (error.response?.status === 404) {
+					return undefined
+				}
+				throw error
+			}
+		}))).filter((driver): driver is DriverChannelDetailsWithName => !!driver)
+}
+
+export const chooseDriverFromChannel = async (command: APICommand<typeof APICommand.flags>, channelId: string,
+		preselectedId?: string): Promise<string> => {
+	const config: SelectFromListConfig<DriverChannelDetailsWithName> = {
+		itemName: 'driver',
+		primaryKeyName: 'driverId',
+		sortKeyName: 'name',
+	}
+	const listItems = (): Promise<DriverChannelDetailsWithName[]> => listAssignedDriversWithNames(command.client, channelId)
+	return selectFromList(command, config,
+		{ preselectedId, listItems, promptMessage: 'Select a driver to install.' })
+}
+
+export const chooseInstalledDriver = async (command: APICommand<typeof APICommand.flags>, hubId: string, promptMessage: string, commandLineDriverId?: string): Promise<string> => {
+	const config: SelectFromListConfig<InstalledDriver> = {
+		itemName: 'driver',
+		primaryKeyName: 'driverId',
+		sortKeyName: 'name',
+	}
+
+	const listItems = (): Promise<InstalledDriver[]> => command.client.hubdevices.listInstalled(hubId)
+	const preselectedId = await stringTranslateToId(config, commandLineDriverId, listItems)
+	return selectFromList(command, config, { preselectedId, listItems, promptMessage })
+}
diff --git a/packages/edge/src/lib/commands/drivers/logcat-util.ts b/packages/edge/src/lib/commands/drivers/logcat-util.ts
new file mode 100644
index 000000000..0d6585243
--- /dev/null
+++ b/packages/edge/src/lib/commands/drivers/logcat-util.ts
@@ -0,0 +1,11 @@
+/**
+ * Wait "forever" for messages or until process is interrupted.
+ *
+ * oclif will timeout if Node is still running for some time after
+ * Command.run() resolves.
+ *
+ * @returns Promise that never resolves or rejects
+ */
+export const runForever = async (): Promise<void> => {
+	return new Promise(() => undefined)
+}
diff --git a/packages/edge/src/lib/commands/drivers/package-util.ts b/packages/edge/src/lib/commands/drivers/package-util.ts
new file mode 100644
index 000000000..ed791e3b8
--- /dev/null
+++ b/packages/edge/src/lib/commands/drivers/package-util.ts
@@ -0,0 +1,115 @@
+import fs from 'fs'
+
+import { CliUx, Errors } from '@oclif/core'
+import JSZip from 'jszip'
+import picomatch from 'picomatch'
+
+import { fileExists, findYAMLFilename, isDir, isFile, isSymbolicLink, readYAMLFile,
+	realPathForSymbolicLink, requireDir, YAMLFileData } from '../../file-util'
+
+
+// Utility methods specific to the `edge:drivers:package` command. Split out here to make
+// unit testing easier.
+
+export const resolveProjectDirName = async (projectDirNameFromArgs: string): Promise<string> => {
+	let calculatedProjectDirName = projectDirNameFromArgs
+	if (calculatedProjectDirName.endsWith('/')) {
+		calculatedProjectDirName = calculatedProjectDirName.slice(0, -1)
+	}
+	if (!await isDir(calculatedProjectDirName)) {
+		throw new Errors.CLIError(`${calculatedProjectDirName} must exist and be a directory`)
+	}
+	return calculatedProjectDirName
+}
+
+export const processConfigFile = async (projectDirectory: string, zip: JSZip): Promise<YAMLFileData> => {
+	const configFile = await findYAMLFilename(`${projectDirectory}/config`)
+	if (configFile === false) {
+		throw new Errors.CLIError('missing main config.yaml (or config.yml) file')
+	}
+
+	const parsedConfig = readYAMLFile(configFile)
+
+	zip.file('config.yml', fs.createReadStream(configFile))
+
+	return parsedConfig
+}
+
+export const processFingerprintsFile = async (projectDirectory: string, zip: JSZip): Promise<void> => {
+	const fingerprintsFile = await findYAMLFilename(`${projectDirectory}/fingerprints`)
+	if (fingerprintsFile !== false) {
+		// validate file is at least parsable as a YAML file
+		readYAMLFile(fingerprintsFile)
+		zip.file('fingerprints.yml', fs.createReadStream(fingerprintsFile))
+	}
+}
+
+export const buildTestFileMatchers = (matchersFromConfig: string[]): picomatch.Matcher[] =>
+	matchersFromConfig.map(glob => picomatch(glob))
+
+export const processSrcDir = async (projectDirectory: string, zip: JSZip, testFileMatchers: picomatch.Matcher[]): Promise<boolean> => {
+	const srcDir = await requireDir(`${projectDirectory}/src`)
+	if (!await isFile(`${srcDir}/init.lua`)) {
+		throw new Errors.CLIError(`missing required ${srcDir}/init.lua file`)
+	}
+
+	let successful = true
+	const fatalIssue = (message: string): void => {
+		successful = false
+		CliUx.ux.error(message, { exit: false })
+	}
+
+	// The max depth is 10 but the main project directory and the src directory itself count,
+	// so we start at 2.
+	const walkDir = async (fromDir: string, nested = 2): Promise<void> => {
+		await Promise.all(fs.readdirSync(fromDir).map(async filename => {
+			const fullFilename = `${fromDir}/${filename}`
+			if (await fileExists(fullFilename)) {
+				const isLink = await isSymbolicLink(fullFilename)
+				const resolvedFilename = isLink ? await realPathForSymbolicLink(fullFilename) : fullFilename
+				if (await isDir(resolvedFilename)) {
+					if (isLink) {
+						fatalIssue(`sym links to directories are not allowed (${fullFilename})`)
+					} else {
+						// maximum depth is defined by server
+						if (nested < 10) {
+							await walkDir(fullFilename, nested + 1)
+						} else {
+							fatalIssue(`drivers directory nested too deeply (at ${fullFilename}); max depth is 10`)
+						}
+					}
+				} else {
+					const filenameForTestMatch = fullFilename.substring(srcDir.length + 1)
+					if (!testFileMatchers.some(matcher => matcher(filenameForTestMatch))) {
+						const archiveName = `src${fullFilename.substring(srcDir.length)}`
+						zip.file(archiveName, fs.createReadStream(fullFilename))
+					}
+				}
+			} else {
+				fatalIssue(`sym link ${fullFilename} points to non-existent file`)
+			}
+		}))
+	}
+
+	await walkDir(srcDir)
+	return successful
+}
+
+export const processProfiles = async (projectDirectory: string, zip: JSZip): Promise<void> => {
+	const profilesDir = await requireDir(`${projectDirectory}/profiles`)
+
+	for (const filename of fs.readdirSync(profilesDir)) {
+		const fullFilename = `${profilesDir}/${filename}`
+		if (filename.endsWith('.yaml') || filename.endsWith('.yml')) {
+			// read and parse to make sure profiles are at least valid yaml
+			readYAMLFile(fullFilename)
+			let archiveName = `profiles${fullFilename.substring(profilesDir.length)}`
+			if (archiveName.endsWith('.yaml')) {
+				archiveName = `${archiveName.slice(0, -4)}yml`
+			}
+			zip.file(archiveName, fs.createReadStream(fullFilename))
+		} else {
+			throw new Errors.CLIError(`invalid profile file "${fullFilename}" (must have .yaml or .yml extension)`)
+		}
+	}
+}
diff --git a/packages/edge/src/lib/edge-client.ts b/packages/edge/src/lib/edge-client.ts
new file mode 100644
index 000000000..9838624ea
--- /dev/null
+++ b/packages/edge/src/lib/edge-client.ts
@@ -0,0 +1,20 @@
+import { Authenticator, RESTClient, RESTClientConfig } from '@smartthings/core-sdk'
+
+import { InvitesEndpoint } from './endpoints/invites'
+import { HttpClientHeaders } from '@smartthings/core-sdk'
+
+
+export class EdgeClient extends RESTClient {
+	public readonly invites: InvitesEndpoint
+
+	constructor(authenticator: Authenticator, config?: RESTClientConfig) {
+		super(authenticator, config)
+
+		this.invites = new InvitesEndpoint(this.config)
+	}
+
+	public cloneEdge(headers?: HttpClientHeaders): EdgeClient {
+		const config: RESTClientConfig = { ...this.config, headers: { ...this.config.headers, ...headers } }
+		return new EdgeClient(this.config.authenticator, config)
+	}
+}
diff --git a/packages/edge/src/lib/edge-command.ts b/packages/edge/src/lib/edge-command.ts
new file mode 100644
index 000000000..0f2c13015
--- /dev/null
+++ b/packages/edge/src/lib/edge-command.ts
@@ -0,0 +1,23 @@
+import log4js from '@log4js-node/log4js-api'
+import { APIOrganizationCommand } from '@smartthings/cli-lib'
+
+import { EdgeClient } from './edge-client'
+
+
+export abstract class EdgeCommand<T extends typeof EdgeCommand.flags> extends APIOrganizationCommand<T> {
+	static flags = APIOrganizationCommand.flags
+
+	private _edgeClient!: EdgeClient
+
+	get edgeClient(): EdgeClient {
+		return this._edgeClient
+	}
+
+	async init(): Promise<void> {
+		await super.init()
+
+		const logger = log4js.getLogger('rest-client')
+		this._edgeClient = new EdgeClient(this.authenticator,
+			{ urlProvider: this.clientIdProvider, logger, headers: this.client.config.headers })
+	}
+}
diff --git a/packages/edge/src/lib/endpoints/invites.ts b/packages/edge/src/lib/endpoints/invites.ts
new file mode 100644
index 000000000..bb73f15ce
--- /dev/null
+++ b/packages/edge/src/lib/endpoints/invites.ts
@@ -0,0 +1,66 @@
+import { Endpoint, EndpointClient, EndpointClientConfig } from '@smartthings/core-sdk'
+
+
+export interface InvitationMetadata {
+	name: string
+	description: string
+	owner: string
+	termsUrl: string
+}
+
+export interface CreateInvitation {
+	resource: {
+		root: {
+			service: 'core' | 'iam' | 'platform' | 'mdu' | 'developer'
+			id?: string
+		}
+		components: {
+			kind: 'root' | 'location' | 'device' | 'user' | 'property' | 'group' | 'role' | 'policy' | 'unit' | 'partner' | 'installedapp' | 'channel' | 'deviceprofile' | 'namespace' | 'driver'
+			id: string
+		}[]
+	}
+	profileId: string
+	metadata: InvitationMetadata
+
+	/**
+	 * optional expiration in seconds from the epoch
+	 */
+	expiration?: number
+}
+
+export interface Invitation extends CreateInvitation {
+	id: string
+	acceptUrl: string
+}
+
+export interface InvitationSummary {
+	invitationId: string
+	acceptUrl: string
+}
+
+
+export class InvitesEndpoint extends Endpoint {
+	constructor(config: EndpointClientConfig) {
+		super(new EndpointClient('invites', config))
+	}
+
+	public async create(invitation: CreateInvitation): Promise<InvitationSummary> {
+		return this.client.post('', invitation)
+	}
+
+	public async get(id: string): Promise<Invitation> {
+		return this.client.get(id)
+	}
+
+	public async list(channelId: string): Promise<Invitation[]> {
+		return this.client.getPagedItems('', { resource: `st1:developer::channel/${channelId}` })
+	}
+
+	public async delete(id: string): Promise<void> {
+		await this.client.delete(id)
+	}
+
+	public async accept(id: string): Promise<void> {
+		await this.client.put(`${id}/accept`)
+	}
+}
diff --git a/packages/edge/src/lib/file-util.ts b/packages/edge/src/lib/file-util.ts
new file mode 100644
index 000000000..024098046
--- /dev/null
+++ b/packages/edge/src/lib/file-util.ts
@@ -0,0 +1,78 @@
+import fs from 'fs'
+
+import { Errors } from '@oclif/core'
+import yaml from 'js-yaml'
+
+
+export const fileExists = async (path: string): Promise<boolean> => {
+	try {
+		await fs.promises.stat(path)
+		return true
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false
+		}
+		throw error
+	}
+}
+
+export const isFile = async (path: string): Promise<boolean> =>
+	await fileExists(path) && (await fs.promises.stat(path)).isFile()
+
+export const isDir = async (path: string): Promise<boolean> =>
+	await fileExists(path) && (await fs.promises.stat(path)).isDirectory()
+
+export const isSymbolicLink = async (path: string): Promise<boolean> =>
+	(await fs.promises.lstat(path)).isSymbolicLink()
+
+export const realPathForSymbolicLink = async (path: string): Promise<string> =>
+	await fs.promises.realpath(path)
+
+export const findYAMLFilename = async (baseName: string): Promise<string | false> => {
+	let retVal = `${baseName}.yaml`
+	if (await isFile(retVal)) {
+		return retVal
+	}
+
+	retVal = `${baseName}.yml`
+	if (await isFile(retVal)) {
+		return retVal
+	}
+
+	return false
+}
+
+export const requireDir = async (dirName: string): Promise<string> => {
+	if (await isDir(dirName)) {
+		return dirName
+	}
+	throw new Errors.CLIError(`missing required directory: ${dirName}`)
+}
+
+export interface YAMLFileData {
+	[key: string]: string | object | number | undefined
+}
+
+const isYAMLFileData = (data: unknown): data is YAMLFileData => {
+	return data !== null &&
+		typeof data === 'object' &&
+		Object.keys(data).length > 0 &&
+		Object.values(data).every(value => ['string', 'object', 'number'].includes(typeof value))
+}
+
+export const readYAMLFile = (filename: string): YAMLFileData => {
+	try {
+		const data = yaml.load(fs.readFileSync(filename, 'utf-8'))
+		if (isYAMLFileData(data)) {
+			return data
+		}
+
+		if (data == null) {
+			throw new Error('empty file')
+		}
+
+		throw new Error('invalid file')
+	} catch (error) {
+		throw new Errors.CLIError(`error "${error.message}" reading ${filename}`)
+	}
+}
diff --git a/packages/edge/src/lib/live-logging.ts b/packages/edge/src/lib/live-logging.ts
new file mode 100644
index 000000000..d4620bb6b
--- /dev/null
+++ b/packages/edge/src/lib/live-logging.ts
@@ -0,0 +1,284 @@
+import axios, { AxiosError, AxiosResponse, Method } from 'axios'
+import https from 'https'
+import net from 'net'
+import log4js from '@log4js-node/log4js-api'
+import { bgBlue, bgCyan, bgGray, bgGreen, bgRed, bgYellow, black, EventFormat } from '@smartthings/cli-lib'
+import { Authenticator } from '@smartthings/core-sdk'
+import { Errors } from '@oclif/core'
+import { PeerCertificate, TLSSocket } from 'tls'
+import { ClientRequest } from 'http'
+import { inspect } from 'util'
+import os from 'os'
+
+
+export enum LogLevel {
+	TRACE = 100,
+	DEBUG = 200,
+	INFO = 300,
+	WARN = 400,
+	ERROR = 500,
+	FATAL = 600,
+	PRINT = 1000,
+}
+
+export interface LiveLogMessage {
+	/*
+	 * The ISO formatted Local timestamp
+	 */
+	timestamp: string
+	/**
+	 * A UUID for this driver
+	 */
+	driver_id: string
+	/**
+	 * The human readable name of this driver
+	 */
+	driver_name: string
+	/**
+	 * The level this message is logged at
+	 */
+	log_level: number
+	/**
+	 * The content of this message
+	 */
+	message: string
+}
+
+export function isLiveLogMessage(event: unknown): event is LiveLogMessage {
+	const liveLogEvent = event as LiveLogMessage
+	return liveLogEvent.timestamp !== undefined &&
+		liveLogEvent.driver_id !== undefined &&
+		liveLogEvent.driver_name !== undefined &&
+		liveLogEvent.log_level !== undefined &&
+		liveLogEvent.message !== undefined
+}
+
+export enum DriverInfoStatus {
+	NoArchive = 'no archive',
+	Downloading = 'downloading',
+	Installed = 'installed',
+	Failure = 'failure',
+	Unknown = 'unknown',
+}
+
+export interface DriverInfo {
+	/**
+	 * A UUID for this driver
+	 * */
+	driver_id: string
+	/**
+	 * The human readable name of this driver
+	 * */
+	driver_name: string
+	/**
+	 * If installed, the sha256 hash of the archive that was downloaded
+	 * */
+	archive_hash?: string | null
+	/**
+	 * The current status of this driver
+	 * */
+	status: string
+}
+
+function logLevelColor(level: LogLevel): string {
+	const bgTrace = bgGreen
+	const bgDebug = bgCyan
+	const bgInfo = bgBlue
+	const bgWarn = bgYellow
+	const bgError = bgRed
+	const bgFatal = bgGray
+	const bgPrint = bgGray
+
+	let colorString: string
+
+	switch (level) {
+		case LogLevel.TRACE:
+			colorString = bgTrace(LogLevel[LogLevel.TRACE])
+			break
+		case LogLevel.DEBUG:
+			colorString = bgDebug(LogLevel[LogLevel.DEBUG])
+			break
+		case LogLevel.INFO:
+			colorString = bgInfo(LogLevel[LogLevel.INFO])
+			break
+		case LogLevel.WARN:
+			colorString = bgWarn(LogLevel[LogLevel.WARN])
+			break
+		case LogLevel.ERROR:
+			colorString = bgError(LogLevel[LogLevel.ERROR])
+			break
+		case LogLevel.FATAL:
+			colorString = bgFatal(LogLevel[LogLevel.FATAL])
+			break
+		case LogLevel.PRINT:
+			colorString = bgPrint(LogLevel[LogLevel.PRINT])
+			break
+		default:
+			throw Error('Unknown log level')
+	}
+
+	// black text seems to provide better contrast in most terminals
+	return black(colorString)
+}
+
+export function liveLogMessageFormatter(event: unknown): EventFormat {
+	if (isLiveLogMessage(event)) {
+		const formatString = `${logLevelColor(event.log_level)} ${event.driver_name}  ${event.message}`
+		const time = event.timestamp
+
+		return { formatString, time }
+	}
+
+	throw Error('Unexpected log message type.')
+}
+
+export function parseIpAndPort(address: string): [string, string | undefined] {
+	const items = address.split(':')
+	if (items.length > 2) {
+		throw new Errors.CLIError('Invalid IPv4 address and port format.')
+	}
+
+	if (!net.isIPv4(items[0])) {
+		throw new Errors.CLIError('Invalid IPv4 address format.')
+	}
+
+	const ipv4 = items[0]
+	if (items.length == 1) {
+		return [ipv4, undefined]
+	}
+
+	const port = Number(items[1])
+	if (Number.isInteger(port) && port >= 0 && port <= 65535) {
+		return [ipv4, port.toString()]
+	}
+
+	throw new Errors.CLIError('Invalid port format.')
+}
+
+export function handleConnectionErrors(authority: string, error: string): never | void {
+	const generalMessage = 'Ensure hub address is correct and try again'
+
+	if (error.includes('ECONNREFUSED') || error.includes('EHOSTUNREACH')) {
+		throw new Errors.CLIError(`Unable to connect to ${authority}. ${generalMessage}`)
+	} else if (error.includes('ETIMEDOUT')) {
+		throw new Errors.CLIError(`Connection to ${authority} timed out. ${generalMessage}`)
+	} else if (error.includes('EHOSTDOWN')) {
+		throw new Errors.CLIError(`The host at ${authority} is down. ${generalMessage}`)
+	}
+}
+
+export function networkEnvironmentInfo(): string {
+	return inspect(os.networkInterfaces())
+}
+
+function scrubAuthInfo(obj: unknown): string {
+	const message = inspect(obj)
+	const bearerRegex = /(Bearer [0-9a-f]{8})[0-9a-f-]{28}/i
+
+	if (bearerRegex.test(message)) {
+		return message.replace(bearerRegex, '$1-xxxx-xxxx-xxxx-xxxxxxxxxxxx')
+	} else { // assume there is some other auth format and redact the entire header value
+		const authHeaderRegex = /'(Authorization: )([\s\S]*)'/i
+		return message.replace(authHeaderRegex, '$1(redacted)')
+	}
+}
+
+/**
+ * Expected to manually verify the connected host (similar to overriding tls.checkServerIdentity)
+ * by means that LiveLogClient isn't aware of ahead of time.
+ */
+export type HostVerifier = (cert: PeerCertificate) => Promise<void | never>
+
+export interface LiveLogClientConfig {
+	/**
+	 * @example 192.168.0.1:9495
+	 */
+	authority: string
+	authenticator: Authenticator
+	verifier?: HostVerifier
+	/**
+	 * milliseconds
+	 */
+	timeout: number
+	userAgent: string
+}
+
+export class LiveLogClient {
+	private driversURL: URL
+	private logsURL: URL
+	private hostVerified: boolean
+
+	constructor(private readonly config: LiveLogClientConfig) {
+		const baseURL = new URL(`https://${config.authority}`)
+
+		this.driversURL = new URL('drivers', baseURL)
+		this.logsURL = new URL('drivers/logs', baseURL)
+		this.hostVerified = config.verifier === undefined
+	}
+
+	private async request(url: string, method: Method = 'GET'): Promise<AxiosResponse> {
+		const config = await this.config.authenticator.authenticate({
+			url: url,
+			method: method,
+			httpsAgent: new https.Agent({ rejectUnauthorized: false }),
+			timeout: this.config.timeout,
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			headers: { 'User-Agent': this.config.userAgent },
+			transitional: {
+				silentJSONParsing: true,
+				forcedJSONParsing: true,
+				// throw ETIMEDOUT error instead of generic ECONNABORTED on request timeouts
+				clarifyTimeoutError: true,
+			},
+		})
+
+		let response
+		try {
+			response = await axios.request(config)
+		} catch (error) {
+			if (error.isAxiosError) {
+				const axiosError = error as AxiosError
+				const cliLogger = log4js.getLogger('cli')
+				if (cliLogger.isDebugEnabled()) {
+					const errorString = scrubAuthInfo(axiosError.toJSON())
+					cliLogger.debug(`Error connecting to live-logging: ${errorString}\n\nLocal network interfaces: ${networkEnvironmentInfo()}`)
+				}
+
+				this.handleAxiosConnectionErrors(axiosError)
+			}
+
+			throw error
+		}
+
+		if (!this.hostVerified && this.config.verifier) {
+			await this.config.verifier(this.getCertificate(response))
+			this.hostVerified = true
+		}
+
+		return response
+	}
+
+	private handleAxiosConnectionErrors(error: AxiosError): never | void {
+		if (error.code) {
+			handleConnectionErrors(this.config.authority, error.code)
+		}
+	}
+
+	private getCertificate(response: AxiosResponse): PeerCertificate {
+		return ((response.request as ClientRequest).socket as TLSSocket).getPeerCertificate()
+	}
+
+	public async getDrivers(): Promise<DriverInfo[]> {
+		return (await this.request(this.driversURL.toString())).data
+	}
+
+	public getLogSource(driverId?: string): string {
+		const sourceURL = this.logsURL
+
+		if (driverId) {
+			sourceURL.searchParams.set('driver_id', driverId)
+		}
+
+		return sourceURL.toString()
+	}
+}
diff --git a/packages/edge/tsconfig.json b/packages/edge/tsconfig.json
new file mode 100644
index 000000000..9a8e497dc
--- /dev/null
+++ b/packages/edge/tsconfig.json
@@ -0,0 +1,21 @@
+{
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./lib",
+		"rootDir": "./src"
+	},
+	"references": [
+		{
+			"path": "../lib",
+			"name": "@smartthings/cli-lib"
+		},
+		{
+			"path": "../testlib",
+			"name": "@smartthings/cli-testlib"
+		}
+	],
+	"exclude": [
+		"node_modules",
+		"lib"
+	]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 07f303264..afeb74d33 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,6 +17,10 @@
 			"path": "packages/cli",
 			"name": "@smartthings/cli"
 		},
+		{
+			"path": "packages/edge",
+			"name": "@smartthings/plugin-cli-edge"
+		},
 		{
 			"path": "packages/lib",
 			"name": "@smartthings/cli-lib"