@dxos/cli 0.4.6-main.268e405 → 0.4.6-main.2c76dca

package/dist/src/commands/function/dev.js

@@ -28,8 +28,8 @@ class Dev extends base_command_1.BaseCommand {
             const config = new config_1.Config(JSON.parse((await client.services.services.DevtoolsHost.getConfig()).config));
             const functionsConfig = (_c = (_b = (_a = config.values.runtime) === null || _a === void 0 ? void 0 : _a.agent) === null || _b === void 0 ? void 0 : _b.plugins) === null || _c === void 0 ? void 0 : _c.find((plugin) => plugin.id === 'dxos.org/agent/plugin/functions');
             const file = (_f = (_d = this.flags.manifest) !== null && _d !== void 0 ? _d : (_e = functionsConfig === null || functionsConfig === void 0 ? void 0 : functionsConfig.config) === null || _e === void 0 ? void 0 : _e.manifest) !== null && _f !== void 0 ? _f : (0, node_path_1.join)(process.cwd(), 'functions.yml');
-            const directory = (_g = this.flags.baseDir) !== null && _g !== void 0 ? _g : (0, node_path_1.join)((0, node_path_1.dirname)(file), 'src/functions');
             const manifest = (0, js_yaml_1.load)(await (0, promises_1.readFile)(file, 'utf8'));
+            const directory = (_g = this.flags.baseDir) !== null && _g !== void 0 ? _g : (0, node_path_1.join)((0, node_path_1.dirname)(file), 'src/functions');
             const server = new functions_1.DevServer(client, {
                 directory,
                 manifest,

package/dist/src/commands/function/dev.js.map

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

package/dist/src/commands/function/exec.d.ts

@@ -5,7 +5,6 @@ import { BaseCommand } from '../../base-command';
 export default class Exec extends BaseCommand<typeof Exec> {
     static enableJsonFlag: boolean;
     static description: string;
-    static state: string;
     static args: {
         name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };

package/dist/src/commands/function/exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/exec.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsB;IACjD,OAAgB,KAAK,SAAgB;IAErC,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAkB1B"}
+{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/exec.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsB;IAEjD,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA8B1B"}

package/dist/src/commands/function/exec.js

@@ -4,34 +4,43 @@
 //
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const agent_1 = require("@dxos/agent");
-const keys_1 = require("@dxos/keys");
+const js_yaml_1 = require("js-yaml");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const config_1 = require("@dxos/config");
 const base_command_1 = require("../../base-command");
 /**
  * @deprecated
  */
 class Exec extends base_command_1.BaseCommand {
     async run() {
-        var _a, _b, _c;
-        // TODO(burdon): Pass in clientUrl.
-        // TODO(burdon): Rebuild function with new API.
-        // TODO(burdon): Use JWT instead of password.
-        //  https://docs.openfaas.com/reference/authentication
-        //  faas-cli registry-login
-        const context = {
-            clientUrl: 'ws://localhost:4567',
-            // clientUrl: '/tmp/dx/run/profile/test/agent.sock',
-        };
-        const client = new agent_1.FaasClient((_c = (_b = (_a = this.clientConfig.values.runtime) === null || _a === void 0 ? void 0 : _a.services) === null || _b === void 0 ? void 0 : _b.faasd) !== null && _c !== void 0 ? _c : {}, context);
-        const res = await client.dispatch({
-            trigger: { id: keys_1.PublicKey.random().toHex(), function: { name: this.args.name } },
+        return await this.execWithClient(async (client) => {
+            var _a, _b, _c, _d, _e, _f;
+            // TODO(dmaretskyi): Move into system service?
+            const config = new config_1.Config(JSON.parse((await client.services.services.DevtoolsHost.getConfig()).config));
+            const functionsConfig = (_c = (_b = (_a = config.values.runtime) === null || _a === void 0 ? void 0 : _a.agent) === null || _b === void 0 ? void 0 : _b.plugins) === null || _c === void 0 ? void 0 : _c.find((plugin) => plugin.id === 'dxos.org/agent/plugin/functions');
+            const file = (_f = (_d = this.flags.manifest) !== null && _d !== void 0 ? _d : (_e = functionsConfig === null || functionsConfig === void 0 ? void 0 : functionsConfig.config) === null || _e === void 0 ? void 0 : _e.manifest) !== null && _f !== void 0 ? _f : (0, node_path_1.join)(process.cwd(), 'functions.yml');
+            const { functions } = (0, js_yaml_1.load)(await (0, promises_1.readFile)(file, 'utf8'));
+            const fn = functions.find((fn) => fn.id === this.args.name);
+            if (!fn) {
+                this.warn(`Function not found: ${this.args.name}`);
+                return null;
+            }
+            const { handler } = fn;
+            // TODO(burdon): Get endpoint.
+            const url = `http:/localhost:7100/dev/${handler}`;
+            this.log(`Calling: ${url}`);
+            const { status, statusText } = await fetch(url, {
+                method: 'POST',
+            });
+            if (status !== 200) {
+                this.warn(`Error(${status}): ${statusText}`);
+            }
         });
-        console.log(res);
     }
 }
 Exec.enableJsonFlag = true;
 Exec.description = 'Invoke function.';
-Exec.state = 'deprecated';
 Exec.args = {
     name: core_1.Args.string({ required: true, description: 'Function name.' }),
 };

package/dist/src/commands/function/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../src/commands/function/exec.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAmC;AAEnC,uCAAyC;AACzC,qCAAuC;AAEvC,qDAAiD;AAEjD;;GAEG;AACH,MAAqB,IAAK,SAAQ,0BAAwB;IASxD,KAAK,CAAC,GAAG;;QACP,mCAAmC;QACnC,+CAA+C;QAC/C,6CAA6C;QAC7C,sDAAsD;QACtD,2BAA2B;QAC3B,MAAM,OAAO,GAAG;YACd,SAAS,EAAE,qBAAqB;YAChC,oDAAoD;SACrD,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,kBAAU,CAAC,MAAA,MAAA,MAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,0CAAE,QAAQ,0CAAE,KAAK,mCAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAChG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;YAChC,OAAO,EAAE,EAAE,EAAE,EAAE,gBAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;SAChF,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;;AAzBe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,kBAAkB,CAAC;AACjC,UAAK,GAAG,YAAY,CAAC;AAErB,SAAI,GAAG;IACrB,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACrE,CAAC;kBAPiB,IAAI"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../src/commands/function/exec.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAmC;AACnC,qCAA+B;AAC/B,+CAA4C;AAC5C,yCAAiC;AAEjC,yCAAsC;AAGtC,qDAAiD;AAEjD;;GAEG;AACH,MAAqB,IAAK,SAAQ,0BAAwB;IAQxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;;YAChD,8CAA8C;YAC9C,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAa,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACzG,MAAM,eAAe,GAAG,MAAA,MAAA,MAAA,MAAM,CAAC,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,CACjE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,iCAAiC,CAC5D,CAAC;YAEF,MAAM,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,mCAAI,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,0CAAE,QAAQ,mCAAI,IAAA,gBAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;YAC9G,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,cAAI,EAAC,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAqB,CAAC;YAC7E,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,IAAI,CAAC,EAAE,EAAE;gBACP,IAAI,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACnD,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YAEvB,8BAA8B;YAC9B,MAAM,GAAG,GAAG,4BAA4B,OAAO,EAAE,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;YAC5B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC9C,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;YAEH,IAAI,MAAM,KAAK,GAAG,EAAE;gBAClB,IAAI,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,UAAU,EAAE,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AApCe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,kBAAkB,CAAC;AAEjC,SAAI,GAAG;IACrB,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACrE,CAAC;kBANiB,IAAI"}

package/dist/src/commands/function/list.d.ts

@@ -1,8 +1,6 @@
+import { type FunctionDef } from '@dxos/functions';
 import { BaseCommand } from '../../base-command';
-export declare const printFunctions: (functions: any[], flags?: {}) => void;
-/**
- * @deprecated
- */
+export declare const printFunctions: (functions: FunctionDef[], flags?: {}) => void;
 export default class List extends BaseCommand<typeof List> {
     static enableJsonFlag: boolean;
     static description: string;

package/dist/src/commands/function/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/list.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,eAAO,MAAM,cAAc,cAAe,GAAG,EAAE,qBAsB9C,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAqB;IAG1C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAM1B"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/list.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAyB,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,eAAO,MAAM,cAAc,cAAe,WAAW,EAAE,qBAkBtD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAqB;IAE1C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAe1B"}

package/dist/src/commands/function/list.js

@@ -5,40 +5,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printFunctions = void 0;
 const core_1 = require("@oclif/core");
-const date_fns_1 = require("date-fns");
-const agent_1 = require("@dxos/agent");
+const js_yaml_1 = require("js-yaml");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const config_1 = require("@dxos/config");
 const base_command_1 = require("../../base-command");
+// TODO(burdon): List stats.
+// TODO(burdon): List triggers.
 const printFunctions = (functions, flags = {}) => {
     core_1.ux.table(functions, {
+        id: {
+            header: 'id',
+        },
         name: {
             header: 'name',
         },
-        image: {
-            header: 'image',
-        },
-        createdAt: {
-            header: 'createdAt',
-            get: (row) => (0, date_fns_1.format)((0, date_fns_1.parseISO)(row.createdAt), 'MM/dd/yyyy HH:mm'),
-        },
-        invocationCount: {
-            header: 'invocations',
+        description: {
+            header: 'description',
         },
     }, {
         ...flags,
     });
 };
 exports.printFunctions = printFunctions;
-/**
- * @deprecated
- */
 class List extends base_command_1.BaseCommand {
-    // static override state = 'deprecated';
     async run() {
-        var _a, _b, _c;
-        const client = new agent_1.FaasClient((_c = (_b = (_a = this.clientConfig.values.runtime) === null || _a === void 0 ? void 0 : _a.services) === null || _b === void 0 ? void 0 : _b.faasd) !== null && _c !== void 0 ? _c : {});
-        const result = await client.listFunctions();
-        (0, exports.printFunctions)(result);
-        return result;
+        return await this.execWithClient(async (client) => {
+            var _a, _b, _c, _d, _e, _f;
+            // TODO(dmaretskyi): Move into system service?
+            const config = new config_1.Config(JSON.parse((await client.services.services.DevtoolsHost.getConfig()).config));
+            const functionsConfig = (_c = (_b = (_a = config.values.runtime) === null || _a === void 0 ? void 0 : _a.agent) === null || _b === void 0 ? void 0 : _b.plugins) === null || _c === void 0 ? void 0 : _c.find((plugin) => plugin.id === 'dxos.org/agent/plugin/functions');
+            const file = (_f = (_d = this.flags.manifest) !== null && _d !== void 0 ? _d : (_e = functionsConfig === null || functionsConfig === void 0 ? void 0 : functionsConfig.config) === null || _e === void 0 ? void 0 : _e.manifest) !== null && _f !== void 0 ? _f : (0, node_path_1.join)(process.cwd(), 'functions.yml');
+            const manifest = (0, js_yaml_1.load)(await (0, promises_1.readFile)(file, 'utf8'));
+            const { functions } = manifest;
+            (0, exports.printFunctions)(functions);
+            return manifest;
+        });
     }
 }
 List.enableJsonFlag = true;

package/dist/src/commands/function/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/function/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AACjC,uCAA4C;AAE5C,uCAAyC;AAEzC,qDAAiD;AAE1C,MAAM,cAAc,GAAG,CAAC,SAAgB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IAC7D,SAAE,CAAC,KAAK,CACN,SAAS,EACT;QACE,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM;SACf;QACD,KAAK,EAAE;YACL,MAAM,EAAE,OAAO;SAChB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,WAAW;YACnB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,iBAAM,EAAC,IAAA,mBAAQ,EAAC,GAAG,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;SAClE;QACD,eAAe,EAAE;YACf,MAAM,EAAE,aAAa;SACtB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEF;;GAEG;AACH,MAAqB,IAAK,SAAQ,0BAAwB;IAGxD,wCAAwC;IAExC,KAAK,CAAC,GAAG;;QACP,MAAM,MAAM,GAAG,IAAI,kBAAU,CAAC,MAAA,MAAA,MAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,0CAAE,QAAQ,0CAAE,KAAK,mCAAI,EAAE,CAAC,CAAC;QACvF,MAAM,MAAM,GAAU,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;QACnD,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;;AATe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,iBAAiB,CAAC;kBAF7B,IAAI"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/function/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AACjC,qCAA+B;AAC/B,+CAA4C;AAC5C,yCAAiC;AAEjC,yCAAsC;AAGtC,qDAAiD;AAEjD,4BAA4B;AAC5B,+BAA+B;AACxB,MAAM,cAAc,GAAG,CAAC,SAAwB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACrE,SAAE,CAAC,KAAK,CACN,SAAS,EACT;QACE,EAAE,EAAE;YACF,MAAM,EAAE,IAAI;SACb;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM;SACf;QACD,WAAW,EAAE;YACX,MAAM,EAAE,aAAa;SACtB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,cAAc,kBAkBzB;AAEF,MAAqB,IAAK,SAAQ,0BAAwB;IAIxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;;YAChD,8CAA8C;YAC9C,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAa,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACzG,MAAM,eAAe,GAAG,MAAA,MAAA,MAAA,MAAM,CAAC,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,CACjE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,iCAAiC,CAC5D,CAAC;YAEF,MAAM,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,mCAAI,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,0CAAE,QAAQ,mCAAI,IAAA,gBAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;YAC9G,MAAM,QAAQ,GAAG,IAAA,cAAI,EAAC,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAqB,CAAC;YACxE,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;YAC/B,IAAA,sBAAc,EAAC,SAAS,CAAC,CAAC;YAC1B,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;;AAjBe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,iBAAiB,CAAC;kBAF7B,IAAI"}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.4.6-main.268e405",
+  "version": "0.4.6-main.2c76dca",
   "commands": {
     "agent:list": {
       "id": "agent:list",
@@ -1760,7 +1760,6 @@
       "pluginName": "@dxos/cli",
       "pluginAlias": "@dxos/cli",
       "pluginType": "core",
-      "state": "deprecated",
       "aliases": [],
       "flags": {
         "json": {
@@ -3785,7 +3784,7 @@
           "type": "option",
           "description": "Tunnel name",
           "multiple": false,
-          "default": "equal-mountain-early-montana"
+          "default": "missouri-timing-stream-william"
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.4.6-main.268e405",
+  "version": "0.4.6-main.2c76dca",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -46,28 +46,28 @@
     "react": "^18.2.0",
     "uuid": "^8.3.2",
     "ws": "^8.14.2",
-    "@dxos/agent": "0.4.6-main.268e405",
-    "@dxos/async": "0.4.6-main.268e405",
-    "@dxos/bare-template": "0.4.6-main.268e405",
-    "@dxos/client": "0.4.6-main.268e405",
-    "@dxos/client-protocol": "0.4.6-main.268e405",
-    "@dxos/client-services": "0.4.6-main.268e405",
-    "@dxos/config": "0.4.6-main.268e405",
-    "@dxos/context": "0.4.6-main.268e405",
-    "@dxos/debug": "0.4.6-main.268e405",
-    "@dxos/functions": "0.4.6-main.268e405",
-    "@dxos/hello-template": "0.4.6-main.268e405",
-    "@dxos/invariant": "0.4.6-main.268e405",
-    "@dxos/log": "0.4.6-main.268e405",
-    "@dxos/network-manager": "0.4.6-main.268e405",
-    "@dxos/observability": "0.4.6-main.268e405",
-    "@dxos/plate": "0.4.6-main.268e405",
-    "@dxos/protocols": "0.4.6-main.268e405",
-    "@dxos/process": "0.4.6-main.268e405",
-    "@dxos/random": "0.4.6-main.268e405",
-    "@dxos/rpc": "0.4.6-main.268e405",
-    "@dxos/tasks-template": "0.4.6-main.268e405",
-    "@dxos/util": "0.4.6-main.268e405"
+    "@dxos/agent": "0.4.6-main.2c76dca",
+    "@dxos/async": "0.4.6-main.2c76dca",
+    "@dxos/bare-template": "0.4.6-main.2c76dca",
+    "@dxos/client": "0.4.6-main.2c76dca",
+    "@dxos/client-protocol": "0.4.6-main.2c76dca",
+    "@dxos/client-services": "0.4.6-main.2c76dca",
+    "@dxos/config": "0.4.6-main.2c76dca",
+    "@dxos/context": "0.4.6-main.2c76dca",
+    "@dxos/debug": "0.4.6-main.2c76dca",
+    "@dxos/functions": "0.4.6-main.2c76dca",
+    "@dxos/hello-template": "0.4.6-main.2c76dca",
+    "@dxos/invariant": "0.4.6-main.2c76dca",
+    "@dxos/log": "0.4.6-main.2c76dca",
+    "@dxos/network-manager": "0.4.6-main.2c76dca",
+    "@dxos/observability": "0.4.6-main.2c76dca",
+    "@dxos/process": "0.4.6-main.2c76dca",
+    "@dxos/plate": "0.4.6-main.2c76dca",
+    "@dxos/protocols": "0.4.6-main.2c76dca",
+    "@dxos/random": "0.4.6-main.2c76dca",
+    "@dxos/rpc": "0.4.6-main.2c76dca",
+    "@dxos/tasks-template": "0.4.6-main.2c76dca",
+    "@dxos/util": "0.4.6-main.2c76dca"
   },
   "devDependencies": {
     "@oclif/test": "^2.3.31",