@openclaw/nostr 2026.7.2-beta.1 → 2026.7.2-beta.3

package/dist/api.js

@@ -1,10 +1,10 @@
-import { o as resolveNostrAccount } from "./setup-surface-CKamwGa3.js";
+import { o as resolveNostrAccount } from "./setup-surface-BF7_7BEx.js";
 import { getPluginRuntimeGatewayRequestScope } from "./runtime-api.js";
 import { n as NostrProfileSchema } from "./config-schema-CelPzg1N.js";
-import { a as setNostrRuntime, i as getNostrRuntime, n as nostrPlugin, o as contentToProfile, r as publishNostrProfile, t as getNostrProfileState } from "./channel-BZfbDZcY.js";
+import { a as setNostrRuntime, i as getNostrRuntime, n as nostrPlugin, o as contentToProfile, r as publishNostrProfile, t as getNostrProfileState } from "./channel-DgBHZ53s.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { z } from "zod";
-import { SimplePool, verifyEvent } from "nostr-tools";
+import { SimplePool } from "nostr-tools";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { readJsonBodyWithLimit, requestBodyErrorToText } from "openclaw/plugin-sdk/webhook-request-guards";
@@ -79,72 +79,45 @@ async function importProfileFromRelays(opts) {
 		relaysQueried: []
 	};
 	const pool = new SimplePool();
