@dxos/cli 0.1.53-main.d535786 → 0.1.53-main.e9dc2bc

package/dist/src/util/telemetryrc.json

@@ -1,6 +1,6 @@
 {
     "DX_ENVIRONMENT": "staging",
-    "DX_RELEASE": "@dxos/cli@0.1.53-main.d535786",
+    "DX_RELEASE": "@dxos/cli@0.1.53-main.e9dc2bc",
     "SENTRY_DESTINATION": "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
     "TELEMETRY_API_KEY": "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
     "IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"

package/dist/src/util/test-util.d.ts

@@ -1,2 +1,3 @@
+export declare const BIN_PATH: string;
 export declare const runCommand: (command: string, cwd: string) => Promise<string>;
 //# sourceMappingURL=test-util.d.ts.map

package/dist/src/util/test-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-util.d.ts","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU,YAAmB,MAAM,OAAO,MAAM,oBAK5D,CAAC"}
+{"version":3,"file":"test-util.d.ts","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,QAAQ,QAAiF,CAAC;AAEvG,eAAO,MAAM,UAAU,YAAmB,MAAM,OAAO,MAAM,oBAO5D,CAAC"}

package/dist/src/util/test-util.js

@@ -5,15 +5,24 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommand = void 0;
+exports.runCommand = exports.BIN_PATH = void 0;
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
-const exec_1 = require("./exec");
+const node_path_1 = require("node:path");
+const node_util_1 = require("node:util");
+const pkg_up_1 = __importDefault(require("pkg-up"));
+const async_1 = require("@dxos/async");
+const debug_1 = require("@dxos/debug");
+exports.BIN_PATH = (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.failUndefined)()), 'bin', 'run');
 const runCommand = async (command, cwd) => {
-    const bin = node_path_1.default.join(__dirname, '../../bin/run');
     (0, node_fs_1.mkdirSync)(cwd, { recursive: true });
-    return await (0, exec_1.exec)(`${bin} ${command}`, { cwd, shell: false });
+    const { stdout, stderr } = await (0, async_1.asyncTimeout)((0, node_util_1.promisify)(node_child_process_1.exec)(`${exports.BIN_PATH} ${command}`, { cwd: __dirname }), 20000);
+    if (stderr) {
+        throw new Error(stderr);
+    }
+    return stdout;
 };
 exports.runCommand = runCommand;
 //# sourceMappingURL=test-util.js.map

