@rine-network/cli 0.3.0 → 0.4.0

package/dist/main.js

@@ -1700,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) {
@@ -1775,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([{
@@ -2004,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 {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rine-network/cli",
-	"version": "0.3.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",