-	const relaysQueried = [];
-	const timers = [];
-	const scheduleTimeout = (callback) => {
-		const timer = setTimeout(callback, timeoutMs);
-		timer.unref?.();
-		timers.push(timer);
-		return timer;
-	};
+	const relaysQueried = [...relays];
+	let deadlineTimer;
+	const deadline = new Promise((resolve) => {
+		deadlineTimer = setTimeout(resolve, timeoutMs);
+		deadlineTimer.unref?.();
+	});
+	const subscriptions = [];
 	try {
 		const events = [];
-		const timeoutPromise = new Promise((resolve) => {
-			scheduleTimeout(resolve);
-		});
-		const subscriptionPromise = new Promise((resolve) => {
-			let completed = 0;
-			for (const relay of relays) {
-				relaysQueried.push(relay);
-				const profileFilter = {
-					kinds: [0],
-					authors: [pubkey],
-					limit: 1
-				};
-				const sub = pool.subscribeMany([relay], profileFilter, {
-					onevent(event) {
-						events.push({
-							event,
-							relay
-						});
-					},
-					oneose() {
-						completed++;
-						if (completed >= relays.length) resolve();
-					},
-					onclose() {
-						completed++;
-						if (completed >= relays.length) resolve();
-					}
-				});
-				scheduleTimeout(() => {
-					sub.close();
-				});
-			}
-		});
-		await Promise.race([subscriptionPromise, timeoutPromise]);
-		for (const timer of timers.splice(0)) clearTimeout(timer);
+		await Promise.race([Promise.all(relays.map((relay) => new Promise((resolve) => {
+			const subscription = pool.subscribeMany([relay], {
+				kinds: [0],
+				authors: [pubkey],
+				limit: 1
+			}, {
+				onevent(event) {
+					events.push({
+						event,
+						relay
+					});
+				},
+				oneose() {
+					resolve();
+				},
+				onclose() {
+					resolve();
+				}
+			});
+			subscriptions.push(subscription);
+		}))), deadline]);
 		if (events.length === 0) return {
 			ok: false,
 			error: "No profile found on any relay",
 			relaysQueried
 		};
-		let bestEvent = null;
-		for (const item of events) if (!bestEvent || item.event.created_at > bestEvent.event.created_at) bestEvent = item;
-		if (!bestEvent) return {
-			ok: false,
-			error: "No valid profile event found",
-			relaysQueried
-		};
-		if (!verifyEvent(bestEvent.event)) return {
-			ok: false,
-			error: "Profile event has invalid signature",
-			relaysQueried,
-			sourceRelay: bestEvent.relay
-		};
-		let content;
+		const bestEvent = events.reduce((current, candidate) => candidate.event.created_at > current.event.created_at ? candidate : current);
+		let parsedContent;
 		try {
-			content = JSON.parse(bestEvent.event.content);
+			parsedContent = JSON.parse(bestEvent.event.content);
 		} catch {
 			return {
 				ok: false,
@@ -153,9 +126,15 @@ async function importProfileFromRelays(opts) {
 				sourceRelay: bestEvent.relay
 			};
 		}
+		if (typeof parsedContent !== "object" || parsedContent === null || Array.isArray(parsedContent)) return {
+			ok: false,
+			error: "Profile event content must be a JSON object",
+			relaysQueried,
+			sourceRelay: bestEvent.relay
+		};
 		return {
 			ok: true,
-			profile: sanitizeProfileUrls(contentToProfile(content)),
+			profile: sanitizeProfileUrls(contentToProfile(parsedContent)),
 			event: {
 				id: bestEvent.event.id,
 				pubkey: bestEvent.event.pubkey,
@@ -165,7 +144,8 @@ async function importProfileFromRelays(opts) {
 			sourceRelay: bestEvent.relay
 		};
 	} finally {
-		for (const timer of timers) clearTimeout(timer);
+		if (deadlineTimer) clearTimeout(deadlineTimer);
+		for (const subscription of subscriptions) subscription.close();
 		pool.close(relays);
 	}
 }

package/dist/{channel-BZfbDZcY.js → channel-DgBHZ53s.js}

@@ -1,4 +1,4 @@
-import { a as resolveDefaultNostrAccountId, c as validatePrivateKey, i as listNostrAccountIds, n as nostrSetupWizard, o as resolveNostrAccount, s as normalizePubkey, t as nostrSetupAdapter } from "./setup-surface-CKamwGa3.js";
+import { a as resolveDefaultNostrAccountId, c as validatePrivateKey, i as listNostrAccountIds, n as nostrSetupWizard, o as resolveNostrAccount, s as normalizePubkey, t as nostrSetupAdapter } from "./setup-surface-BF7_7BEx.js";
 import { a as collectStatusIssuesFromLastError, i as buildChannelConfigSchema, n as NostrProfileSchema, o as createDefaultChannelRuntimeState, r as DEFAULT_ACCOUNT_ID, s as formatPairingApproveHint, t as NostrConfigSchema } from "./config-schema-CelPzg1N.js";
 import { i as DEFAULT_RELAYS } from "./setup-adapter-DEU3o8MF.js";
 import { t as normalizeNostrStateAccountId } from "./state-account-id-CvBZ9s6P.js";
@@ -275,6 +275,16 @@ function contentToProfile(content) {
 	return profile;
 }
 //#endregion
+//#region extensions/nostr/src/relay-publish.ts
+const CONNECTION_FAILURE_PREFIX = "connection failure: ";
+async function publishNostrEventToRelay(pool, relay, event) {
+	const publishPromise = pool.publish([relay], event)[0];
+	if (!publishPromise) throw new Error(`Failed to create publish promise for relay ${relay}`);
+	const result = await publishPromise;
+	if (result.startsWith(CONNECTION_FAILURE_PREFIX)) throw new Error(result.slice(20));
+	return result;
+}
+//#endregion
 //#region extensions/nostr/src/nostr-profile.ts
 /**
 * Nostr Profile Management (NIP-01 kind:0)
@@ -323,7 +333,7 @@ async function publishProfileEvent(pool, relays, event) {
 			const timeoutPromise = new Promise((_, reject) => {
 				timer = setTimeout(() => reject(/* @__PURE__ */ new Error("timeout")), RELAY_PUBLISH_TIMEOUT_MS);
 			});
