@ghostlytools/cli 1.3.0 → 1.3.1

package/dist/assets/{main-BzNN6bkx.js → main-DbqcdShN.js}

@@ -1,8 +1,8 @@
-import { A as PR_CHECKS, M as RUN_RESULTS, N as STATUS_CARD_LIMITS, R as cardUrl, j as PR_STATES, k as ITEM_STATES, t as GROUP_FILE_LIMITS } from "./groupFiles-DBbjOLuD.js";
-import { a as SECRET_RESULTS, i as ENGINE_READS, r as ENGINE_METHODS, t as turnRef } from "./turnRefs-ChEfgbSX.js";
-import { n as EXIT, r as asCliError, t as CliError } from "./errors-my6VJR_0.js";
-import { t as CONTACT_KEY } from "./apiKit-CajiDxdK.js";
-import { a as createProfile, c as listProfiles, d as profilePaths, f as selectProfile, i as checkProfileName, l as lockOwner, o as currentProfile, s as ghostlyHome, u as profileExists } from "./profiles-B6F4oa9K.js";
+import { $a as cardUrl, Ga as ITEM_STATES, Ja as RUN_RESULTS, Ka as PR_CHECKS, Ya as STATUS_CARD_LIMITS, Zn as GROUP_FILE_LIMITS, qa as PR_STATES } from "./src-DDzSERyc.js";
+import { a as SECRET_RESULTS, i as ENGINE_READS, r as ENGINE_METHODS, t as turnRef } from "./turnRefs-B87dtrHM.js";
+import { n as EXIT, r as asCliError, t as CliError } from "./errors-DO5z6h_l.js";
+import { t as CONTACT_KEY } from "./apiKit-CA2x5GJF.js";
+import { a as createProfile, c as listProfiles, d as profilePaths, f as selectProfile, i as checkProfileName, l as lockOwner, o as currentProfile, s as ghostlyHome, u as profileExists } from "./profiles-BHc9pEYg.js";
 import { n as ownSocket } from "./privateFolder-Bk9C9oFv.js";
 import { accessSync, constants, existsSync, openSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
@@ -12,7 +12,7 @@ import { createInterface } from "node:readline";
 import { format } from "node:util";
 var package_default = {
 	name: "@ghostlytools/cli",
-	version: "1.3.0",
+	version: "1.3.1",
 	type: "module",
 	description: "Ghostly for bots and terminals: the app's own engine, headless on Node, behind a daemon and a `ghostly` command with JSON output.",
 	license: "MIT",
@@ -869,7 +869,7 @@ var commands$8 = {
 				description: "Replace the three files when they are there"
 			}
 		},
-		run: async ({ options }, a) => (await import("./apps-t23gkc28.js")).initApp(a.dir, {
+		run: async ({ options }, a) => (await import("./apps-C-T8jeji.js")).initApp(a.dir, {
 			name: options.name,
 			title: options.title,
 			force: options.force === true
@@ -909,7 +909,7 @@ var commands$8 = {
 				description: "This version's sequence, higher than the bundle at --out's (default: one more than it)"
 			}
 		},
-		run: async ({ options }, a) => (await import("./apps-t23gkc28.js")).publishApp(a.dir, keyFile(options.key, "app publish <dir> --key <file> [--out <file>] [--sequence n]"), options.out, options.sequence)
+		run: async ({ options }, a) => (await import("./apps-C-T8jeji.js")).publishApp(a.dir, keyFile(options.key, "app publish <dir> --key <file> [--out <file>] [--sequence n]"), options.out, options.sequence)
 	},
 	"app revoke": {
 		method: "app.revoke",
@@ -938,7 +938,7 @@ var commands$8 = {
 				description: "The bundle naming the app (default <dir>/app.ghostlyapp)"
 			}
 		},
-		run: async ({ options }, a) => (await import("./apps-t23gkc28.js")).revokeApp(a.dir, keyFile(options.key, "app revoke <dir> --key <file> (--digest <digest>... | --up-to <sequence>) [--reason <text>]"), {
+		run: async ({ options }, a) => (await import("./apps-C-T8jeji.js")).revokeApp(a.dir, keyFile(options.key, "app revoke <dir> --key <file> (--digest <digest>... | --up-to <sequence>) [--reason <text>]"), {
 			digests: options.digest,
 			upTo: options["up-to"],
 			reason: options.reason,
@@ -998,7 +998,7 @@ var commands$8 = {
 		usage: "app verify <bundle|url>",
 		summary: "Check a .ghostlyapp as a client would, from a file or an https URL: its manifest and digest, or refused (exit 1) with the reason",
 		args: ["bundle"],
-		run: async (_, a) => (await import("./apps-t23gkc28.js")).verifyApp(a.bundle)
+		run: async (_, a) => (await import("./apps-C-T8jeji.js")).verifyApp(a.bundle)
 	},
 	"store sign": {
 		method: "store.sign",
@@ -1015,7 +1015,7 @@ var commands$8 = {
 				description: "The folder to write ghostly-store.json and ghostly-store.sig in (default: the index's)"
 			}
 		},
-		run: async ({ options }, a) => (await import("./apps-t23gkc28.js")).signStore(a.index, keyFile(options.key, "store sign <index> --key <file> [--out <dir>]"), options.out)
+		run: async ({ options }, a) => (await import("./apps-C-T8jeji.js")).signStore(a.index, keyFile(options.key, "store sign <index> --key <file> [--out <dir>]"), options.out)
 	}
 };
 //#endregion
@@ -1680,15 +1680,21 @@ var commands$5 = {
 				description: "Seconds --wait waits (default 300)"
 			}
 		},
-		params: ({ options }, a) => ({
-			chat: a.chat,
-			file: a.file,
-			dir: here(options.dir ?? "."),
-			path: options.path === void 0 ? void 0 : here(options.path),
-			force: options.force === true,
-			wait: options.wait === true ? true : void 0,
-			timeout: options.timeout
-		})
+		params: ({ options }, a) => {
+			if (options.path === "") throw new CliError("usage", "--path needs a file");
+			if (options.dir === "") throw new CliError("usage", "--dir needs a folder");
+			if (options.dir !== void 0 && options.path !== void 0) throw new CliError("usage", "--path names the file: not with --dir");
+			if (options.timeout !== void 0 && options.wait !== true) throw new CliError("usage", "--timeout is how long --wait waits: not without --wait");
+			return {
+				chat: a.chat,
+				file: a.file,
+				dir: options.path === void 0 ? here(options.dir ?? ".") : void 0,
+				path: here(options.path),
+				force: options.force === true,
+				wait: options.wait === true ? true : void 0,
+				timeout: options.timeout
+			};
+		}
 	},
 	"file send": {
 		method: "file.send",
@@ -1919,10 +1925,17 @@ var commands$3 = {
 	},
 	"group leave": {
 		method: "group.leave",
-		usage: "group leave <group>",
-		summary: "Leave a group",
+		usage: "group leave <group> --yes",
+		summary: "Leave a group; its history and files go from this device",
 		args: ["group"],
-		params: (_, { group }) => ({ group })
+		options: { yes: {
+			type: "boolean",
+			description: "Confirm"
+		} },
+		params: ({ options }, { group }) => ({
+			group,
+			yes: options.yes === true
+		})
 	},
 	"group link": {
 		method: "group.link",
@@ -2098,11 +2111,14 @@ var commands$2 = {
 				description: "The tool's output, from stdin"
 			}
 		},
-		params: ({ options }, a) => ({
-			draft: a.draft,
-			evidenceFile: here(options["evidence-file"]),
-			stdin: options.stdin === true
-		})
+		params: ({ options }, a) => {
+			if (options["evidence-file"] !== void 0 && options.stdin === true) throw new CliError("usage", "--evidence-file or --stdin, not both");
+			return {
+				draft: a.draft,
+				evidenceFile: here(options["evidence-file"]),
+				stdin: options.stdin === true
+			};
+		}
 	},
 	"identity contact": {
 		method: "identity.contact",
@@ -2885,9 +2901,99 @@ function writeCursor(path, seq) {
 	});
 	renameSync(path + ".tmp", path);
 }
+/**
+* `--type`: one type (`message.received`, exactly: `group.message` is not its `group.message.edited`), or a family, a
+* word with no "." (`message`, `chat`) or one ending in "." or "*" (`group.typing.`). Before, a family needed its "." and
+* `--type chat` let nothing through. A family is whole words: `message` is not `messages.x`.
+*/
 function matches(event, types) {
 	if (!types.length) return true;
-	return types.some((type) => type.endsWith(".") || type.endsWith("*") ? event.type.startsWith(type.replace(/\*$/, "")) : event.type === type);
+	return types.some((type) => {
+		if (type === "*") return true;
+		const family = /[.*]$/.test(type) ? type.replace(/\.?\*$/, "").replace(/\.$/, "") : type.includes(".") ? null : type;
+		return event.type === type || family !== null && event.type.startsWith(family + ".");
+	});
+}
+/**
+* Every event type a daemon of this version emits (events.ts, appEvents.ts, holds.ts, identities.ts, calls/manager.ts,
+* main.ts) and `--turns`' own. A test reads them back from the source: a type added there and not here fails it.
+*/
+var EVENT_TYPES = [
+	"agent.turn",
+	"app.closed",
+	"app.message",
+	"app.opened",
+	"button.pressed",
+	"call.connected",
+	"call.ended",
+	"call.incoming",
+	"call.outgoing",
+	"call.resumed",
+	"call.stalled",
+	"chat.announced",
+	"chat.connection",
+	"chat.created",
+	"chat.held",
+	"chat.joined",
+	"chat.pairing",
+	"chat.pinned",
+	"chat.released",
+	"chat.removed",
+	"chat.renamed",
+	"daemon.started",
+	"events.gap",
+	"file.done",
+	"file.failed",
+	"file.offered",
+	"file.stage",
+	"group.created",
+	"group.deleted",
+	"group.event",
+	"group.members",
+	"group.mentioned",
+	"group.message",
+	"group.message.edited",
+	"group.pinned",
+	"group.reaction",
+	"group.removed",
+	"group.sent",
+	"group.status",
+	"group.typing.started",
+	"group.typing.stopped",
+	"identity.approval",
+	"identity.progress",
+	"identity.received",
+	"identity.status",
+	"message.deleted",
+	"message.delivery",
+	"message.edited",
+	"message.reaction",
+	"message.received",
+	"message.sent",
+	"payment.created",
+	"payment.updated",
+	"typing.started",
+	"typing.stopped"
+];
+/** The families, the first word of each type: what a `--type` must start with. */
+var EVENT_FAMILIES = [...new Set(EVENT_TYPES.map((type) => type.split(".")[0]))];
+/**
+* Checks each `--type` before anything starts. Before, `--type bogus` (or a typo such as `message.recieved`) was taken
+* and the listener stayed silent for good. A first word that is no family is a usage error naming them; a type, or a
+* family below the first word, that no event has is said on stderr (`warn`) and kept: a newer daemon may emit it.
+*/
+function checkTypes(types, warn) {
+	for (const type of types) {
+		if (type === "*") continue;
+		const family = type.split(/[.*]/)[0];
+		if (!EVENT_FAMILIES.includes(family)) throw new CliError("usage", `No event is of type ${type}: --type takes a type, or a family (${EVENT_FAMILIES.join(", ")})`);
+		if (!EVENT_TYPES.some((known) => matches({
+			seq: 0,
+			id: "",
+			type: known,
+			at: 0
+		}, [type]))) warn(`ghostly: no event is of type ${type}; the ${family} family has ${EVENT_TYPES.filter((known) => known.startsWith(family + ".")).join(", ")}`);
+	}
 }
 /** The environment a hook runs in: this one's, less the backup passphrase (a hook, and what it runs, never needs it). */
 function hookEnv(env) {
@@ -3062,8 +3168,8 @@ var VERSION = package_default.version;
 * command a running daemon answers loads none of them, and starts about as fast as Node does. Statically imported, they
 * cost every command ~100 ms before its socket was opened.
 */
-var engineApi = () => import("./api-BiaX6l6f.js");
-var engineHost = () => import("./host-Cmd205Dc.js");
+var engineApi = () => import("./api-TiB5QSG9.js");
+var engineHost = () => import("./host-CWt-jtqz.js");
 var pretty = false;
 function print(value) {
 	process.stdout.write(JSON.stringify(value, null, pretty ? 2 : void 0) + "\n");
@@ -3262,7 +3368,7 @@ var SPECIAL = [
 		{
 			since: o("number", "Replay events after this seq first"),
 			cursor: o("string", "A file that keeps the last seq handled (read at start, written after each event)"),
-			type: o("list", "Only events of this type, or starting with it (repeat for more)"),
+			type: o("list", "Only events of this type (message.received) or family (message, or group.typing.); repeat for more"),
 			turns: o("boolean", "Only agent turns: each message received, and each group message that mentions you, as one agent.turn event"),
 			from: o("list", "Only this chat's events (id, prefix, name or the contact's key; again for more)"),
 			group: o("list", "Only this group's events (again for more); with --from or --group, nobody else's event gets through"),
@@ -3523,7 +3629,7 @@ async function profileCommand(sub, argv) {
 			const [file, name] = parsed.positionals;
 			if (!file || !name) throw new CliError("usage", "ghostly profile restore <file> <new profile> [--passphrase-file f] [--use]");
 			noMoreThan(2, parsed.positionals, "profile restore <file> <new profile> [--passphrase-file f] [--use]");
-			const { backupFileProtection, restoreProfile } = await import("./backup-Cg52WeQi.js");
+			const { backupFileProtection, restoreProfile } = await import("./backup-Bugnn3Ue.js");
 			const protection = await backupFileProtection(file);
 			const paths = await restoreProfile(g.home, checkProfileName(name), file, protection === "none" ? void 0 : backupPassphrase(parsed.options["passphrase-file"], RESTORE_PASSPHRASE));
 			if (parsed.options.use) selectProfile(g.home, name);
@@ -3800,6 +3906,7 @@ async function listenCommand(argv) {
 	const types = parsed.options.type ?? [];
 	const turns = parsed.options.turns === true;
 	if (turns && types.length) throw new CliError("usage", "--turns takes the place of --type: a turn is a message received, or a group message that mentions you");
+	checkTypes(types, (line) => process.stderr.write(line + "\n"));
 	const from = parsed.options.from ?? [], groups = parsed.options.group ?? [];
 	const cursor = parsed.options.cursor;
 	checkCursor(cursor);
@@ -4024,7 +4131,7 @@ async function textCommand(name, argv) {
 	};
 	if (spec.target === "group") params.mentions = parsed.options.mention ?? [];
 	if (parsed.options.reply !== void 0) params.reply = parsed.options.reply;
-	if (!spec.message) Object.assign(params, (await import("./buttons-CWl2yNJu.js")).buttonsOf(parsed.options));
+	if (!spec.message) Object.assign(params, (await import("./buttons-Bj7Vf7Pn.js")).buttonsOf(parsed.options));
 	print(await withSession(g, (s) => {
 		if (spec.target === "chat") {
 			params.wait = parsed.options.wait ?? (s.mode === "one-shot" ? spec.message ? "confirmed" : "sent" : "none");
@@ -4299,4 +4406,4 @@ async function run(argv) {
 //#endregion
 export { run };
 
-//# sourceMappingURL=main-BzNN6bkx.js.map
+//# sourceMappingURL=main-DbqcdShN.js.map