@dxos/cli 0.1.53-main.14243d1 → 0.1.53-main.1900d90

package/README.md

@@ -2,21 +2,74 @@
 
 DXOS command line interface.
 
-TODO(wittjosiah): Add oclif-specific linting rules.
+<!-- toc -->
+* [DX CLI](#dx-cli)
+* [Instalation](#instalation)
+* [Running an Agent](#running-an-agent)
+* [Development](#development)
+* [Usage](#usage)
+<!-- tocstop -->
+
+# Instalation
+```terminal
+npm install -g @dxos/cli@main
+```
+---
+# Running an Agent
+Agent is a name for DXOS Client which is run by CLI in the background in the daemonized process. 
+## Starting agent
+Agent is automatically started by each command that requires Client (to avoid this behavior use `--no-agent` flag). You can use `--profile` flag (default value is `default`) to run agent in an isolated profile, and `--foreground` to run agent in attached process.
+```terminal
+dx agent start
+```
+see: [dx agent start](#dx-agent-start)
+
+## Adding Agent to your Composer Identity 
+1. Go to [Composer](https://composer.dev.dxos.org). And create a device invitation.
+![Composer add device](./public/composer-sidebar.png)
+![Composer invitation](./public/composer-add-device.png)
+
+1. Run halo join command in your terminal.
+![CLI halo join flow](./public/cli-halo-join.png)
+
+1. Proceed with invitation
+
+## Troubleshooting
+1. Make sure you are running the latest version of the shared worker in the browser. Go to the shared workers tab chrome://inspect/#workers, kill `dxos-vault` worker, then reload the Composer tab.
+2. Restart your agent with [```dx agent restart```](#dx-agent-restart). Also useful command[ ```dx agent stop --all```](#dx-agent-stop)
+#### Danger Zone
+3. Reset Storage. Warning: Agent will lose its storage, and config file will be deleted [```dx reset --force```](#dx-reset)
+---
+
 
 # Development
 
-Run the build script from the root directory.
+To build the CLI:
+
+```bash
+nx run cli:build --watch=true
+```
+
+Run the CLI from the local directory:
 
 ```bash
-$ nx run cli:build --watch=true
+./bin/run config --json
+```
+
+Or source the following script to set the `dx` alias from any directory in the repo.
+
+```bash
+. $(git rev-parse --show-toplevel)/packages/devtools/cli/scripts/dev.sh
+
+dx config --json
 ```
 
-Run the CLI in the local directory.
+## Reporting errors
+
+Run the following command to create a gist of the debug stats.
 
 ```bash
-$ export DX_CONFIG=./config/config.yml
-$ ./bin/run config --json
+dx debug stats --json --no-agent | gh gist create
 ```
 
 # Usage
@@ -27,7 +80,7 @@ $ npm install -g @dxos/cli
 $ dx COMMAND
 running command...
 $ dx (--version)
-@dxos/cli/0.1.53-main.14243d1 linux-x64 node-v18.16.1
+@dxos/cli/0.1.53-main.1900d90 linux-x64 node-v18.17.0
 $ dx --help [COMMAND]
 USAGE
   $ dx COMMAND
@@ -35,7 +88,7 @@ USAGE
 ```
 <!-- usagestop -->
 
-# Commands
+## Commands
 
 <!-- commands -->
 * [`dx agent list`](#dx-agent-list)
@@ -114,19 +167,19 @@ Restart agent daemon.
 
 ```
 USAGE
-  $ dx agent restart [--json] [--dry-run] [-v] [--config <value> --profile <value>] [--no-agent] [--timeout <value>]
+  $ dx agent restart [--json] [--dry-run] [-v] [--config <value> --profile <value>] [--no-agent] [--timeout
+    <value>] [--force]
 
 FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --force            Force restart.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Restart agent daemon.
 ```
@@ -146,15 +199,13 @@ FLAGS
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
   --echo=port        Expose ECHO REST API.
+  --json             Output as JSON.
   --monitor          Run epoch monitoring.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
   --web-socket=port  Expose web socket port.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Starts the agent.
 ```
@@ -166,20 +217,19 @@ Stop agent daemon.
 ```
 USAGE
   $ dx agent stop [--json] [--dry-run] [-v] [--config <value> --profile <value>] [--no-agent] [--timeout
-    <value>] [-a]
+    <value>] [--all] [--force]
 
 FLAGS
-  -a, --all          Stop all agents.
   -v, --verbose      Verbose output
+  --all              Stop all agents.
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --force            Force stop.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Stop agent daemon.
 ```
@@ -203,14 +253,12 @@ FLAGS
   -v, --verbose            Verbose output
   --config=path            [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run                Dry run.
+  --json                   Output as JSON.
   --no-agent               Auto-start agent.
   --profile=<value>        [default: default] User profile.
   --tag=<value>            Git tag or branch of the DXOS repo to checkout.
   --timeout=<value>        [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Manage applications.
 ```
@@ -282,15 +330,13 @@ FLAGS
   --config=path          [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --configPath=<value>   Path to dx.yml
   --dry-run              Dry run.
+  --json                 Output as JSON.
   --no-agent             Auto-start agent.
   --profile=<value>      [default: default] User profile.
   --skipExisting         Do not update content on KUBE if version already exists.
   --timeout=<value>      [default: 30] Timeout in seconds.
   --version=<value>      Version of modules to publish.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Publish apps.
 ```
@@ -331,15 +377,13 @@ FLAGS
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
   --humanize         Humanized keys.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
   --truncate         Truncate keys.
   --verbose          Verbose output.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Output debug stats.
 ```
@@ -403,15 +447,13 @@ FLAGS
   -v, --verbose         Verbose output
   --config=path         [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run             Dry run.
+  --json                Output as JSON.
   --manifest=<value>    [default: functions.yml]
   --no-agent            Auto-start agent.
   --profile=<value>     [default: default] User profile.
-  --require=<value>...
+  --require=<value>...  [default: ts-node/register]
   --timeout=<value>     [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Development server.
 
@@ -437,15 +479,13 @@ FLAGS
   -v, --verbose         Verbose output
   --config=path         [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run             Dry run.
+  --json                Output as JSON.
   --manifest=<value>    [default: functions.yml]
   --no-agent            Auto-start agent.
   --profile=<value>     [default: default] User profile.
-  --require=<value>...
+  --require=<value>...  [default: ts-node/register]
   --timeout=<value>     [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Development server.
 
@@ -601,13 +641,11 @@ FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Import credential into HALO.
 ```
@@ -625,14 +663,12 @@ FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
   --type=<value>     Type
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   List HALO credentials.
 ```
@@ -651,13 +687,11 @@ FLAGS
   --config=path         [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run             Dry run.
   --invitation=<value>  Invitation code
+  --json                Output as JSON.
   --no-agent            Auto-start agent.
   --profile=<value>     [default: default] User profile.
   --timeout=<value>     [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Join HALO (device) invitation.
 ```
@@ -705,7 +739,7 @@ DESCRIPTION
   Display help for dx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.8/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.14/src/commands/help.ts)_
 
 ## `dx kube auth`
 
@@ -746,14 +780,12 @@ FLAGS
   --dev                  Deploy latest version from dev channel
   --dry-run              Dry run.
   --hostname=<value>     (required) Hostname
+  --json                 Output as JSON.
   --no-agent             Auto-start agent.
   --profile=<value>      [default: default] User profile.
   --provider=<value>     [default: digitalocean] Cloud Provider
   --timeout=<value>      [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Deploy KUBE.
 ```
@@ -764,11 +796,14 @@ List installed plugins.
 
 ```
 USAGE
-  $ dx plugins [--core]
+  $ dx plugins [--json] [--core]
 
 FLAGS
   --core  Show core plugins.
 
+GLOBAL FLAGS
+  --json  Format output as json.
+
 DESCRIPTION
   List installed plugins.
 
@@ -776,7 +811,7 @@ EXAMPLES
   $ dx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.4.3/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.1.8/src/commands/plugins/index.ts)_
 
 ## `dx plugins:install PLUGIN...`
 
@@ -1005,13 +1040,11 @@ FLAGS
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
   --force            Force delete.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Reset user data.
 ```
@@ -1028,13 +1061,11 @@ FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Interactive shell.
 ```
@@ -1051,13 +1082,11 @@ FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   List spaces.
 ```
@@ -1107,6 +1136,7 @@ FLAGS
   --csv              output is csv format [alias: --output=csv]
   --dry-run          Dry run.
   --filter=<value>   filter property by partial string matching, ex: name=foo
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --no-header        hide table header from output
   --no-truncate      do not truncate output to fit screen
@@ -1116,9 +1146,6 @@ FLAGS
   --sort=<value>     property to sort by (prepend '-' for descending)
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Create new epoch.
 ```
@@ -1136,13 +1163,11 @@ FLAGS
   -v, --verbose      Verbose output
   --config=path      [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run          Dry run.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Create space invitation.
 ```
@@ -1161,14 +1186,12 @@ FLAGS
   --config=path         [default: /home/runner/.config/dx/profile/default.yml] Config file.
   --dry-run             Dry run.
   --invitation=<value>  Invitation code
+  --json                Output as JSON.
   --no-agent            Auto-start agent.
   --profile=<value>     [default: default] User profile.
   --secret=<value>      Invitation secret
   --timeout=<value>     [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Join space invitation
 ```
@@ -1191,6 +1214,7 @@ FLAGS
   --csv              output is csv format [alias: --output=csv]
   --dry-run          Dry run.
   --filter=<value>   filter property by partial string matching, ex: name=foo
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --no-header        hide table header from output
   --no-truncate      do not truncate output to fit screen
@@ -1200,9 +1224,6 @@ FLAGS
   --sort=<value>     property to sort by (prepend '-' for descending)
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   List spaces.
 ```
@@ -1228,6 +1249,7 @@ FLAGS
   --csv              output is csv format [alias: --output=csv]
   --dry-run          Dry run.
   --filter=<value>   filter property by partial string matching, ex: name=foo
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --no-header        hide table header from output
   --no-truncate      do not truncate output to fit screen
@@ -1237,9 +1259,6 @@ FLAGS
   --sort=<value>     property to sort by (prepend '-' for descending)
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   List space members.
 ```
@@ -1283,13 +1302,11 @@ FLAGS
   --disabled         Disable tunnel.
   --dry-run          Dry run.
   --enabled          Enable tunnel.
+  --json             Output as JSON.
   --no-agent         Auto-start agent.
   --profile=<value>  [default: default] User profile.
   --timeout=<value>  [default: 30] Timeout in seconds.
 
-GLOBAL FLAGS
-  --json  Format output as json.
-
 DESCRIPTION
   Enable or disable tunnel.
 ```

package/dist/src/base-command.d.ts

@@ -7,11 +7,12 @@ export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
 /**
  * Custom base command.
  * https://oclif.io/docs/base_class#docsNav
- * Ref: https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
+ * https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
  */
 export declare abstract class BaseCommand<T extends typeof Command = any> extends Command {
     static enableJsonFlag: boolean;
     static flags: {
+        json: Interfaces.BooleanFlag<boolean>;
         'dry-run': Interfaces.BooleanFlag<boolean>;
         verbose: Interfaces.BooleanFlag<boolean>;
         profile: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
@@ -55,6 +56,7 @@ export declare abstract class BaseCommand<T extends typeof Command = any> extend
      * https://oclif.io/docs/error_handling
      */
     error(err: string | Error, options?: any): never;
+    catch(err: Error, options?: any): Promise<void>;
     /**
      * Called after each command run.
      */

package/dist/src/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}

package/dist/src/base-command.js

@@ -42,12 +42,14 @@ const pkg_up_1 = __importDefault(require("pkg-up"));
 const agent_1 = require("@dxos/agent");
 const client_1 = require("@dxos/client");
 const client_protocol_1 = require("@dxos/client-protocol");
+const services_1 = require("@dxos/client/services");
 const debug_1 = require("@dxos/debug");
 const log_1 = require("@dxos/log");
 const Sentry = __importStar(require("@dxos/sentry"));
 const sentry_1 = require("@dxos/sentry");
 const Telemetry = __importStar(require("@dxos/telemetry"));
 const util_1 = require("./util");
+const DEFAULT_CONFIG = 'config/config-default.yml';
 // TODO(wittjosiah): Factor out.
 const exists = async (...args) => {
     try {
@@ -66,7 +68,7 @@ const exists = async (...args) => {
 /**
  * Custom base command.
  * https://oclif.io/docs/base_class#docsNav
- * Ref: https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
+ * https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
  */
 class BaseCommand extends core_1.Command {
     constructor(argv, config) {
@@ -91,7 +93,7 @@ class BaseCommand extends core_1.Command {
         return Date.now() - this._startTime.getTime();
     }
     done() {
-        (0, log_1.log)('ok', {}, { file: "packages/devtools/cli/src/base-command.ts", line: 143, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+        (0, log_1.log)('ok', {}, { file: "packages/devtools/cli/src/base-command.ts", line: 159, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
     }
     /**
      * Load the client config.
@@ -111,13 +113,13 @@ class BaseCommand extends core_1.Command {
         await this._loadConfig();
     }
     async _initTelemetry() {
-        this._telemetryContext = await (0, util_1.getTelemetryContext)(client_1.DX_DATA);
+        this._telemetryContext = await (0, util_1.getTelemetryContext)(client_protocol_1.DX_DATA);
         const { mode, installationId, group, environment, release } = this._telemetryContext;
         {
             if (group === 'dxos') {
-                (0, log_1.log)((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 173, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+                (0, log_1.log)((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 189, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
             }
-            await (0, util_1.showTelemetryBanner)(client_1.DX_DATA);
+            await (0, util_1.showTelemetryBanner)(client_protocol_1.DX_DATA);
         }
         if (util_1.SENTRY_DESTINATION && mode !== 'disabled') {
             Sentry.init({
@@ -134,7 +136,7 @@ class BaseCommand extends core_1.Command {
             });
         }
         if (util_1.TELEMETRY_API_KEY) {
-            mode === 'disabled' && (await (0, util_1.disableTelemetry)(client_1.DX_DATA));
+            mode === 'disabled' && (await (0, util_1.disableTelemetry)(client_protocol_1.DX_DATA));
             Telemetry.init({
                 apiKey: util_1.TELEMETRY_API_KEY,
                 batchSize: 20,
@@ -158,14 +160,14 @@ class BaseCommand extends core_1.Command {
         const { config: configFile } = this.flags;
         const configExists = await exists(configFile);
         if (!configExists) {
-            const defaultConfigPath = (0, node_path_1.join)((0, node_path_1.dirname)((_a = pkg_up_1.default.sync({ cwd: __dirname })) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('Could not find package.json'))), 'config/config-default.yml');
+            const defaultConfigPath = (0, node_path_1.join)((0, node_path_1.dirname)((_a = pkg_up_1.default.sync({ cwd: __dirname })) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('Could not find package.json'))), DEFAULT_CONFIG);
             const yamlConfig = js_yaml_1.default.load(await (0, promises_1.readFile)(defaultConfigPath, 'utf-8'));
             {
                 // Isolate DX_PROFILE storages.
                 (_b = yamlConfig.runtime) !== null && _b !== void 0 ? _b : (yamlConfig.runtime = {});
                 (_c = (_f = yamlConfig.runtime).client) !== null && _c !== void 0 ? _c : (_f.client = {});
                 (_d = (_g = yamlConfig.runtime.client).storage) !== null && _d !== void 0 ? _d : (_g.storage = {});
-                yamlConfig.runtime.client.storage.path = (0, node_path_1.join)((_e = yamlConfig.runtime.client.storage.path) !== null && _e !== void 0 ? _e : client_1.DX_DATA, this.flags.profile);
+                yamlConfig.runtime.client.storage.path = (0, node_path_1.join)((_e = yamlConfig.runtime.client.storage.path) !== null && _e !== void 0 ? _e : client_protocol_1.DX_DATA, this.flags.profile);
             }
             await (0, promises_1.mkdir)((0, node_path_1.dirname)(configFile), { recursive: true });
             await (0, promises_1.writeFile)(configFile, js_yaml_1.default.dump(yamlConfig), 'utf-8');
@@ -193,8 +195,12 @@ class BaseCommand extends core_1.Command {
     }
     error(err, options) {
         super.error(err, options);
-        Sentry.captureException(err);
+    }
+    async catch(err, options) {
+        // Will only submit if API key exists (i.e., prod).
+        super.error(err, options);
         this._failing = true;
+        throw err;
     }
     /**
      * Called after each command run.
@@ -218,7 +224,7 @@ class BaseCommand extends core_1.Command {
                 const running = await daemon.isRunning(this.flags.profile);
                 if (!running) {
                     this.log(`Starting agent (${this.flags.profile})`);
-                    await daemon.start(this.flags.profile);
+                    await daemon.start(this.flags.profile, { config: this.flags.config });
                 }
             });
         }
@@ -229,16 +235,15 @@ class BaseCommand extends core_1.Command {
     async getClient() {
         (0, node_assert_1.default)(this._clientConfig);
         if (!this._client) {
-            (0, node_assert_1.default)(this._clientConfig);
             if (this.flags['no-agent']) {
                 this._client = new client_1.Client({ config: this._clientConfig });
             }
             else {
                 await this.maybeStartDaemon();
-                this._client = new client_1.Client({ config: this._clientConfig, services: (0, client_1.fromAgent)({ profile: this.flags.profile }) });
+                this._client = new client_1.Client({ config: this._clientConfig, services: (0, services_1.fromAgent)({ profile: this.flags.profile }) });
             }
             await this._client.initialize();
-            (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 323, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+            (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 341, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
         }
         return this._client;
     }
@@ -259,7 +264,7 @@ class BaseCommand extends core_1.Command {
      * Convenience function to wrap starting the agent.
      */
     async execWithDaemon(callback) {
-        const daemon = new agent_1.ForeverDaemon(`${client_1.DX_RUNTIME}`);
+        const daemon = new agent_1.ForeverDaemon(client_protocol_1.DX_RUNTIME);
         await daemon.connect();
         const value = await callback(daemon);
         await daemon.disconnect();
@@ -337,6 +342,11 @@ class BaseCommand extends core_1.Command {
 }
 BaseCommand.enableJsonFlag = true;
 BaseCommand.flags = {
+    // Even though oclif should support this out of the box there seems to be a bug.
+    json: core_1.Flags.boolean({
+        description: 'Output as JSON.',
+        default: false,
+    }),
     'dry-run': core_1.Flags.boolean({
         description: 'Dry run.',
         default: false,