@joe-broadhead/messaging 0.8.0 → 0.9.0

package/dist/bin/messaging.js

@@ -5678,7 +5678,8 @@ const DOMAIN = {
 const URI = {
 	binding: "urn:messaging:binding:relay:v1",
 	provenance: "urn:messaging:ext:provenance:v1",
-	presence: "urn:messaging:ext:presence:v1"
+	presence: "urn:messaging:ext:presence:v1",
+	signIn: "urn:messaging:ext:sign-in:v1"
 };
 const Base64Url = string$1().regex(/^[A-Za-z0-9_-]*$/, "base64url without padding");
 const Key32 = string$1().regex(/^[A-Za-z0-9_-]{43}$/, "32 bytes, base64url without padding");
@@ -5849,6 +5850,7 @@ const ErrorCode = _enum([
 	"jelly_unavailable",
 	"log_conflict",
 	"conv_conflict",
+	"conflict",
 	"stale_epoch",
 	"device_limit",
 	"admission_required",
@@ -6797,7 +6799,12 @@ const AskLevel = _enum([
 	"request",
 	"no"
 ]);
-const GrantSubject = union$1([strictObject({ person: PersonId }), strictObject({ conv: ConvId })]);
+const GrantRelation = _enum(["outside", "org"]);
+const GrantSubject = union$1([
+	strictObject({ person: PersonId }),
+	strictObject({ conv: ConvId }),
+	strictObject({ relation: GrantRelation })
+]);
 object({
 	v: literal(PROTOCOL),
 	realm: RealmId,
@@ -6824,6 +6831,12 @@ const GrantSync = strictObject({ grants: array(record(string$1(), unknown())).mi
 function grantProblem(grant) {
 	const own = "person" in grant.subject && grant.subject.person === grant.person;
 	if ("conv" in grant.subject && (grant.chat !== void 0 || grant.trustedUntil !== void 0 || grant.discoverable !== void 0)) return "a conversation grant sets only ask and agentMail";
+	if ("relation" in grant.subject) {
+		if (grant.agentMail !== void 0 || grant.trustedUntil !== void 0 || grant.discoverable !== void 0) return "a relation grant sets only chat or ask";
+		if (grant.subject.relation === "outside" && grant.ask !== void 0) return "the outside relation grant sets only chat";
+		if (grant.subject.relation === "outside" && grant.chat === "muted") return "the outside relation grant sets chat open or blocked";
+		if (grant.subject.relation === "org" && grant.chat !== void 0) return "the org relation grant sets only ask";
+	}
 	if (own && (grant.chat !== void 0 || grant.agentMail !== void 0 || grant.ask !== void 0 || grant.trustedUntil !== void 0)) return "a grant about its own person sets only discoverable";
 	if (!own && grant.discoverable !== void 0) return "discoverable is set only on a grant about its own person";
 	if (grant.trustedUntil !== void 0) {
@@ -7288,7 +7301,8 @@ discriminatedUnion("t", [
 		url: WakeUrl,
 		ticket: Jws.refine((ticket) => ticket.length <= WAKE_TICKET_BYTES, { message: `at most ${WAKE_TICKET_BYTES} bytes` }),
 		agents: array(SessionName).max(64),
-		awaiting: array(Ulid).max(500)
+		awaiting: array(Ulid).max(500),
+		dms: array(ConvId).max(256).optional()
 	}),
 	object({
 		t: literal("wake.disarm"),
@@ -7403,6 +7417,7 @@ const DeviceChangeView = object({
 	approver: MachineLabel.optional(),
 	at: Millis
 });
+const PresenceFeature = string$1().regex(/^[a-z][a-z0-9-]{0,31}$/, "a feature name");
 const DeviceListEntry = object({
 	device: MachineId,
 	label: MachineLabel,
@@ -7421,7 +7436,8 @@ const DeviceListEntry = object({
 		at: Millis,
 		reason: UnbindReason,
 		by: MachineId
-	}).optional()
+	}).optional(),
+	features: array(PresenceFeature).max(32).optional()
 });
 const LinkText = string$1().min(1).max(2048);
 const Sas = string$1().regex(/^[0-9]{6}$/, "six digits");
@@ -7628,6 +7644,7 @@ const DEVICE_METHODS = {
 };
 // packages/core/dist/schema/ipc/shapes.js
 const SessionKey = string$1().min(1).max(200);
+const ActionToken = string$1().regex(/^[A-Za-z0-9_-]{43}$/, "action token");
 const SendExpect = _enum([
 	"next_turn",
 	"wake",
@@ -7698,7 +7715,14 @@ const TaskFollowUp = object({
 	stage: DeliveryStage,
 	at: Millis
 });
-const TaskRecord = object({
+const TASK_SIGN_IN_TOOL_CHARS = LIMITS.previewChars;
+const TASK_REFUSAL_CHARS = LIMITS.requestChars;
+const HostLocalId = string$1().regex(/^[A-Za-z0-9][A-Za-z0-9._:-]{0,199}$/, "a plain identifier of at most 200 characters");
+const TaskQuestion = strictObject({
+	sessionId: HostLocalId,
+	approvalId: HostLocalId
+});
+const TaskRecordFields = object({
 	task: Task$1.extend({ id: Ulid }),
 	role: _enum(["requester", "executor"]),
 	key: SessionKey.describe("local session that owns this side of the task"),
@@ -7706,8 +7730,36 @@ const TaskRecord = object({
 	createdAt: Millis,
 	updatedAt: Millis,
 	chain: DelegationSummary.optional(),
-	followUps: array(TaskFollowUp).min(1).max(LIMITS.taskFollowUps).optional()
-});
+	followUps: array(TaskFollowUp).min(1).max(LIMITS.taskFollowUps).optional(),
+	agent: SessionName.optional(),
+	person: object({
+		id: PersonId,
+		name: string$1().max(200)
+	}).optional(),
+	org: _enum([
+		"same",
+		"other",
+		"none"
+	]).optional(),
+	signIn: object({
+		tool: string$1().min(1).max(TASK_SIGN_IN_TOOL_CHARS).optional(),
+		by: _enum(["you", "them"])
+	}).optional(),
+	refusal: object({ reason: string$1().min(1).max(TASK_REFUSAL_CHARS) }).optional(),
+	question: TaskQuestion.optional()
+});
+function taskViewRules(schema) {
+	return schema.refine((r) => r.signIn === void 0 || r.task.status.state === "TASK_STATE_AUTH_REQUIRED", "signIn is for an AUTH_REQUIRED task").refine((r) => r.refusal === void 0 || r.task.status.state === "TASK_STATE_REJECTED", "refusal is for a REJECTED task").refine((r) => r.question === void 0 || r.role === "executor" && (r.task.status.state === "TASK_STATE_AUTH_REQUIRED" || r.task.status.state === "TASK_STATE_INPUT_REQUIRED"), "question is for the executor's side of an AUTH_REQUIRED or INPUT_REQUIRED task");
+}
+const TaskRecord = taskViewRules(TaskRecordFields);
+const PersonTask = taskViewRules(TaskRecordFields.omit({ key: true }).extend({
+	key: never().optional(),
+	session: SessionName.describe("this person's agent on this device that holds this side of the task"),
+	cancel: strictObject({
+		name: literal("cancel"),
+		token: ActionToken
+	}).optional()
+})).refine((r) => r.cancel === void 0 || r.role === "requester", "cancel is for the requester side");
 const SendTarget = SessionAddress;
 const SendResult = object({
 	to: SendTarget,
@@ -7750,6 +7802,17 @@ const GrantSetParams = strictObject({
 	...Levels,
 	trust: literal(true).optional()
 });
+const RequestAnswer = _enum([
+	"once",
+	"always",
+	"accept",
+	"decline",
+	"block"
+]);
+const Actions = { actions: array(strictObject({
+	name: RequestAnswer,
+	token: ActionToken
+})).max(4).optional() };
 const AskRequest = object({
 	id: Ulid,
 	kind: _enum(["message", "task"]),
@@ -7763,7 +7826,8 @@ const AskRequest = object({
 	to: SessionName,
 	preview: string$1().max(LIMITS.previewChars),
 	at: Millis,
-	exp: Millis
+	exp: Millis,
+	...Actions
 });
 const ContactRequestView = object({
 	id: Ulid,
@@ -7789,7 +7853,8 @@ const ContactRequestView = object({
 	}),
 	text: string$1().max(LIMITS.requestChars),
 	at: Millis,
-	exp: Millis
+	exp: Millis,
+	...Actions
 });
 const AgentInvitationRequest = strictObject({
 	kind: literal("agent-invitation"),
@@ -7797,7 +7862,8 @@ const AgentInvitationRequest = strictObject({
 	cid: ConvId,
 	from: ParticipantId,
 	to: ParticipantId,
-	at: Millis
+	at: Millis,
+	...Actions
 });
 const HeldRequest = union$1([
 	AskRequest,
@@ -7807,17 +7873,11 @@ const HeldRequest = union$1([
 		kind: literal("suggestion"),
 		agent: SessionName,
 		email: Email,
-		at: Millis
+		at: Millis,
+		...Actions
 	}),
 	AgentInvitationRequest
 ]);
-const RequestAnswer = _enum([
-	"once",
-	"always",
-	"accept",
-	"decline",
-	"block"
-]);
 const RequestText = string$1().min(1).refine((text) => text.length <= LIMITS.requestChars, { message: `at most ${LIMITS.requestChars} UTF-16 code units` });
 const PersonReach = object({
 	person: PersonId,
@@ -7829,14 +7889,57 @@ const PersonReach = object({
 const RequestAnswerParams = strictObject({
 	id: Ulid,
 	answer: RequestAnswer,
-	all: boolean().optional()
-});
+	all: boolean().optional(),
+	token: ActionToken.optional()
+}).refine((p) => p.token === void 0 || p.all !== true, "an action token answers one request: drop all");
 const ContactRequestParams = strictObject({
 	email: Email,
 	text: RequestText,
 	suggestion: Ulid.optional()
 });
+const ReachGroupId = _enum(["message", "ask"]);
+const ReachValue = _enum([
+	"open",
+	"ask",
+	"never"
+]);
+const ReachOption = object({
+	value: ReachValue,
+	label: string$1().max(40),
+	description: string$1().max(300)
+});
+const ReachGroup = object({
+	id: ReachGroupId,
+	label: string$1().max(80),
+	options: array(ReachOption).length(3),
+	value: ReachValue.nullable(),
+	lapsed: ReachValue.optional()
+});
+const ReachSnapshot = object({
+	revision: string$1().min(1).max(64),
+	available: boolean(),
+	groups: array(ReachGroup).length(2)
+});
+const ReachSetParams = strictObject({
+	revision: string$1().min(1).max(64),
+	changes: strictObject({
+		message: ReachValue.optional(),
+		ask: ReachValue.optional()
+	})
+});
 const CONSENT_METHODS = {
+	"reach.get": {
+		params: strictObject({}),
+		result: ReachSnapshot
+	},
+	"reach.set": {
+		params: ReachSetParams,
+		result: ReachSnapshot
+	},
+	"reach.set.preview": {
+		params: ReachSetParams,
+		result: object({ sentence: string$1().max(500) })
+	},
 	"grant.list": {
 		params: strictObject({ subject: GrantTarget.optional() }),
 		result: object({
@@ -8000,6 +8103,7 @@ const Notice = object({
 	}).optional(),
 	line: string$1().max(120).optional(),
 	device: NoticeDevice.optional(),
+	key: string$1().regex(/^task:[0-9A-HJKMNP-TV-Z]{26}$/, "task:<task id>").optional(),
 	at: Millis
 });
 const NoticeCounts = object({ requests: number$1().int().nonnegative() });
@@ -8070,7 +8174,8 @@ const JELLY_METHODS = {
 		}),
 		result: object({
 			relay: _enum(["armed", "pending"]),
-			awaiting: number$1().int().nonnegative()
+			awaiting: number$1().int().nonnegative(),
+			dms: number$1().int().nonnegative()
 		})
 	},
 	"wake.disarm": {
@@ -8183,7 +8288,11 @@ const FileView = object({
 });
 const TaskView = object({
 	id: Ulid,
-	state: TaskState
+	state: TaskState,
+	cancel: strictObject({
+		name: literal("cancel"),
+		token: ActionToken
+	}).optional()
 });
 const EventView = object({
 	cid: ConvId,
@@ -8342,6 +8451,11 @@ const ConvStreamEvent = discriminatedUnion("type", [
 	object({
 		type: literal("gap"),
 		pos: Seq$1
+	}),
+	object({
+		type: literal("task"),
+		pos: Seq$1,
+		task: PersonTask
 	})
 ]).refine((entry) => entry.type !== "event.update" || entry.cid === entry.event.cid && entry.id === entry.event.id, { message: "event.update names the same conversation and event as its projection" });
 // packages/core/dist/schema/ipc/conversations.js
@@ -8448,7 +8562,12 @@ const WaitingOnThemView = object({
 	at: Millis,
 	cid: ConvId.optional(),
 	agent: SessionName.optional(),
-	state: _enum(["held", "pending-delivery"])
+	state: _enum([
+		"held",
+		"pending-delivery",
+		"resend",
+		"outdated"
+	])
 });
 const ConvListParams = strictObject({
 	key: Key,
@@ -9063,16 +9182,47 @@ const IPC_METHODS = {
 			message: strictObject({ parts: array(Part$1).min(1).max(LIMITS.partsPerMessage) }).optional(),
 			artifact: Artifact.optional(),
 			append: boolean().optional(),
-			lastChunk: boolean().optional()
-		}),
+			lastChunk: boolean().optional(),
+			signIn: strictObject({ tool: string$1().min(1).max(TASK_SIGN_IN_TOOL_CHARS) }).optional()
+		}).refine((p) => p.signIn === void 0 || p.state === "TASK_STATE_AUTH_REQUIRED", "signIn goes with TASK_STATE_AUTH_REQUIRED"),
 		result: TaskRecord
 	},
-	"task.cancel": {
+	"task.question": {
 		params: strictObject({
 			key: SessionKey,
 			taskId: Ulid,
-			reason: string$1().max(1e3).optional()
+			question: TaskQuestion.nullable()
 		}),
+		result: object({ ok: literal(true) })
+	},
+	"tasks.list": {
+		params: strictObject({
+			role: _enum(["requester", "executor"]).optional(),
+			state: TaskState.optional(),
+			session: SessionName.optional().describe("only this agent's tasks"),
+			cursor: string$1().min(1).max(200).optional().describe("opaque; from a previous nextCursor"),
+			limit: number$1().int().min(1).max(100).optional()
+		}),
+		result: object({
+			tasks: array(PersonTask),
+			nextCursor: string$1().max(200).optional().describe("absent when there are no more pages"),
+			total: number$1().int().nonnegative()
+		})
+	},
+	"tasks.get": {
+		params: strictObject({
+			taskId: Ulid,
+			role: _enum(["requester", "executor"]).optional()
+		}),
+		result: PersonTask
+	},
+	"task.cancel": {
+		params: strictObject({
+			key: SessionKey.optional(),
+			taskId: Ulid,
+			reason: string$1().max(1e3).optional(),
+			token: ActionToken.optional()
+		}).refine((p) => p.key === void 0 !== (p.token === void 0), "give exactly one of key or token"),
 		result: TaskRecord
 	},
 	"events.subscribe": {
@@ -9225,7 +9375,8 @@ const AGENT_METHODS = [
 	"task.list",
 	"task.get",
 	"task.update",
-	"task.cancel"
+	"task.cancel",
+	"task.question"
 ];
 const HUMAN_METHODS = [
 	...conversationTier("human"),
@@ -9234,6 +9385,9 @@ const HUMAN_METHODS = [
 	"grant.list",
 	"grant.set",
 	"grant.set.preview",
+	"reach.get",
+	"reach.set",
+	"reach.set.preview",
 	"request.list",
 	"request.answer",
 	"request.answer.preview",
@@ -9243,6 +9397,8 @@ const HUMAN_METHODS = [
 	"notice.subscribe",
 	"notice.list",
 	"notice.ack",
+	"tasks.list",
+	"tasks.get",
 	"device.approve.preview",
 	"device.remove.preview",
 	"identity.replace.preview",
@@ -9393,7 +9549,8 @@ strictObject({
 strictObject({
 	t: literal("conv.capabilities"),
 	req: Req,
-	outdated: array(PersonId).max(LIMITS.convOpParticipants)
+	outdated: array(PersonId).max(LIMITS.convOpParticipants),
+	unknown: array(PersonId).min(1).max(LIMITS.convOpParticipants).optional()
 });
 union$1([strictObject({
 	t: literal("conv.push"),
@@ -9562,6 +9719,11 @@ const Task = object({
 	titleAuthor: Author$1.optional().describe("With title: who wrote the request; ours when you asked (mine)"),
 	status: authored("The latest status message").optional(),
 	statusAuthor: Author$1.optional().describe("With status: who wrote it; ours when you run the task (asked)"),
+	signIn: object({
+		tool: authored("The tool the executor named").optional(),
+		by: _enum(["you", "them"]).describe("Whose sign-in it is: you (your person, for an agent of theirs) or them (the other person); your Messaging daemon decides, never the peer")
+	}).optional().describe("auth_required only: the task waits on a sign-in; the tool was written by the executor, as statusAuthor says"),
+	refusal: object({ reason: authored("The executor's reason") }).optional().describe("rejected only: why the executor declined, in its words, as statusAuthor says"),
 	createdAt: iso$1,
 	updatedAt: iso$1,
 	consent: ToolConsentSchema.optional(),
@@ -9830,7 +9992,7 @@ function utf8(text) {
 	return Buffer.from(text, "utf8");
 }
 // packages/core/dist/version.js
-const VERSION = "0.8.0";
+const VERSION = "0.9.0";
 // packages/core/dist/jcs.js
 const LONE_SURROGATE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/;
 function hasLoneSurrogate(text) {
@@ -10244,8 +10406,11 @@ const VIEW_METHODS = [
 	"people.search",
 	"people.get",
 	"grant.list",
+	"reach.get",
 	"request.list",
 	"sessions.list",
+	"tasks.list",
+	"tasks.get",
 	"notice.subscribe",
 	"notice.list",
 	"device.list"
@@ -12190,7 +12355,7 @@ var MessagingClient = class MessagingClient {
 				timer = setTimeout(() => reject(new DaemonMismatchError(`the process on the Messaging daemon socket did not say which version it is within ${wait} ms: it is a messagingd from before this version, or it is stuck. ${REMEDY}`)), wait);
 			})]);
 			if (pointer !== void 0 && hello.pid !== pointer.pid) throw new MessagingError("forbidden", "the process on the Messaging daemon's pipe is not the daemon that published it");
-			const expected = options.version ?? "0.8.0";
+			const expected = options.version ?? "0.9.0";
 			if (hello.protocol !== 1 || hello.version !== expected) throw new DaemonMismatchError(`the Messaging daemon for this home is version ${shown(hello.version)} (IPC protocol ${hello.protocol}), and this client is version ${shown(expected)} (IPC protocol 1). ${REMEDY}`, hello);
 			client.daemonHello = hello;
 			return client;
@@ -12387,6 +12552,7 @@ const HINTS = {
 	login_denied: "the sign-in was denied at Jelly ID; run messaging login again if it was you, or check the account.",
 	log_conflict: "retry: the device log changed at the same time.",
 	conv_conflict: "retry: the conversation changed at the same time.",
+	conflict: "your settings changed at the same time: run the command again to see them, then choose again.",
 	stale_epoch: "retry: the conversation's keys changed at the same time.",
 	device_limit: "remove one of this person's devices first.",
 	admission_required: "bind this device from Jelly, or approve it from one of your Jelly devices.",
@@ -13146,9 +13312,94 @@ const grant = {
 function optional(key, value) {
 	return value === void 0 ? {} : { [key]: value };
 }
+function choiceLabel(group, value) {
+	return group.options.find((o) => o.value === value)?.label ?? value;
+}
+function printReach(ctx, snapshot) {
+	ctx.out.lines(table([
+		"QUESTION",
+		"CHOICE",
+		"MEANS"
+	], snapshot.groups.map((g) => {
+		const option = g.options.find((o) => o.value === (g.value ?? "ask"));
+		return [
+			g.label,
+			g.value === null ? `${choiceLabel(g, "ask")} (the default)` : choiceLabel(g, g.value),
+			option?.description ?? ""
+		];
+	}), ctx.out.style));
+	for (const g of snapshot.groups) if (g.lapsed !== void 0) ctx.out.line(ctx.out.style.yellow(`${g.label}: ${choiceLabel(g, g.lapsed)} lapsed with the device that chose it; choose again.`));
+}
 const CONSENT_COMMANDS = [
 	grants,
 	grant,
+	{
+		name: "reach",
+		summary: "Show or set who can message you and how agents may ask yours: open, ask (me first) or never",
+		usage: "[--message open|ask|never] [--ask open|ask|never] [--dry-run]",
+		details: [
+			"--message (Who can message you) is for people outside your org: open lets anyone message you; ask (the default)",
+			"has them send a message request first; never refuses them and their requests. Your org can always message you.",
+			"--ask (How agents may ask yours) is for your teammates' agents: open lets them ask your agents without asking you",
+			"(guarded); ask (the default) holds each request for you (messaging requests); never refuses them. Agents of people",
+			"outside your org never may. A grant you set for one person (messaging grant) wins over either choice.",
+			"With no option it shows your choices. --dry-run prints what the change would do and changes nothing.",
+			"A device of yours on an older Messaging release does not enforce these choices: update every device."
+		].join("\n"),
+		options: {
+			message: {
+				type: "string",
+				value: "open|ask|never",
+				description: "Who can message you (people outside your org)"
+			},
+			ask: {
+				type: "string",
+				value: "open|ask|never",
+				description: "How your teammates' agents may ask yours"
+			},
+			"dry-run": {
+				type: "boolean",
+				description: "Print what it would do and change nothing"
+			}
+		},
+		args: {
+			min: 0,
+			max: 0
+		},
+		async run(ctx, _positionals, values) {
+			const changes = {
+				...optional("message", levelOption(values, "message", ReachValue, "open, ask or never")),
+				...optional("ask", levelOption(values, "ask", ReachValue, "open, ask or never"))
+			};
+			const none = Object.keys(changes).length === 0;
+			if (none && values["dry-run"] === true) throw new UsageError("--dry-run goes with --message or --ask");
+			const client = await ctx.client();
+			const shown = await client.call("reach.get", {});
+			if (none) {
+				if (ctx.json) return ctx.out.json(shown);
+				printReach(ctx, shown);
+				ctx.out.note("Change with: messaging reach --message open|ask|never --ask open|ask|never");
+				return;
+			}
+			const params = {
+				revision: shown.revision,
+				changes
+			};
+			const { sentence } = await client.call("reach.set.preview", params);
+			if (values["dry-run"] === true) {
+				if (ctx.json) ctx.out.json({ sentence });
+				else ctx.out.line(sentence);
+				return;
+			}
+			const result = await client.call("reach.set", params);
+			if (ctx.json) return ctx.out.json({
+				sentence,
+				...result
+			});
+			ctx.out.line(sentence);
+			printReach(ctx, result);
+		}
+	},
 	{
 		name: "requests",
 		summary: "List the requests waiting for you, or answer one: once, always, accept, decline or block",
@@ -13191,7 +13442,7 @@ const CONSENT_COMMANDS = [
 			if (values.all === true) throw new UsageError("--all goes with `requests answer`");
 			const { requests: held } = await client.call("request.list", {});
 			if (ctx.json) {
-				ctx.out.json({ requests: held });
+				ctx.out.json({ requests: held.map(({ actions: _actions, ...request }) => request) });
 				return;
 			}
 			if (held.length === 0) {
@@ -14929,6 +15180,12 @@ function conversationEvent(event) {
 			type: event.type,
 			pos: event.pos
 		};
+		case "task": return {
+			type: event.type,
+			task: event.task.task.id,
+			role: event.task.role,
+			state: event.task.task.status.state
+		};
 	}
 }
 async function syncConversations(client, ctx, position) {
@@ -16285,6 +16542,7 @@ const SECTIONS = [
 		"devices",
 		"grants",
 		"grant",
+		"reach",
 		"requests",
 		"contact",
 		"card",