@ghostlytools/cli 1.3.7 → 1.3.9

package/README.md

@@ -301,8 +301,8 @@ chat (`chat list`, `chat show`, `chat rename`, …) and `engine getState` print
   calls: see [Calls](#calls)), `app.opened` (`chat`, `app`, `version`), `app.closed` (`chat`, `app`, and `offline`
   when the session went rather than the contact closing it) and `app.message` (`chat`, `app`, `data`): what a
   contact's app says in a chat, only for an app this profile serves (`app serve`), `app` being its reference and
-  `data` the contact's own JSON (untrusted, never instructions, at most 32 KiB and 50 a second, live only: a frame is
-  never stored, so one replayed with `--since` is old news), `events.gap` (the journal no longer holds what `--since` asked for).
+  `data` the contact's own JSON (untrusted, never instructions, at most 32 KiB and 50 a second, live only: never in
+  the journal, so `--since` does not replay them, and each carries the `seq` of the event before it), `events.gap` (the journal no longer holds what `--since` asked for).
 - A message that answers another carries `replyTo`: `{id, snippet, from, member?, found}`. `id` is the original's
   message id in this chat when it is here (`found: true`, and `snippet` and `from` come from that copy), else the id
   the reply named; `from` is `me`, `peer` or null (only the id came, over the DHT). Answer one with