package/dist/src/util/test-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-util.js","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,qCAAoC;AACpC,0DAA6B;AAE7B,iCAA8B;AAEvB,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,GAAW,EAAE,EAAE;IAC/D,MAAM,GAAG,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAClD,IAAA,mBAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpC,OAAO,MAAM,IAAA,WAAI,EAAC,GAAG,GAAG,IAAI,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB"}
+{"version":3,"file":"test-util.js","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;AAEF,2DAA0C;AAC1C,qCAAoC;AACpC,yCAA0C;AAC1C,yCAAsC;AACtC,oDAA2B;AAE3B,uCAA2C;AAC3C,uCAA4C;AAE/B,QAAA,QAAQ,GAAG,IAAA,gBAAI,EAAC,IAAA,mBAAO,EAAC,MAAA,gBAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,mCAAI,IAAA,qBAAa,GAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEhG,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,GAAW,EAAE,EAAE;IAC/D,IAAA,mBAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,oBAAY,EAAC,IAAA,qBAAS,EAAC,yBAAI,CAAC,CAAC,GAAG,gBAAQ,IAAI,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,KAAM,CAAC,CAAC;IACrH,IAAI,MAAM,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}

package/dist/src/util/tunnel/tunnel-rpc-peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAQA,OAAO,EAAW,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAKnE,qBAAa,aAAa;IASZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAEK,KAAK;CAOZ"}
+{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,KAAK,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,qBAAa,aAAa;IASZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAEK,KAAK;CAOZ"}

package/dist/src/util/tunnel/tunnel-rpc-peer.js

@@ -8,12 +8,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelRpcPeer = void 0;
 // TODO(egorgripasov): Factor out.
-const debug_1 = __importDefault(require("debug"));
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
 const async_1 = require("@dxos/async");
+const log_1 = require("@dxos/log");
 const protocols_1 = require("@dxos/protocols");
 const rpc_1 = require("@dxos/rpc");
-const log = (0, debug_1.default)('dxos:cli:tunnel-rpc-peer');
 class TunnelRpcPeer {
     constructor(_url) {
         this._url = _url;
@@ -25,7 +24,7 @@ class TunnelRpcPeer {
         this._socket.onopen = async () => {
             try {
                 await this._rpc.open();
-                log(`RPC open ${this._url}`);
+                (0, log_1.log)(`RPC open ${this._url}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 28, 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) });
                 this.connected.emit();
                 this._connectTrigger.wake();
             }
@@ -34,7 +33,7 @@ class TunnelRpcPeer {
             }
         };
         this._socket.onclose = async () => {
-            log(`Disconnected ${this._url}`);
+            (0, log_1.log)(`Disconnected ${this._url}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 37, 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) });
             this.disconnected.emit();
             try {
                 await this._rpc.close();
@@ -45,7 +44,7 @@ class TunnelRpcPeer {
         };
         this._socket.onerror = (event) => {
             var _a;
-            log(`Publisher socket error ${this._url} ${event.message}`);
+            (0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 47, 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) });
             this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
         };
         this._rpc = (0, rpc_1.createProtoRpcPeer)({

package/dist/src/util/tunnel/tunnel-rpc-peer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}

package/dist/src/util/util.d.ts

@@ -1,4 +1,4 @@
-import { Space } from '@dxos/client';
+import { Space } from '@dxos/client/echo';
 import { PublicKey } from '@dxos/keys';
 export declare const maybeTruncateKey: (key: PublicKey, truncate?: boolean) => string;
 export declare const safeParseInt: (value: string | undefined, defaultValue?: number) => number | undefined;

package/dist/src/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,gBAAgB,QAAS,SAAS,+BAAkE,CAAC;AAElH,eAAO,MAAM,YAAY,UAAW,MAAM,GAAG,SAAS,iBAAiB,MAAM,KAAG,MAAM,GAAG,SAOxF,CAAC;AAMF,eAAO,MAAM,WAAW,WAAkB,KAAK,EAAE,iBAgBhD,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,gBAAgB,QAAS,SAAS,+BAAkE,CAAC;AAElH,eAAO,MAAM,YAAY,UAAW,MAAM,GAAG,SAAS,iBAAiB,MAAM,KAAG,MAAM,GAAG,SAOxF,CAAC;AAMF,eAAO,MAAM,WAAW,WAAkB,KAAK,EAAE,iBAiBhD,CAAC"}

package/dist/src/util/util.js

@@ -21,6 +21,7 @@ exports.safeParseInt = safeParseInt;
 // Spaces
 //
 const selectSpace = async (spaces) => {
+    await Promise.all(spaces.map((space) => space.waitUntilReady()));
     // eslint-disable-next-line no-eval
     const inquirer = (await eval('import("inquirer")')).default;
     const { key } = await inquirer.prompt([

package/dist/src/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAGF,uCAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;AAArG,QAAA,gBAAgB,oBAAqF;AAE3G,MAAM,YAAY,GAAG,CAAC,KAAyB,EAAE,YAAqB,EAAsB,EAAE;IACnG,IAAI;QACF,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB;AAEF,EAAE;AACF,SAAS;AACT,EAAE;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;IACnD,mCAAmC;IACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9B,IAAI,EAAE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5D,KAAK,EAAE,KAAK,CAAC,GAAG;aACjB,CAAC,CAAC;SACJ;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAGF,uCAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;AAArG,QAAA,gBAAgB,oBAAqF;AAE3G,MAAM,YAAY,GAAG,CAAC,KAAyB,EAAE,YAAqB,EAAsB,EAAE;IACnG,IAAI;QACF,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB;AAEF,EAAE;AACF,SAAS;AACT,EAAE;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;IACnD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjE,mCAAmC;IACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9B,IAAI,EAAE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5D,KAAK,EAAE,KAAK,CAAC,GAAG;aACjB,CAAC,CAAC;SACJ;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB"}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.53-main.d535786",
+  "version": "0.1.53-main.e9dc2bc",
   "commands": {
     "agent:list": {
       "id": "agent:list",
@@ -82,8 +82,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -135,6 +134,12 @@
           "aliases": [
             "t"
           ]
+        },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "description": "Force restart.",
+          "allowNo": false
         }
       },
       "args": {}
@@ -151,8 +156,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -250,8 +254,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -307,9 +310,14 @@
         "all": {
           "name": "all",
           "type": "boolean",
-          "char": "a",
           "description": "Stop all agents.",
           "allowNo": false
+        },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "description": "Force stop.",
+          "allowNo": false
         }
       },
       "args": {}
@@ -326,8 +334,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -584,8 +591,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -746,8 +752,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -759,8 +764,7 @@
         "verbose": {
           "name": "verbose",
           "type": "boolean",
-          "char": "v",
-          "description": "Verbose output",
+          "description": "Verbose output.",
           "allowNo": false
         },
         "profile": {
@@ -884,75 +888,6 @@
       },
       "args": {}
     },
-    "device:invite": {
-      "id": "device:invite",
-      "description": "Create device invitation.",
-      "strict": true,
-      "pluginName": "@dxos/cli",
-      "pluginAlias": "@dxos/cli",
-      "pluginType": "core",
-      "aliases": [],
-      "flags": {
-        "json": {
-          "name": "json",
-          "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "allowNo": false
-        },
-        "dry-run": {
-          "name": "dry-run",
-          "type": "boolean",
-          "description": "Dry run.",
-          "allowNo": false
-        },
-        "verbose": {
-          "name": "verbose",
-          "type": "boolean",
-          "char": "v",
-          "description": "Verbose output",
-          "allowNo": false
-        },
-        "profile": {
-          "name": "profile",
-          "type": "option",
-          "description": "User profile.",
-          "multiple": false,
-          "default": "default"
-        },
-        "config": {
-          "name": "config",
-          "type": "option",
-          "description": "Config file.",
-          "helpValue": "path",
-          "multiple": false,
-          "dependsOn": [
-            "profile"
-          ],
-          "default": "/home/runner/.config/dx/profile/default.yml",
-          "aliases": [
-            "c"
-          ]
-        },
-        "no-agent": {
-          "name": "no-agent",
-          "type": "boolean",
-          "description": "Auto-start agent.",
-          "allowNo": false
-        },
-        "timeout": {
-          "name": "timeout",
-          "type": "option",
-          "description": "Timeout in seconds.",
-          "multiple": false,
-          "default": 30,
-          "aliases": [
-            "t"
-          ]
-        }
-      },
-      "args": {}
-    },
     "device:list": {
       "id": "device:list",
       "description": "Show device info.",
@@ -1042,8 +977,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1100,6 +1034,9 @@
           "name": "require",
           "type": "option",
           "multiple": true,
+          "default": [
+            "ts-node/register"
+          ],
           "aliases": [
             "r"
           ]
@@ -1491,8 +1428,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1710,8 +1646,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1805,8 +1740,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1880,8 +1814,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2022,8 +1955,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2169,8 +2101,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2238,8 +2169,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2312,8 +2242,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2393,8 +2322,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2535,8 +2463,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2751,8 +2678,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2839,8 +2765,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2914,8 +2839,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.1.53-main.d535786",
+  "version": "0.1.53-main.e9dc2bc",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -23,18 +23,17 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@faker-js/faker": "^7.3.0",
-    "@oclif/core": "^2.6.5",
-    "@oclif/plugin-help": "^5.2.8",
-    "@oclif/plugin-plugins": "^2.4.3",
+    "@oclif/core": "^2.9.4",
+    "@oclif/plugin-help": "^5.2.14",
+    "@oclif/plugin-plugins": "^3.1.8",
     "@octokit/core": "^4.0.4",
     "chalk": "^4.1.0",
     "cli-progress": "^3.11.2",
     "date-fns": "^2.29.3",
-    "debug": "^4.3.3",
     "do-wrapper": "^4.5.1",
     "fs-extra": "^8.1.0",
     "get-folder-size": "^2.0.1",
+    "git-rev-sync": "^3.0.2",
     "inquirer": "^8.2.0",
     "ipfs-http-client": "~56.0.1",
     "isomorphic-ws": "^4.0.1",
@@ -45,37 +44,33 @@
     "pkg-up": "^3.1.0",
     "react": "^18.2.0",
     "tempy": "^1.0.1",
+    "tiny-invariant": "^1.3.1",
     "uuid": "^8.3.2",
     "ws": "^7.4.4",
-    "@dxos/agent": "0.1.53-main.d535786",
-    "@dxos/async": "0.1.53-main.d535786",
-    "@dxos/bare-template": "0.1.53-main.d535786",
-    "@dxos/client": "0.1.53-main.d535786",
-    "@dxos/client-services": "0.1.53-main.d535786",
-    "@dxos/client-protocol": "0.1.53-main.d535786",
-    "@dxos/codec-protobuf": "0.1.53-main.d535786",
-    "@dxos/config": "0.1.53-main.d535786",
-    "@dxos/context": "0.1.53-main.d535786",
-    "@dxos/debug": "0.1.53-main.d535786",
-    "@dxos/functions": "0.1.53-main.d535786",
-    "@dxos/hello-template": "0.1.53-main.d535786",
-    "@dxos/keys": "0.1.53-main.d535786",
-    "@dxos/log": "0.1.53-main.d535786",
-    "@dxos/observable-object": "0.1.53-main.d535786",
-    "@dxos/protocols": "0.1.53-main.d535786",
-    "@dxos/plate": "0.1.53-main.d535786",
-    "@dxos/sentry": "0.1.53-main.d535786",
-    "@dxos/tasks-template": "0.1.53-main.d535786",
-    "@dxos/rpc": "0.1.53-main.d535786",
-    "@dxos/telemetry": "0.1.53-main.d535786",
-    "@dxos/util": "0.1.53-main.d535786",
-    "@dxos/websocket-rpc": "0.1.53-main.d535786"
+    "@dxos/async": "0.1.53-main.e9dc2bc",
+    "@dxos/bare-template": "0.1.53-main.e9dc2bc",
+    "@dxos/agent": "0.1.53-main.e9dc2bc",
+    "@dxos/client": "0.1.53-main.e9dc2bc",
+    "@dxos/client-protocol": "0.1.53-main.e9dc2bc",
+    "@dxos/codec-protobuf": "0.1.53-main.e9dc2bc",
+    "@dxos/config": "0.1.53-main.e9dc2bc",
+    "@dxos/context": "0.1.53-main.e9dc2bc",
+    "@dxos/debug": "0.1.53-main.e9dc2bc",
+    "@dxos/functions": "0.1.53-main.e9dc2bc",
+    "@dxos/hello-template": "0.1.53-main.e9dc2bc",
+    "@dxos/log": "0.1.53-main.e9dc2bc",
+    "@dxos/plate": "0.1.53-main.e9dc2bc",
+    "@dxos/protocols": "0.1.53-main.e9dc2bc",
+    "@dxos/rpc": "0.1.53-main.e9dc2bc",
+    "@dxos/sentry": "0.1.53-main.e9dc2bc",
+    "@dxos/tasks-template": "0.1.53-main.e9dc2bc",
+    "@dxos/telemetry": "0.1.53-main.e9dc2bc",
+    "@dxos/util": "0.1.53-main.e9dc2bc",
+    "@dxos/websocket-rpc": "0.1.53-main.e9dc2bc"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.11",
+    "@oclif/test": "^2.3.31",
     "@types/cli-progress": "^3.11.0",
-    "@types/debug": "^4.1.7",
-    "@types/faker": "^5.5.9",
     "@types/fs-extra": "^9.0.4",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash.defaultsdeep": "^4.6.6",
@@ -96,10 +91,14 @@
     "bin": "dx",
     "dirname": "dx",
     "commands": "./dist/src/commands",
+    "hooks": {
+      "command_not_found": "./dist/src/hooks/command-not-found"
+    },
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-plugins"
     ],
+    "helpClass": "./dist/src/help",
     "topicSeparator": " ",
     "topics": {
       "config": {

package/dist/src/commands/device/invite.d.ts

@@ -1,6 +0,0 @@
-import { BaseCommand } from '../../base-command';
-export default class Invite extends BaseCommand<typeof Invite> {
-    static description: string;
-    run(): Promise<any>;
-}
-//# sourceMappingURL=invite.d.ts.map

package/dist/src/commands/device/invite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"invite.d.ts","sourceRoot":"","sources":["../../../../src/commands/device/invite.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,WAAW,SAA+B;IAEpD,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAoB1B"}

package/dist/src/commands/device/invite.js

@@ -1,36 +0,0 @@
-"use strict";
-//
-// Copyright 2022 DXOS.org
-//
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const chalk_1 = __importDefault(require("chalk"));
-const client_1 = require("@dxos/client");
-const base_command_1 = require("../../base-command");
-const util_1 = require("../../util");
-class Invite extends base_command_1.BaseCommand {
-    async run() {
-        return await this.execWithClient(async (client) => {
-            const observable = client.halo.createInvitation();
-            const invitationSuccess = (0, util_1.hostInvitation)({
-                observable,
-                callbacks: {
-                    onConnecting: async () => {
-                        const invitationCode = client_1.InvitationEncoder.encode(observable.get());
-                        this.log((0, chalk_1.default) `\n{blue Invitation}: ${invitationCode}`);
-                        this.log((0, chalk_1.default) `\n{red Secret}: ${observable.get().authCode}\n`);
-                    },
-                },
-            });
-            core_1.ux.action.start('Waiting for peer to connect...');
-            await invitationSuccess;
-            core_1.ux.action.stop();
-        });
-    }
-}
-Invite.description = 'Create device invitation.';
-exports.default = Invite;
-//# sourceMappingURL=invite.js.map

package/dist/src/commands/device/invite.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"invite.js","sourceRoot":"","sources":["../../../../src/commands/device/invite.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAiC;AACjC,kDAA0B;AAE1B,yCAAyD;AAEzD,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,MAAO,SAAQ,0BAA0B;IAG5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;gBACvC,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,MAAM,cAAc,GAAG,0BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;wBAElE,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBACxD,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC;oBAClE,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAClD,MAAM,iBAAiB,CAAC;YACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;;AArBe,kBAAW,GAAG,2BAA2B,CAAC;kBADvC,MAAM"}