@openclaw/nostr 2026.7.1 → 2026.7.2-beta.2

package/dist/api.js

@@ -1,10 +1,10 @@
-import { o as resolveNostrAccount } from "./setup-surface-CKamwGa3.js";
+import { o as resolveNostrAccount } from "./setup-surface-B52P4uo2.js";
 import { getPluginRuntimeGatewayRequestScope } from "./runtime-api.js";
-import { n as NostrProfileSchema } from "./config-schema-DIiXiBKr.js";
-import { a as setNostrRuntime, i as getNostrRuntime, n as nostrPlugin, o as contentToProfile, r as publishNostrProfile, t as getNostrProfileState } from "./channel-B2Y66pl3.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-B51rExHD.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,69 +79,42 @@ 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
-		};
+		const bestEvent = events.reduce((current, candidate) => candidate.event.created_at > current.event.created_at ? candidate : current);
 		let content;
 		try {
 			content = JSON.parse(bestEvent.event.content);
@@ -165,7 +138,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-B2Y66pl3.js → channel-B51rExHD.js}

@@ -1,5 +1,5 @@
-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 collectStatusIssuesFromLastError, i as buildChannelConfigSchema, n as NostrProfileSchema, o as createDefaultChannelRuntimeState, r as DEFAULT_ACCOUNT_ID, s as formatPairingApproveHint, t as NostrConfigSchema } from "./config-schema-DIiXiBKr.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-B52P4uo2.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";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
@@ -20,41 +20,62 @@ import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 import { resolveIntegerOption, resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { buildChannelOutboundSessionRoute, stripChannelTargetPrefix } from "openclaw/plugin-sdk/core";
 //#region extensions/nostr/src/metrics.ts
+function createZeroMetricsState() {
+	return {
+		eventsReceived: 0,
+		eventsProcessed: 0,
+		eventsDuplicate: 0,
+		eventsRejected: {
+			invalidShape: 0,
+			wrongKind: 0,
+			stale: 0,
+			future: 0,
+			rateLimited: 0,
+			invalidSignature: 0,
+			oversizedCiphertext: 0,
+			oversizedPlaintext: 0,
+			decryptFailed: 0,
+			selfMessage: 0
+		},
+		relays: /* @__PURE__ */ new Map(),
+		rateLimiting: {
+			perSenderHits: 0,
+			globalHits: 0
+		},
+		decrypt: {
+			success: 0,
+			failure: 0
+		},
+		memory: {
+			seenTrackerSize: 0,
+			rateLimiterEntries: 0
+		}
+	};
+}
+function createMetricsSnapshot(state, snapshotAt) {
+	const relays = {};
+	for (const [url, stats] of state.relays) relays[url] = {
+		...stats,
+		messagesReceived: { ...stats.messagesReceived }
+	};
+	return {
+		...state,
+		eventsRejected: { ...state.eventsRejected },
+		relays,
+		rateLimiting: { ...state.rateLimiting },
+		decrypt: { ...state.decrypt },
+		memory: { ...state.memory },
+		snapshotAt: snapshotAt ?? Date.now()
+	};
+}
 /**
 * Create a metrics collector instance.
 * Optionally pass an onMetric callback to receive real-time metric events.
 */
 function createMetrics(onMetric) {
-	let eventsReceived = 0;
-	let eventsProcessed = 0;
-	let eventsDuplicate = 0;
-	const eventsRejected = {
-		invalidShape: 0,
-		wrongKind: 0,
-		stale: 0,
-		future: 0,
-		rateLimited: 0,
-		invalidSignature: 0,
-		oversizedCiphertext: 0,
-		oversizedPlaintext: 0,
-		decryptFailed: 0,
-		selfMessage: 0
-	};
-	const relays = /* @__PURE__ */ new Map();
-	const rateLimiting = {
-		perSenderHits: 0,
-		globalHits: 0
-	};
-	const decrypt = {
-		success: 0,
-		failure: 0
-	};
-	const memory = {
-		seenTrackerSize: 0,
-		rateLimiterEntries: 0
-	};
+	let state = createZeroMetricsState();
 	function getOrCreateRelay(url) {
-		let relay = relays.get(url);
+		let relay = state.relays.get(url);
 		if (!relay) {
 			relay = {
 				connects: 0,
@@ -73,7 +94,7 @@ function createMetrics(onMetric) {
 				circuitBreakerOpens: 0,
 				circuitBreakerCloses: 0
 			};
-			relays.set(url, relay);
+			state.relays.set(url, relay);
 		}
 		return relay;
 	}
@@ -87,43 +108,43 @@ function createMetrics(onMetric) {
 		const relayUrl = labels?.relay;
 		switch (name) {
 			case "event.received":
-				eventsReceived += value;
+				state.eventsReceived += value;
 				break;
 			case "event.processed":
-				eventsProcessed += value;
+				state.eventsProcessed += value;
 				break;
 			case "event.duplicate":
-				eventsDuplicate += value;
+				state.eventsDuplicate += value;
 				break;
 			case "event.rejected.invalid_shape":
-				eventsRejected.invalidShape += value;
+				state.eventsRejected.invalidShape += value;
 				break;
 			case "event.rejected.wrong_kind":
-				eventsRejected.wrongKind += value;
+				state.eventsRejected.wrongKind += value;
 				break;
 			case "event.rejected.stale":
-				eventsRejected.stale += value;
+				state.eventsRejected.stale += value;
 				break;
 			case "event.rejected.future":
-				eventsRejected.future += value;
+				state.eventsRejected.future += value;
 				break;
 			case "event.rejected.rate_limited":
-				eventsRejected.rateLimited += value;
+				state.eventsRejected.rateLimited += value;
 				break;
 			case "event.rejected.invalid_signature":
-				eventsRejected.invalidSignature += value;
+				state.eventsRejected.invalidSignature += value;
 				break;
 			case "event.rejected.oversized_ciphertext":
-				eventsRejected.oversizedCiphertext += value;
+				state.eventsRejected.oversizedCiphertext += value;
 				break;
 			case "event.rejected.oversized_plaintext":
-				eventsRejected.oversizedPlaintext += value;
+				state.eventsRejected.oversizedPlaintext += value;
 				break;
 			case "event.rejected.decrypt_failed":
-				eventsRejected.decryptFailed += value;
+				state.eventsRejected.decryptFailed += value;
 				break;
 			case "event.rejected.self_message":
-				eventsRejected.selfMessage += value;
+				state.eventsRejected.selfMessage += value;
 				break;
 			case "relay.connect":
 				if (relayUrl) getOrCreateRelay(relayUrl).connects += value;
@@ -173,66 +194,30 @@ function createMetrics(onMetric) {
 				if (relayUrl) getOrCreateRelay(relayUrl).circuitBreakerState = "half_open";
 				break;
 			case "rate_limit.per_sender":
-				rateLimiting.perSenderHits += value;
+				state.rateLimiting.perSenderHits += value;
 				break;
 			case "rate_limit.global":
-				rateLimiting.globalHits += value;
+				state.rateLimiting.globalHits += value;
 				break;
 			case "decrypt.success":
-				decrypt.success += value;
+				state.decrypt.success += value;
 				break;
 			case "decrypt.failure":
-				decrypt.failure += value;
+				state.decrypt.failure += value;
 				break;
 			case "memory.seen_tracker_size":
-				memory.seenTrackerSize = value;
+				state.memory.seenTrackerSize = value;
 				break;
 			case "memory.rate_limiter_entries":
-				memory.rateLimiterEntries = value;
+				state.memory.rateLimiterEntries = value;
 				break;
 		}
 	}
 	function getSnapshot() {
-		const relaysObj = {};
-		for (const [url, stats] of relays) relaysObj[url] = {
-			...stats,
-			messagesReceived: { ...stats.messagesReceived }
-		};
-		return {
-			eventsReceived,
-			eventsProcessed,
-			eventsDuplicate,
-			eventsRejected: { ...eventsRejected },
-			relays: relaysObj,
-			rateLimiting: { ...rateLimiting },
-			decrypt: { ...decrypt },
-			memory: { ...memory },
-			snapshotAt: Date.now()
-		};
+		return createMetricsSnapshot(state);
 	}
 	function reset() {
-		eventsReceived = 0;
-		eventsProcessed = 0;
-		eventsDuplicate = 0;
-		Object.assign(eventsRejected, {
-			invalidShape: 0,
-			wrongKind: 0,
-			stale: 0,
-			future: 0,
-			rateLimited: 0,
-			invalidSignature: 0,
-			oversizedCiphertext: 0,
-			oversizedPlaintext: 0,
-			decryptFailed: 0,
-			selfMessage: 0
-		});
-		relays.clear();
-		rateLimiting.perSenderHits = 0;
-		rateLimiting.globalHits = 0;
-		decrypt.success = 0;
-		decrypt.failure = 0;
-		memory.seenTrackerSize = 0;
-		memory.rateLimiterEntries = 0;
+		state = createZeroMetricsState();
 	}
 	return {
 		emit,
@@ -244,37 +229,7 @@ function createMetrics(onMetric) {
 * Create a no-op metrics instance (for when metrics are disabled).
 */
 function createNoopMetrics() {
-	const emptySnapshot = {
-		eventsReceived: 0,
-		eventsProcessed: 0,
-		eventsDuplicate: 0,
-		eventsRejected: {
-			invalidShape: 0,
-			wrongKind: 0,
-			stale: 0,
-			future: 0,
-			rateLimited: 0,
-			invalidSignature: 0,
-			oversizedCiphertext: 0,
-			oversizedPlaintext: 0,
-			decryptFailed: 0,
-			selfMessage: 0
-		},
-		relays: {},
-		rateLimiting: {
-			perSenderHits: 0,
-			globalHits: 0
-		},
-		decrypt: {
-			success: 0,
-			failure: 0
-		},
-		memory: {
-			seenTrackerSize: 0,
-			rateLimiterEntries: 0
-		},
-		snapshotAt: 0
-	};
+	const emptySnapshot = createMetricsSnapshot(createZeroMetricsState(), 0);
 	return {
 		emit: () => {},
 		getSnapshot: () => ({
@@ -603,10 +558,7 @@ function createSeenTracker(options) {
 	}
 	function seed(ids) {
 		const now = Date.now();
-		for (let i = ids.length - 1; i >= 0; i--) {
-			const id = ids[i];
-			if (!entries.has(id) && entries.size < maxEntries) insertAtFront(id, now);
-		}
+		for (const id of ids.toReversed()) if (!entries.has(id) && entries.size < maxEntries) insertAtFront(id, now);
 	}
 	return {
 		has,

package/dist/channel-plugin-api.js

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

package/dist/{config-schema-DIiXiBKr.js → config-schema-CelPzg1N.js}

@@ -1,6 +1,6 @@
 import { collectStatusIssuesFromLastError, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
 import { DEFAULT_ACCOUNT_ID, buildChannelConfigSchema, formatPairingApproveHint } from "openclaw/plugin-sdk/channel-plugin-common";
-import { AllowFromListSchema, DmPolicySchema, MarkdownConfigSchema } from "openclaw/plugin-sdk/channel-config-primitives";
+import { AllowFromListSchema, DmPolicySchema, MarkdownConfigSchema } from "openclaw/plugin-sdk/channel-config-schema";
 import { buildSecretInputSchema } from "openclaw/plugin-sdk/secret-input";
 import { z } from "zod";
 //#region extensions/nostr/src/config-schema.ts

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-B52P4uo2.js";
 export { nostrSetupAdapter, nostrSetupWizard };

package/dist/setup-plugin-api.js

@@ -1,4 +1,4 @@
-import { i as buildChannelConfigSchema, t as NostrConfigSchema } from "./config-schema-DIiXiBKr.js";
+import { i as buildChannelConfigSchema, t as NostrConfigSchema } from "./config-schema-CelPzg1N.js";
 import { i as DEFAULT_RELAYS, n as createNostrSetupAdapter } from "./setup-adapter-DEU3o8MF.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID, createDelegatedSetupWizardProxy, createSetupTranslator, createStandardChannelSetupStatus } from "openclaw/plugin-sdk/setup-runtime";
@@ -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-B52P4uo2.js").then((n) => n.r)).nostrSetupWizard,
 	status: { ...createStandardChannelSetupStatus({
 		channelLabel: "Nostr",
 		configuredLabel: t("wizard.channels.statusConfigured"),

package/dist/{setup-surface-CKamwGa3.js → setup-surface-B52P4uo2.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) => {
@@ -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.1",
+  "version": "2026.7.2-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/nostr",
-      "version": "2026.7.1",
+      "version": "2026.7.2-beta.2",
       "dependencies": {
         "nostr-tools": "2.23.9",
         "zod": "4.4.3"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.7.1"
+        "openclaw": ">=2026.7.2-beta.2"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/nostr",
-  "version": "2026.7.1",
+  "version": "2026.7.2-beta.2",
   "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.1"
+    "openclaw": ">=2026.7.2-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -50,10 +50,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.7.1"
+      "pluginApi": ">=2026.7.2-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.7.1"
+      "openclawVersion": "2026.7.2-beta.2"
     },
     "release": {
       "publishToClawHub": true,