-			await Promise.race([...pool.publish([relay], event), timeoutPromise]);
+			await Promise.race([publishNostrEventToRelay(pool, relay, event), timeoutPromise]);
 			successes.push(relay);
 		} catch (err) {
 			const errorMessage = formatErrorMessage(err);
@@ -820,7 +830,7 @@ async function startNostrBus(options) {
 				return;
 			}
 			const replyTo = async (text) => {
-				await sendEncryptedDm(pool, sk, event.pubkey, text, relays, metrics, circuitBreakers, healthTracker, onError);
+				await sendEncryptedDm(pool, sk, event.pubkey, text, relays, metrics, circuitBreakers, healthTracker, onError, event.id);
 			};
 			const rejectIfGlobalRateLimited = () => {
 				updateRateLimiterSizeMetric();
@@ -918,7 +928,7 @@ async function startNostrBus(options) {
 		abort: relayAbort.signal
 	});
 	const sendDm = async (toPubkey, text) => {
-		await sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circuitBreakers, healthTracker, onError);
+		return await sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circuitBreakers, healthTracker, onError);
 	};
 	const publishProfile$1 = async (profile) => {
 		const lastPublishedAt = (await readNostrProfileState({ accountId }))?.lastPublishedAt ?? void 0;
@@ -971,11 +981,14 @@ async function startNostrBus(options) {
 /**
 * Send an encrypted DM to a pubkey
 */
-async function sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circuitBreakers, healthTracker, onError) {
+async function sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circuitBreakers, healthTracker, onError, replyToEventId) {
+	const ciphertext = encrypt(sk, toPubkey, text);
+	const tags = [["p", toPubkey]];
+	if (replyToEventId) tags.push(["e", replyToEventId]);
 	const reply = finalizeEvent({
 		kind: 4,
-		content: encrypt(sk, toPubkey, text),
-		tags: [["p", toPubkey]],
+		content: ciphertext,
+		tags,
 		created_at: Math.floor(Date.now() / 1e3)
 	}, sk);
 	const sortedRelays = healthTracker.getSortedRelays(relays);
@@ -985,15 +998,13 @@ async function sendEncryptedDm(pool, sk, toPubkey, text, relays, metrics, circui
 		if (cb && !cb.canAttempt()) continue;
 		const startTime = Date.now();
 		try {
-			const publishPromises = pool.publish([relay], reply);
-			if (publishPromises.length === 0) throw new Error(`Failed to create publish promise for relay ${relay}`);
-			await publishPromises[0];
+			await publishNostrEventToRelay(pool, relay, reply);
 			const latency = Date.now() - startTime;
 			cb?.recordSuccess();
 			healthTracker.recordSuccess(relay, latency);
-			return;
+			return reply.id;
 		} catch (err) {
-			lastError = err;
+			lastError = err instanceof Error ? err : new Error(String(err));
 			const latency = Date.now() - startTime;
 			cb?.recordFailure();
 			healthTracker.recordFailure(relay);
@@ -1109,10 +1120,9 @@ const startNostrGatewayAccount = async (ctx) => {
 						ctx.log?.warn?.(`[${account.accountId}] dropping Nostr DM after preflight drift (${senderPubkey}, ${resolvedAccess.senderAccess.reasonCode})`);
 						return;
 					}
-					const { dispatchInboundDirectDmWithRuntime } = await import("./inbound-direct-dm-runtime-EdLLVtkh.js");
-					await dispatchInboundDirectDmWithRuntime({
+					const { dispatchInboundDirectDm } = await import("./inbound-direct-dm-runtime-DHn9NoYN.js");
+					await dispatchInboundDirectDm({
 						cfg: ctx.cfg,
-						runtime,
 						channel: "nostr",
 						channelLabel: "Nostr",
 						accountId: account.accountId,
@@ -1216,10 +1226,9 @@ const nostrOutboundAdapter = {
 		});
 		const message = core.channel.text.convertMarkdownTables(text ?? "", tableMode);
 		const normalizedTo = normalizePubkey(to);
-		await bus.sendDm(normalizedTo, message);
 		return attachChannelToResult("nostr", {
 			to: normalizedTo,
-			messageId: `nostr-${Date.now()}`
+			messageId: await bus.sendDm(normalizedTo, message)
 		});
 	}
 };
@@ -1339,7 +1348,7 @@ const nostrPlugin = createChatChannelPlugin({
 			targetResolver: {
 				looksLikeId: (input) => {
 					const trimmed = input.trim();
-					return trimmed.startsWith("npub1") || /^[0-9a-fA-F]{64}$/.test(trimmed);
+					return trimmed.startsWith("npub1") || trimmed.startsWith("NPUB1") || /^[0-9a-fA-F]{64}$/.test(trimmed);
 				},
 				hint: "<npub|hex pubkey|nostr:npub...>"
 			},

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { n as nostrPlugin } from "./channel-BZfbDZcY.js";
+import { n as nostrPlugin } from "./channel-DgBHZ53s.js";
 export { nostrPlugin };

package/dist/inbound-direct-dm-runtime-DHn9NoYN.js

@@ -0,0 +1,2 @@
+import { dispatchInboundDirectDm } from "openclaw/plugin-sdk/channel-inbound";
+export { dispatchInboundDirectDm };

package/dist/setup-api.js

@@ -1,2 +1,2 @@
-import { n as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-CKamwGa3.js";
+import { n as nostrSetupWizard, t as nostrSetupAdapter } from "./setup-surface-BF7_7BEx.js";
 export { nostrSetupAdapter, nostrSetupWizard };

package/dist/setup-plugin-api.js

@@ -43,7 +43,7 @@ function resolveSetupNostrAccount(params) {
 	};
 }
 function looksLikeNostrPrivateKey(privateKey) {
-	return privateKey.startsWith("nsec1") || /^[0-9a-fA-F]{64}$/.test(privateKey);
+	return privateKey.startsWith("nsec1") || privateKey.startsWith("NSEC1") || /^[0-9a-fA-F]{64}$/.test(privateKey);
 }
 const nostrSetupAdapter = createNostrSetupAdapter({
 	resolveAccountId: (cfg, accountId) => accountId?.trim() || resolveDefaultSetupNostrAccountId(cfg),
@@ -51,7 +51,7 @@ const nostrSetupAdapter = createNostrSetupAdapter({
 });
 const nostrSetupWizard = createDelegatedSetupWizardProxy({
 	channel,
-	loadWizard: async () => (await import("./setup-surface-CKamwGa3.js").then((n) => n.r)).nostrSetupWizard,
+	loadWizard: async () => (await import("./setup-surface-BF7_7BEx.js").then((n) => n.r)).nostrSetupWizard,
 	status: { ...createStandardChannelSetupStatus({
 		channelLabel: "Nostr",
 		configuredLabel: t("wizard.channels.statusConfigured"),

package/dist/{setup-surface-CKamwGa3.js → setup-surface-BF7_7BEx.js}

@@ -5,7 +5,7 @@ import { getPublicKey, nip19 } from "nostr-tools";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { listCombinedAccountIds, resolveListedDefaultAccountId } from "openclaw/plugin-sdk/account-resolution";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/routing";
-import { createSetupTranslator, createStandardChannelSetupStatus, createTopLevelChannelDmPolicy, createTopLevelChannelParsedAllowFromPrompt, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection } from "openclaw/plugin-sdk/setup";
+import { createSetupTranslator, createStandardChannelSetupStatus, createTopLevelChannelDmPolicy, createTopLevelChannelParsedAllowFromPrompt, defineTokenCredential, formatDocsLink, mergeAllowFromEntries, parseSetupEntriesWithParser, patchTopLevelChannelConfigSection, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -24,7 +24,7 @@ var __exportAll = (all, no_symbols) => {
 */
 function validatePrivateKey(key) {
 	const trimmed = key.trim();
-	if (trimmed.startsWith("nsec1")) {
+	if (trimmed.startsWith("nsec1") || trimmed.startsWith("NSEC1")) {
 		const decoded = nip19.decode(trimmed);
 		if (decoded.type !== "nsec") throw new Error("Invalid nsec key: wrong type");
 		return decoded.data;
@@ -45,7 +45,7 @@ function getPublicKeyFromPrivate(privateKey) {
 */
 function normalizePubkey(input) {
 	const trimmed = input.trim();
-	if (trimmed.startsWith("npub1")) {
+	if (trimmed.startsWith("npub1") || trimmed.startsWith("NPUB1")) {
 		const decoded = nip19.decode(trimmed);
 		if (decoded.type !== "npub" || typeof decoded.data !== "string") throw new Error("Invalid npub key");
 		return decoded.data.toLowerCase();
@@ -209,8 +209,9 @@ const nostrSetupWizard = {
 			patch: buildNostrSetupPatch(accountId, {})
 		})
 	},
-	credentials: [{
+	credentials: [defineTokenCredential({
 		inputKey: "privateKey",
+		configKey: "privateKey",
 		providerHint: channel,
 		credentialLabel: "private key",
 		preferredEnvVar: "NOSTR_PRIVATE_KEY",
@@ -220,32 +221,23 @@ const nostrSetupWizard = {
 		keepPrompt: t("wizard.nostr.privateKeyKeep"),
 		inputPrompt: t("wizard.nostr.privateKeyInput"),
 		allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID$1,
-		inspect: ({ cfg, accountId }) => {
-			const account = resolveNostrAccount({
-				cfg,
-				accountId
-			});
-			return {
-				accountConfigured: account.configured,
-				hasConfiguredValue: hasConfiguredSecretInput(account.config.privateKey),
-				resolvedValue: normalizeSecretInputString(account.config.privateKey),
-				envValue: process.env.NOSTR_PRIVATE_KEY?.trim()
-			};
-		},
-		applyUseEnv: async ({ cfg, accountId }) => patchTopLevelChannelConfigSection({
+		resolveAccount: ({ cfg, accountId }) => resolveNostrAccount({
 			cfg,
-			channel,
-			enabled: true,
-			clearFields: ["privateKey"],
-			patch: buildNostrSetupPatch(accountId, {})
+			accountId
 		}),
-		applySet: async ({ cfg, accountId, resolvedValue }) => patchTopLevelChannelConfigSection({
+		accountConfigured: (account) => account.configured,
+		resolvedValue: (account) => normalizeSecretInputString(account.config.privateKey),
+		envValue: () => process.env.NOSTR_PRIVATE_KEY?.trim(),
+		patchAccount: ({ cfg, accountId, patch, clearFields }) => patchTopLevelChannelConfigSection({
 			cfg,
 			channel,
 			enabled: true,
-			patch: buildNostrSetupPatch(accountId, { privateKey: resolvedValue })
-		})
-	}],
+			clearFields,
+			patch: buildNostrSetupPatch(accountId, patch)
+		}),
+		useEnv: { clearFields: ["privateKey"] },
+		set: { value: "resolved" }
+	})],
 	textInputs: [{
 		inputKey: "relayUrls",
 		message: t("wizard.nostr.relayUrlsPrompt"),
@@ -276,11 +268,7 @@ const nostrSetupWizard = {
 		}
 	}],
 	dmPolicy: nostrDmPolicy,
-	disable: (cfg) => patchTopLevelChannelConfigSection({
-		cfg,
-		channel,
-		patch: { enabled: false }
-	})
+	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 };
 //#endregion
 export { resolveDefaultNostrAccountId as a, validatePrivateKey as c, listNostrAccountIds as i, nostrSetupWizard as n, resolveNostrAccount as o, setup_surface_exports as r, normalizePubkey as s, nostrSetupAdapter as t };

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "@openclaw/nostr",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/nostr",
-      "version": "2026.7.2-beta.1",
+      "version": "2026.7.2-beta.3",
       "dependencies": {
         "nostr-tools": "2.23.9",
         "zod": "4.4.3"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.7.2-beta.1"
+        "openclaw": ">=2026.7.2-beta.3"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/nostr",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.3",
   "description": "OpenClaw Nostr channel plugin for NIP-04 encrypted direct messages.",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.1"
+    "openclaw": ">=2026.7.2-beta.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -50,10 +50,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.1"
+      "pluginApi": ">=2026.7.2-beta.3"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.1"
+      "openclawVersion": "2026.7.2-beta.3"
     },
     "release": {
       "publishToClawHub": true,

package/dist/inbound-direct-dm-runtime-EdLLVtkh.js

@@ -1,2 +0,0 @@
-import { dispatchInboundDirectDmWithRuntime } from "openclaw/plugin-sdk/channel-inbound";
-export { dispatchInboundDirectDmWithRuntime };