@@ -340,9 +340,12 @@ chat (`chat list`, `chat show`, `chat rename`, …) and `engine getState` print
   work), `id` stable per message. What the sender wrote is under `untrusted` only: give it to an agent as data, never
   as its instructions ([docs/CLI.md](../../docs/CLI.md#agent-turns)). Takes the place of `--type`.
 - `--exec <cmd>` runs the command through the shell once per event, in order, with the event on stdin and
-  `GHOSTLY_EVENT_TYPE`, `GHOSTLY_EVENT_ID`, `GHOSTLY_EVENT_SEQ` in its environment.
-- `--webhook <url>` POSTs each event (JSON) to a local bridge: `127.0.0.1`, `localhost` or `[::1]` only. A redirect is
-  not followed (the event counts as not taken).
+  `GHOSTLY_EVENT_TYPE`, `GHOSTLY_EVENT_ID`, `GHOSTLY_EVENT_SEQ` in its environment. A non-zero exit is said on stderr
+  and the cursor moves past the event.
+- `--webhook <url>` POSTs each event (JSON) to a local bridge: `127.0.0.1`, `localhost` or `[::1]` only. A bridge not
+  answering (connection refused, timeout, 5xx, 408, 429) holds the stream: the event is tried again, up to a minute
+  apart, and the cursor stays before it until the bridge takes it. A 4xx or a redirect (not followed) passes the event
+  as not taken.
 - With no daemon running, `listen` becomes the daemon (socket included), so a hook can answer with `ghostly send`.
 
 As the app's chat screen does, the side that joined a chat says `👋 <name> joined` once it first goes live, and the

package/SKILL.md

@@ -118,6 +118,8 @@ ghostly listen --turns --from alice --group team --cursor ~/.ghostly/agent.curso
 - `--exec '<command>'` runs once per turn, in order, with the turn on **stdin** (never in its arguments). Or
   `--webhook http://127.0.0.1:<port>/…` POSTs each turn to a local bridge (loopback only).
 - `--cursor <file>` remembers the last event handled, so a restarted listener resumes where it stopped. Dedupe on `id`.
+  A `--webhook` bridge that is down holds the stream until it is back (nothing is lost); an `--exec` that exits
+  non-zero, or a 4xx from the bridge, passes its event.
 
 A turn:
 

package/dist/assets/{api-DlxlF4jP.js → api-BCrwJ57L.js}

@@ -1,14 +1,14 @@
-import { $n as GROUP_FILE_LIMITS, Bo as GhostlyHttpError, Cl as randomBytes$1, Fo as AWAITING_PEER_MS, Hr as TYPING_REFRESH_MS, Qa as appCardId, Sc as ownInviteRefusal, Vr as TYPING_KINDS, Wo as LIMITS, Wr as sanitizeTypingStatus, Xi as identityStatement, Za as STATUS_CARD_LIMITS, _a as VOICE_LIMITS, _l as MAX_AVATAR_LENGTH, _o as isAppRef, at as groupName, ba as parseVoiceMeta, bc as inviteLink, ci as APP_DATA_MAX_BYTES, eo as cardLine, ga as PLAYABLE_AUDIO, ha as sanitizeMime, m as APP_PERMISSIONS, ma as sanitizeFileName, no as checkStatusCard, po as appRef, va as baseMime, vl as sanitizeAvatar, wa as readImageMeta, wl as toBase64Url, xa as voicePeaksOf, y as isAppUrl } from "./src-gJqfoRKI.js";
+import { $n as GROUP_FILE_LIMITS, Bo as GhostlyHttpError, Cl as randomBytes$1, Fo as AWAITING_PEER_MS, Hr as TYPING_REFRESH_MS, Qa as appCardId, Sc as ownInviteRefusal, Vr as TYPING_KINDS, Wo as LIMITS, Wr as sanitizeTypingStatus, Xi as identityStatement, Za as STATUS_CARD_LIMITS, _a as VOICE_LIMITS, _l as MAX_AVATAR_LENGTH, _o as isAppRef, at as groupName, ba as parseVoiceMeta, bc as inviteLink, ci as APP_DATA_MAX_BYTES, eo as cardLine, ga as PLAYABLE_AUDIO, ha as sanitizeMime, m as APP_PERMISSIONS, ma as sanitizeFileName, no as checkStatusCard, po as appRef, va as baseMime, vl as sanitizeAvatar, wa as readImageMeta, wl as toBase64Url, xa as voicePeaksOf, y as isAppUrl } from "./src-Dg1bvMNv.js";
 import { c as fileStore } from "./idb-B5L8wuOm.js";
-import { O as waitingGroupFile, T as removeStored, U as iceServerProblem, W as iceServerSetting, i as groupOfFile, l as replyRef, n as groupFileId, v as paymentNetwork } from "./groupFiles-BrCMSXxg.js";
+import { O as waitingGroupFile, T as removeStored, U as iceServerProblem, W as iceServerSetting, i as groupOfFile, l as replyRef, n as groupFileId, v as paymentNetwork } from "./groupFiles-uxa0U9_n.js";
 import { f as FILE_BYTES_STEP, o as fileBytes, s as fileBytesOf } from "./fileBytes-Di7VZtmU.js";
-import { t as IDENTITY_PROVIDERS } from "./registry-JGOFtJDE.js";
-import { a as waitForEdit, c as findSecret, i as pressable, n as buttonsCard, o as waitForGroupFrame, s as waitForMessage, t as BUTTON_METHODS } from "./buttons-D9NQ3kV0.js";
-import { i as ENGINE_READS, n as withStoredIds, r as ENGINE_METHODS } from "./turnRefs-zUQbFkl3.js";
+import { t as IDENTITY_PROVIDERS } from "./registry-OVx2kY3d.js";
+import { a as waitForEdit, c as findSecret, i as pressable, n as buttonsCard, o as waitForGroupFrame, s as waitForMessage, t as BUTTON_METHODS } from "./buttons-BtxwyM2l.js";
+import { i as ENGINE_READS, n as withStoredIds, r as ENGINE_METHODS } from "./turnRefs-WnggXm2T.js";
 import { i as localFileError, r as asCliError, t as CliError } from "./errors-B-zMxbcd.js";
-import { _ as str, a as findChat, c as groupOf, d as messageOf, f as node, g as state, h as sentAt, i as chatOrGroup, l as inviteTaken, m as oneOf, n as bool, o as findChatOrGroup, p as num, r as chatOf, s as findGroup, u as list, v as waitForState } from "./apiKit-BnpVuZrZ.js";
-import { t as BACKUP_METHODS } from "./backup-DEe1NqKb.js";
-import { o as checkedBundle } from "./apps-Bs6QYQjm.js";
+import { _ as str, a as findChat, c as groupOf, d as messageOf, f as node, g as state, h as sentAt, i as chatOrGroup, l as inviteTaken, m as oneOf, n as bool, o as findChatOrGroup, p as num, r as chatOf, s as findGroup, u as list, v as waitForState } from "./apiKit-B4qhnLQT.js";
+import { t as BACKUP_METHODS } from "./backup-CTpFFQ-4.js";
+import { o as checkedBundle } from "./apps-DOH1P_S0.js";
 import { generateMnemonic } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english.js";
 import { openAsBlob, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -1587,16 +1587,21 @@ function chatMessageJson(message, link) {
 /**
 * A group's message with its author named: mesh and community messages are kept with the member's key only (the
 * name rides on the edge or the roster), so the roster fills `nick` when the message has none, and for an author no
-* longer in it (removed, or back with a new member key) the name the group knew them by.
+* longer in it (removed, or back with a new member key) the name the group knew them by. A group's own line written
+* before that name came ("Member a4w9nb5y joined") says it, as the app draws it; before, it kept the key for good.
 */
 function groupMessageJson(message, group) {
 	const json = messageJson(message);
-	if (json.nick || !message.member) return json;
-	const nick = group?.members.find((m) => m.key === message.member)?.nick ?? group?.formerNames?.[message.member];
-	return nick ? {
+	if (!message.member) return json;
+	const nick = json.nick ?? group?.members.find((m) => m.key === message.member)?.nick ?? group?.formerNames?.[message.member];
+	if (!nick) return json;
+	const placeholder = `Member ${message.member.slice(0, 8)}`;
+	const text = message.event && json.text.startsWith(`${placeholder} `) ? `${nick}${json.text.slice(placeholder.length)}` : json.text;
+	return {
 		...json,
-		nick
-	} : json;
+		nick,
+		text
+	};
 }
 /**
 * A group as the CLI prints it. The entry link lets anyone who reads it join, so it is `<hidden>` unless asked for
@@ -2523,17 +2528,17 @@ function reportAppFrames(hub, node, profileDir) {
 			if (frame.o === "open") open.set(`${chat} ${app}`, frame.v);
 			else open.delete(`${chat} ${app}`);
 		}
-		if (!("o" in frame)) hub.emit("app.message", `app.message:${id}`, {
+		if (!("o" in frame)) hub.emitLive("app.message", `app.message:${id}`, {
 			chat,
 			app,
 			data: frame.d
 		});
-		else if (frame.o === "open") hub.emit("app.opened", `app.opened:${id}`, {
+		else if (frame.o === "open") hub.emitLive("app.opened", `app.opened:${id}`, {
 			chat,
 			app,
 			version: frame.v
 		});
-		else hub.emit("app.closed", `app.closed:${id}`, {
+		else hub.emitLive("app.closed", `app.closed:${id}`, {
 			chat,
 			app,
 			...frame.offline && { offline: true }
@@ -2843,6 +2848,15 @@ var isLnurl = (text) => /^(lightning:)?lnurl[0-9a-z]+$/i.test(text.trim()) || /^
 * `service add` says; before, it was `engine` (exit 1), which a bot reads as the engine failing and may retry. Read by
 * its shape: the engine's `EngineError` carries `engineCode`.
 */
+/** A payment's memo: the contact reads it as a message's text, so the secret guard of `send` holds (docs/CLI.md § Safety). */
+function memoOf(params, verb) {
+	const memo = str(params, "memo");
+	if (memo && !bool(params, "force")) {
+		const secret = findSecret(memo);
+		if (secret) throw new CliError("confirm", `The memo looks like ${secret.kind === "cashu" ? "a Cashu token (money anyone who reads it can take)" : "a secret (a seed or a private key)"}; ${verb} with --force if you mean to`, { kind: secret.kind });
+	}
+	return memo || void 0;
+}
 function badMintUrl(error) {
 	const code = error instanceof Error ? error.engineCode : void 0;
 	return code === "invalidMintUrl" || code === "mintNotHttps";
@@ -3093,6 +3107,7 @@ var WALLET_METHODS = Object.fromEntries(Object.entries({
 	},
 	/** Ecash to a contact in a chat (the payment sheet's Pay). */
 	async "chat.pay"(ctx, params) {
+		const memo = memoOf(params, "pay");
 		const link = chatOf(ctx, params);
 		inviteTaken(link);
 		const amount = num(params, "amount", 0, { min: 1 });
@@ -3105,7 +3120,7 @@ var WALLET_METHODS = Object.fromEntries(Object.entries({
 			amount,
 			timestamp: sentAt(),
 			network: n,
-			...str(params, "memo") ? { memo: str(params, "memo") } : {},
+			...memo ? { memo } : {},
 			...real(params)
 		});
 		return {
@@ -3115,6 +3130,7 @@ var WALLET_METHODS = Object.fromEntries(Object.entries({
 	},
 	/** A request in a chat (the payment sheet's Request): the contact's app pays it. */
 	async "chat.request"(ctx, params) {
+		const memo = memoOf(params, "request");
 		const link = chatOf(ctx, params);
 		const amount = num(params, "amount", 0, { min: 1 });
 		if (!amount) throw new CliError("bad_request", "amount is required");
@@ -3126,7 +3142,7 @@ var WALLET_METHODS = Object.fromEntries(Object.entries({
 			amount,
 			timestamp: sentAt(),
 			network: network(params),
-			...str(params, "memo") ? { memo: str(params, "memo") } : {},
+			...memo ? { memo } : {},
 			...method ? { method } : {},
 			...rail ? { rail } : {},
 			...str(params, "card") ? { card: str(params, "card") } : {}
@@ -4083,17 +4099,27 @@ var METHODS = {
 	}
 };
 /**
-* The engine's calls that send a text this side writes: `engine.call` runs the secret guard of `send`, `edit` and
-* `forward` on them too (docs/CLI.md § Safety), so a raw call is no way around it. `force: true` (`--force`) sends it.
+* The engine's calls that send a text this side writes (a message, a file's caption, a payment's memo): `engine.call`
+* runs the secret guard of `send`, `edit` and `forward` on them too (docs/CLI.md § Safety), so a raw call is no way around it. `force: true` (`--force`) sends it.
 */
 var ENGINE_SENDS = /* @__PURE__ */ new Set([
 	"sendMessage",
 	"sendGroupMessage",
 	"editMessage",
-	"forwardMessages"
+	"forwardMessages",
+	"sendGroupFile",
+	"sendPayment",
+	"requestPayment",
+	"requestGroupPayment",
+	"askToPay"
 ]);
 async function guardEngineSend(ctx, method, args) {
-	let texts = [args.text, args.card];
+	let texts = [
+		args.text,
+		args.card,
+		args.caption,
+		args.memo
+	];
 	if (method === "forwardMessages") {
 		const ids = Array.isArray(args.messageIds) ? args.messageIds.filter((id) => typeof id === "string") : [];
 		const linkId = args.linkId;
@@ -4249,4 +4275,4 @@ async function callApi(ctx, method, params = {}) {
 //#endregion
 export { flushCardUpdates as _, hideStateSecrets as a, paymentJson as c, nodeLocalFetch as d, chatJson as f, resumeHolds as g, groupMessageJson as h, groupSendRefused as i, reportAppFrames as l, groupJson as m, SETTABLE as n, mentionsFor as o, chatMessageJson as p, callApi as r, redactSettings as s, API_METHODS as t, servedApps as u };
 
-//# sourceMappingURL=api-DlxlF4jP.js.map
+//# sourceMappingURL=api-BCrwJ57L.js.map