@rine-network/cli 0.2.0 → 0.4.0

package/dist/main.js

@@ -280,6 +280,59 @@ function printError(msg) {
 	console.error(msg);
 }
 //#endregion
+//#region src/resolve-handle.ts
+const UUID_ALIAS_RE = /\/agents\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+* Resolves a handle (e.g. "agent@org.rine.network") to a UUID
+* via WebFinger (RFC 7033).
+*
+* Returns the UUID string on success, or the original input unchanged
+* on failure (caller validates UUID format and reports the error).
+*/
+async function resolveHandleViaWebFinger(handle) {
+	try {
+		const params = new URLSearchParams({ resource: `acct:${handle}` });
+		const data = await HttpClient.publicGet("/.well-known/webfinger", params);
+		for (const alias of data.aliases ?? []) {
+			const match = UUID_ALIAS_RE.exec(alias);
+			if (match?.[1]) return match[1];
+		}
+	} catch {}
+	return handle;
+}
+//#endregion
+//#region src/resolve-agent.ts
+let cached;
+/**
+* Resolve a value that may be a UUID or a handle (containing @) to a UUID.
+* Handles are resolved via WebFinger. Required because local key storage
+* is indexed by UUID.
+*/
+async function resolveToUuid(value) {
+	if (!value.includes("@")) return value;
+	const resolved = await resolveHandleViaWebFinger(value);
+	if (!UUID_RE.test(resolved)) throw new Error(`Cannot resolve handle "${value}" to agent ID. Ensure WebFinger is available or use a UUID.`);
+	return resolved;
+}
+/**
+* Resolve which agent ID to use.
+* Priority: explicit --agent flag > --as global flag > auto-resolve (single-agent shortcut).
+* Accepts both UUIDs and handles (e.g. "bot@org.rine.network").
+*/
+async function resolveAgent(client, explicit, asFlag) {
+	if (explicit) return resolveToUuid(explicit);
+	if (asFlag) return resolveToUuid(asFlag);
+	if (cached === void 0) cached = (await client.get("/agents")).items;
+	if (cached.length === 1) {
+		const agent = cached[0];
+		if (agent) return agent.id;
+	}
+	if (cached.length === 0) throw new Error("No active agents. Create one with 'rine agent create --name <name>'");
+	const lines = cached.map((a) => `  ${a.id}  ${a.handle}`).join("\n");
+	throw new Error(`Multiple agents found. Specify with --agent <uuid>:\n${lines}`);
+}
+//#endregion
 //#region src/action.ts
 /**
 * Wraps a command action with automatic client creation and error handling.
@@ -291,7 +344,7 @@ function withClient(program, fn) {
 		try {
 			const gOpts = program.opts();
 			const defaultHeaders = {};
-			if (gOpts.as) defaultHeaders["X-Rine-Agent"] = gOpts.as;
+			if (gOpts.as) defaultHeaders["X-Rine-Agent"] = await resolveToUuid(gOpts.as);
 			const { client, profileName } = await createClient(gOpts.profile, defaultHeaders);
 			await fn({
 				client,
@@ -394,10 +447,10 @@ function registerAgentProfile(program) {
 		const result = await updateCard(client, agentId, (card) => {
 			const skill = {
 				id: opts.skillId,
-				name: opts.skillName
+				name: opts.skillName,
+				description: opts.skillDescription ?? "",
+				tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : []
 			};
-			if (opts.skillDescription) skill.description = opts.skillDescription;
-			if (opts.tags) skill.tags = opts.tags.split(",").map((t) => t.trim());
 			if (opts.examples) skill.examples = opts.examples.split(",").map((e) => e.trim());
 			if (opts.inputModes) skill.inputModes = opts.inputModes.split(",").map((m) => m.trim());
 			if (opts.outputModes) skill.outputModes = opts.outputModes.split(",").map((m) => m.trim());
@@ -766,28 +819,6 @@ async function showOrgStatus(client, gOpts) {
 	]);
 }
 //#endregion
-//#region src/resolve-handle.ts
-const UUID_ALIAS_RE = /\/agents\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-/**
-* Resolves a handle (e.g. "agent@org.rine.network") to a UUID
-* via WebFinger (RFC 7033).
-*
-* Returns the UUID string on success, or the original input unchanged
-* on failure (caller validates UUID format and reports the error).
-*/
-async function resolveHandleViaWebFinger(handle) {
-	try {
-		const params = new URLSearchParams({ resource: `acct:${handle}` });
-		const data = await HttpClient.publicGet("/.well-known/webfinger", params);
-		for (const alias of data.aliases ?? []) {
-			const match = UUID_ALIAS_RE.exec(alias);
-			if (match?.[1]) return match[1];
-		}
-	} catch {}
-	return handle;
-}
-//#endregion
 //#region src/commands/discover-groups.ts
 function registerDiscoverGroups(discover, program) {
 	discover.command("groups").description("List public groups in the directory").option("-q, --query <query>", "Search query").option("--limit <n>", "Max results").option("--cursor <cursor>", "Pagination cursor").action(withErrorHandler(program, async (gOpts, opts) => {
@@ -916,25 +947,6 @@ function registerDiscover(program) {
 	registerDiscoverGroups(discover, program);
 }
 //#endregion
-//#region src/resolve-agent.ts
-let cached;
-/**
-* Resolve which agent ID to use.
-* Priority: explicit --agent flag > --as global flag > auto-resolve (single-agent shortcut).
-*/
-async function resolveAgent(client, explicit, asFlag) {
-	if (explicit) return explicit;
-	if (asFlag) return asFlag;
-	if (cached === void 0) cached = (await client.get("/agents")).items;
-	if (cached.length === 1) {
-		const agent = cached[0];
-		if (agent) return agent.id;
-	}
-	if (cached.length === 0) throw new Error("No active agents. Create one with 'rine agent create --name <name>'");
-	const lines = cached.map((a) => `  ${a.id}  ${a.handle}`).join("\n");
-	throw new Error(`Multiple agents found. Specify with --agent <uuid>:\n${lines}`);
-}
-//#endregion
 //#region src/commands/group.ts
 function groupRow(g) {
 	return {
@@ -1688,6 +1700,31 @@ async function getOrCreateSenderKey(client, senderAgentId, groupHandle, extraHea
 		groupId
 	};
 }
+/**
+* Fetch pending sender key distributions from the inbox and ingest them.
+* Used by `read` and `stream` to auto-recover when a sender key is missing.
+*
+* Optionally short-circuits once `targetSenderKeyId` is ingested.
+* Returns the number of newly ingested keys.
+*/
+async function fetchAndIngestPendingSKDistributions(client, agentId, targetSenderKeyId) {
+	const inbox = await client.get(`/agents/${agentId}/messages`, {
+		type: "rine.v1.sender_key_distribution",
+		limit: 100
+	});
+	let ingested = 0;
+	for (const msg of inbox.items) try {
+		const full = await client.get(`/messages/${msg.id}`);
+		const result = await decryptMessage(agentId, full.encrypted_payload, client);
+		if (ingestSenderKeyDistribution(agentId, full.type, result)) {
+			ingested++;
+			if (targetSenderKeyId) {
+				if (JSON.parse(result.plaintext).sender_key_id === targetSenderKeyId) break;
+			}
+		}
+	} catch {}
+	return ingested;
+}
 //#endregion
 //#region src/commands/messages.ts
 function msgFrom(m) {
@@ -1732,27 +1769,17 @@ function addMessageCommands(parent, program) {
 		}
 		const extraHeaders = {};
 		let senderAgentId;
-		if (opts.from !== void 0) if (opts.from.includes("@")) {
-			const resolved = await resolveHandleViaWebFinger(opts.from);
-			if (!UUID_RE.test(resolved)) throw new Error("Cannot resolve sender handle to agent ID. Ensure WebFinger is available or use a UUID.");
-			senderAgentId = resolved;
-			extraHeaders["X-Rine-Agent"] = resolved;
-		} else {
-			senderAgentId = opts.from;
-			extraHeaders["X-Rine-Agent"] = opts.from;
-		}
-		else if (!gOpts.as) {
+		if (opts.from !== void 0) {
+			senderAgentId = await resolveToUuid(opts.from);
+			extraHeaders["X-Rine-Agent"] = senderAgentId;
+		} else if (!gOpts.as) {
 			senderAgentId = await resolveAgent(client, void 0, void 0);
 			extraHeaders["X-Rine-Agent"] = senderAgentId;
-		} else senderAgentId = gOpts.as;
+		} else senderAgentId = await resolveToUuid(gOpts.as);
 		if (opts.idempotencyKey) extraHeaders["Idempotency-Key"] = opts.idempotencyKey;
 		let recipientAgentId;
 		if (!opts.to.includes("@")) recipientAgentId = opts.to;
-		else if (!opts.to.startsWith("#")) {
-			const resolved = await resolveHandleViaWebFinger(opts.to);
-			if (!UUID_RE.test(resolved)) throw new Error("Cannot resolve recipient handle to agent ID. Ensure WebFinger is available or use a UUID.");
-			recipientAgentId = resolved;
-		}
+		else if (!opts.to.startsWith("#")) recipientAgentId = await resolveToUuid(opts.to);
 		const body = { type: opts.type };
 		if (opts.to.includes("@")) body.to_handle = opts.to;
 		else body.to_agent_id = opts.to;
@@ -1773,32 +1800,48 @@ function addMessageCommands(parent, program) {
 	parent.command("read").description("Read and decrypt a message by ID").argument("<message-id>", "Message ID").option("--agent <id>", "Agent ID (for decryption key)").action(withClient(program, async ({ client, gOpts }, messageId, opts) => {
 		const data = await client.get(`/messages/${messageId}`);
 		const agentId = await resolveAgent(client, opts.agent, gOpts.as);
-		if ((data.encryption_version === "hpke-v1" || data.encryption_version === "sender-key-v1") && agentKeysExist(agentId)) try {
+		if ((data.encryption_version === "hpke-v1" || data.encryption_version === "sender-key-v1") && agentKeysExist(agentId)) {
 			let result;
-			if (data.encryption_version === "sender-key-v1" && data.group_id) result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
-			else result = await decryptMessage(agentId, data.encrypted_payload, client);
-			if (ingestSenderKeyDistribution(agentId, data.type, result)) printText("Sender key ingested");
-			if (gOpts.json) printJson({
-				...data,
-				decrypted_payload: JSON.parse(result.plaintext),
-				signature_verified: result.verified,
-				verification_status: result.verificationStatus,
-				sender_kid: result.senderKid
-			});
-			else printTable([{
-				ID: data.id,
-				"Conversation ID": data.conversation_id,
-				From: msgFrom(data),
-				To: msgTo(data),
-				Group: msgGroup(data),
-				Type: data.type,
-				Verified: result.verificationStatus === "verified" ? "✓" : result.verificationStatus === "invalid" ? "✗ INVALID" : "?",
-				Payload: result.plaintext.slice(0, 200),
-				Created: data.created_at
-			}]);
-			return;
-		} catch (err) {
-			if (!gOpts.json) printError(`Decryption failed: ${err instanceof Error ? err.message : String(err)}`);
+			if (data.encryption_version === "sender-key-v1" && data.group_id) try {
+				result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
+			} catch (err) {
+				const match = err instanceof Error && err.message.match(/^unknown sender key id: (.+)$/);
+				if (match) {
+					if (await fetchAndIngestPendingSKDistributions(client, agentId, match[1]) > 0) try {
+						result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
+					} catch (retryErr) {
+						if (!gOpts.json) printError(`Decryption failed after auto-ingest: ${retryErr instanceof Error ? retryErr.message : String(retryErr)}`);
+					}
+					else if (!gOpts.json) printError(`Decryption failed: ${err.message}`);
+				} else if (!gOpts.json) printError(`Decryption failed: ${err instanceof Error ? err.message : String(err)}`);
+			}
+			else try {
+				result = await decryptMessage(agentId, data.encrypted_payload, client);
+			} catch (err) {
+				if (!gOpts.json) printError(`Decryption failed: ${err instanceof Error ? err.message : String(err)}`);
+			}
+			if (result) {
+				if (ingestSenderKeyDistribution(agentId, data.type, result)) printText("Sender key ingested");
+				if (gOpts.json) printJson({
+					...data,
+					decrypted_payload: JSON.parse(result.plaintext),
+					signature_verified: result.verified,
+					verification_status: result.verificationStatus,
+					sender_kid: result.senderKid
+				});
+				else printTable([{
+					ID: data.id,
+					"Conversation ID": data.conversation_id,
+					From: msgFrom(data),
+					To: msgTo(data),
+					Group: msgGroup(data),
+					Type: data.type,
+					Verified: result.verificationStatus === "verified" ? "✓" : result.verificationStatus === "invalid" ? "✗ INVALID" : "?",
+					Payload: result.plaintext.slice(0, 200),
+					Created: data.created_at
+				}]);
+				return;
+			}
 		}
 		if (gOpts.json) printJson(data);
 		else printTable([{
@@ -2002,16 +2045,25 @@ async function formatMessageLine(dataStr, agentId, client) {
 		const msgType = data.type ?? "?";
 		const target = data.group_handle ? `${data.group_handle} (${msgType})` : msgType;
 		let preview = "[encrypted]";
-		if (data.encrypted_payload && agentKeysExist(agentId)) try {
+		if (data.encrypted_payload && agentKeysExist(agentId)) {
 			let result;
-			if (data.encryption_version === "sender-key-v1" && data.group_id) result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
-			else if (data.encryption_version === "hpke-v1") {
+			if (data.encryption_version === "sender-key-v1" && data.group_id) try {
+				result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
+			} catch (err) {
+				const match = err instanceof Error && err.message.match(/^unknown sender key id: (.+)$/);
+				if (match) {
+					if (await fetchAndIngestPendingSKDistributions(client, agentId, match[1]) > 0) try {
+						result = await decryptGroupMessage(agentId, data.group_id, data.encrypted_payload, client);
+					} catch {}
+				}
+			}
+			else if (data.encryption_version === "hpke-v1") try {
 				result = await decryptMessage(agentId, data.encrypted_payload, client);
+			} catch {}
+			if (result) {
 				ingestSenderKeyDistribution(agentId, data.type ?? "", result);
-			} else return `[${ts}] ${sender} \u2192 ${target}: [encrypted]`;
-			preview = `[${result.verified ? "✓" : "?"}] ${result.plaintext.slice(0, 60)}`;
-		} catch {
-			preview = "[decrypt failed]";
+				preview = `[${result.verified ? "✓" : "?"}] ${result.plaintext.slice(0, 60)}`;
+			} else if (data.encryption_version === "hpke-v1" || data.encryption_version === "sender-key-v1") preview = "[decrypt failed]";
 		}
 		return `[${ts}] ${sender} \u2192 ${target}: ${preview}`;
 	} catch {
@@ -2159,7 +2211,7 @@ function registerWebhook(program) {
 //#endregion
 //#region src/main.ts
 const { version } = createRequire(import.meta.url)("../package.json");
-const program = new Command("rine").version(version).description("rine.network CLI — messaging infrastructure for AI agents").option("--profile <name>", "credential profile to use", "default").option("--json", "output as JSON").option("--table", "output as table").option("--as <agent-uuid>", "act as a specific agent (sets X-Rine-Agent header)");
+const program = new Command("rine").version(version).description("rine.network CLI — messaging infrastructure for AI agents").option("--profile <name>", "credential profile to use", "default").option("--json", "output as JSON").option("--table", "output as table").option("--as <agent>", "act as a specific agent (UUID or handle, e.g. bot@org.rine.network)");
 registerAuth(program);
 registerRegister(program);
 registerOrg(program);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rine-network/cli",
-	"version": "0.2.0",
+	"version": "0.4.0",
 	"description": "CLI client for rine.network — EU-first messaging infrastructure for AI agents",
 	"author": "mmmbs <mmmbs@proton.me>",
 	"license": "EUPL-1.2",