@kehto/services 0.14.1 → 0.16.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ServiceHandler, Signer } from '@kehto/runtime';
+import { ServiceHandler, Signer, RelayEventResult } from '@kehto/runtime';
 import { IdentityGetProfileMessage, IdentityGetProfileResultMessage, IdentityGetFollowsMessage, IdentityGetFollowsResultMessage, IdentityGetListMessage, IdentityGetListResultMessage, IdentityGetZapsMessage, IdentityGetZapsResultMessage, IdentityGetMutesMessage, IdentityGetMutesResultMessage, IdentityGetBlockedMessage, IdentityGetBlockedResultMessage, IdentityGetBadgesMessage, IdentityGetBadgesResultMessage } from '@napplet/nap/identity/types';
 import { NostrFilter, NostrEvent, EventTemplate, LinkOpenOptions, LinkOpenResult, ListSupport, ListRef, ListItem, ListOptions, ListMutationResult, SerialOpenRequest, SerialOpenResult, BleEvent, BleOpenRequest, BleOpenResult, BleService, BleAttribute, BleWriteOptions, WebrtcEvent, WebrtcOpenRequest, WebrtcOpenResult, CommonProfileTarget, CommonProfileResult, CommonFollowsResult, CommonActionResult, CommonReaction, CommonReportTarget, CommonReportReason } from '@napplet/core';
 import { MediaMetadata, MediaAction } from '@napplet/nap/media/types';
@@ -1635,7 +1635,7 @@ declare function createResourceService(options: ResourceServiceOptions): Resourc
  *   Inbound:  outbox.getEvent, outbox.query, outbox.subscribe, outbox.close,
  *             outbox.publish, outbox.resolveRelays
  *   Outbound: outbox.getEvent.result, outbox.query.result, outbox.event,
- *             outbox.eose, outbox.closed, outbox.publish.result,
+ *             outbox.closed, outbox.publish.result,
  *             outbox.resolveRelays.result
  *
  * The shell owns relay discovery, routing, fallback, deduplication, signature
@@ -1653,21 +1653,12 @@ declare function createResourceService(options: ResourceServiceOptions): Resourc
  * @packageDocumentation
  */
 
-/**
- * Relay-selection strategy:
- * - `outbox` — query/publish via author write relays (the outbox model)
- * - `inbox`  — query/publish via recipient read relays (the inbox model)
- * - `auto`   — let the shell choose per its policy and relay intelligence
- */
-type OutboxStrategy = 'outbox' | 'inbox' | 'auto';
 /** Options for a single-event outbox lookup. */
 interface OutboxEventOptions {
     /** Author hint for routing through the author's outbox relays. */
     author?: string;
     /** Relay hints; treated as a hint subject to shell validation, not a bypass. */
     relays?: string[];
-    /** Relay-selection strategy. */
-    strategy?: OutboxStrategy;
     /** Wall-clock budget for the lookup, in milliseconds. */
     timeoutMs?: number;
 }
@@ -1677,8 +1668,6 @@ interface OutboxQueryOptions {
     authors?: string[];
     /** Relay hints; treated as a hint subject to shell validation, not a bypass. */
     relays?: string[];
-    /** Relay-selection strategy. */
-    strategy?: OutboxStrategy;
     /** Maximum events to collect. */
     limit?: number;
     /** Wall-clock budget for the query, in milliseconds. */
@@ -1686,8 +1675,6 @@ interface OutboxQueryOptions {
 }
 /** Options for a live outbox subscription. */
 interface OutboxSubscribeOptions extends OutboxQueryOptions {
-    /** Keep the subscription open for real-time events after EOSE. */
-    live?: boolean;
 }
 /** Options for an outbox publish. */
 interface OutboxPublishOptions {
@@ -1695,8 +1682,6 @@ interface OutboxPublishOptions {
     relays?: string[];
     /** Recipient authors whose inbox relays should be included for directed events. */
     targetAuthors?: string[];
-    /** Relay-selection strategy. */
-    strategy?: OutboxStrategy;
 }
 /** A read/write target for relay-plan resolution. */
 interface OutboxTarget {
@@ -1706,8 +1691,6 @@ interface OutboxTarget {
     pubkey?: string;
     /** Whether the plan is for reading (their write relays) or writing (their read relays). */
     direction?: 'read' | 'write';
-    /** Relay-selection strategy. */
-    strategy?: OutboxStrategy;
 }
 /** The relay plan the shell would use for a target. */
 interface OutboxRelayPlan {
@@ -1720,10 +1703,8 @@ interface OutboxRelayPlan {
 }
 /** Outcome of a single-event outbox lookup. */
 interface OutboxEventResult {
-    /** The signature-validated event matching the requested event id, when found. */
-    event?: NostrEvent;
-    /** Relay URLs where the shell observed the event. */
-    relays: string[];
+    /** The signature-validated event result matching the requested event id, when found. */
+    result?: RelayEventResult;
     /** True when some relay lists or connections failed and the lookup was partial. */
     incomplete?: boolean;
     /** Error reason when the lookup could not complete or did not find the event. */
@@ -1731,10 +1712,8 @@ interface OutboxEventResult {
 }
 /** Outcome of an outbox query, as returned by the {@link OutboxRouter}. */
 interface OutboxResult {
-    /** Deduplicated, signature-validated events. */
-    events: NostrEvent[];
-    /** Map of event id -> relay URLs where the shell observed the event. */
-    relays: Record<string, string[]>;
+    /** Deduplicated, signature-validated event results. */
+    events: RelayEventResult[];
     /** True when some relay lists or connections failed and results are partial. */
     incomplete?: boolean;
     /** Error reason when the query could not complete. */
@@ -1755,10 +1734,8 @@ interface OutboxPublishResult {
 }
 /** Sink an {@link OutboxRouter} streams subscription lifecycle through. */
 interface OutboxSubscriptionSink {
-    /** Deliver a matching event; `relay` is the relay it was observed on, when known. */
-    event(event: NostrEvent, relay?: string): void;
-    /** Signal end-of-stored-events. */
-    eose(): void;
+    /** Deliver a matching event result. */
+    event(result: RelayEventResult): void;
     /** Signal that the subscription was closed upstream; `reason` is optional. */
     closed(reason?: string): void;
 }
@@ -1818,9 +1795,6 @@ declare function createOutboxService(options: OutboxServiceOptions): ServiceHand
  * - reading an author's events  → their **write** relays (where they publish)
  * - writing to reach an author   → their **read**  relays (their inbox)
  *
- * `strategy` overrides the direction default: `outbox` forces write relays,
- * `inbox` forces read relays, `auto` (default) follows the read/write direction.
- *
  * @example
  * ```ts
  * import { createOutboxService, createRelayPoolOutboxRouter } from '@kehto/services';
@@ -3027,4 +3001,4 @@ declare function createCordnRelayCoordinatorClient(options: CordnRelayCoordinato
 /** Create a Cordn/ContextVM-backed NAP-DM adapter. */
 declare function createCordnDmAdapter(options: CordnDmAdapterOptions): DmAdapter;
 
-export { type AudioServiceOptions, type AudioSource, type BleServiceContext, type BleServiceOptions, type CacheServiceOptions, type CatalogIntentResolver, type CatalogIntentResolverOptions, type CommonServiceContext, type CommonServiceOptions, type ConfigSchemaValidation, type ConfigService, type ConfigServiceOptions, type CoordinatedRelayOptions, type CordnCodecResult, type CordnCoordinatorClient, type CordnCoordinatorSubscription, type CordnDmAdapterOptions, type CordnDmClient, type CordnGroupMessage, type CordnRelayCoordinatorOptions, type CountRequest, type CountResult, type CountServiceOptions, type DmAdapter, type DmConversation, type DmConversationPage, type DmConversationQuery, type DmHexPubkey, DmMemoryStore, type DmMessage, type DmMessagePage, type DmMessageQuery, type DmMessageStatus, type DmOk, type DmPeer, type DmRelayPool, type DmSendRequest, type DmSendResult, type DmService, type DmServiceOptions, type DmStatus, type DmSubscribeRequest, type DmSubscription, type DmTimestamp, type HostCacheBridge, type HostKeyEvent, type HostKeysBridge, type HostMediaBridge, type HttpUploaderOptions, type HttpUploaderRails, type IdentityServiceOptions, type IntentArchetypeSupport, type IntentAvailability, type IntentBehavior, type IntentCandidate, type IntentCatalogEntry, type IntentHandlerPreference, type IntentOpenParams, type IntentRequest, type IntentResolver, type IntentResolverContext, type IntentResult, type IntentServiceOptions, type IntentWindowController, type KeysServiceOptions, type LinkOpenContext, type LinkServiceOptions, type ListsServiceContext, type ListsServiceOptions, type ManifestArchetypeInput, type MaybePromise, type MediaMetadataLike, type MediaPlaybackOwner, type MediaServiceOptions, type MediaSessionCreateOptions, type MediaSessionTarget, type MediaSourceRef, type NdrDmAdapterOptions, type NdrRelayTransport, type NdrRelayTransportOptions, type NdrRumorLike, type NdrRuntimeLike, type Nip17DmAdapterOptions, type NostrTag, type Notification, type NotificationServiceOptions, type NotifyServiceOptions, type OutboxEventOptions, type OutboxEventResult, type OutboxPublishOptions, type OutboxPublishResult, type OutboxQueryOptions, type OutboxRelayPlan, type OutboxRelayPool, type OutboxResult, type OutboxRouter, type OutboxRouterSubscription, type OutboxServiceOptions, type OutboxStrategy, type OutboxSubscribeOptions, type OutboxSubscriptionSink, type OutboxTarget, type RailServerConfig, type RelayListEntry, type RelayPoolOutboxRouterOptions, type RelayPoolServiceOptions, type ResourceInfo, type ResourceInfoContext, type ResourceInfoProvider, type ResourceSchemeInfo, type ResourceService, type ResourceServiceOptions, type SerialServiceContext, type SerialServiceOptions, type SignEvent, type ThemeService, type ThemeServiceOptions, type UploadDimensions, type UploadInfo, type UploadInfoContext, type UploadInfoProvider, type UploadRail, type UploadRailInfo, type UploadRequest, type UploadResult, type UploadServiceOptions, type UploadState, type UploadStatus, type Uploader, type UploaderContext, type WebrtcServiceContext, type WebrtcServiceOptions, createAudioService, createBleService, createBrowserMediaBridge, createCacheService, createCatalogIntentResolver, createCommonService, createConfigService, createCoordinatedRelay, createCordnDmAdapter, createCordnRelayCoordinatorClient, createCountService, createDmService, createHttpUploader, createIdentityService, createIntentService, createKeysService, createLinkService, createListsService, createMediaService, createNdrDmAdapter, createNdrRelayTransport, createNip17DmAdapter, createNotificationService, createNotifyService, createOutboxService, createRelayPoolOutboxRouter, createRelayPoolService, createResourceService, createSerialService, createThemeService, createUploadService, createWebrtcService, manifestToIntentCatalogEntry };
+export { type AudioServiceOptions, type AudioSource, type BleServiceContext, type BleServiceOptions, type CacheServiceOptions, type CatalogIntentResolver, type CatalogIntentResolverOptions, type CommonServiceContext, type CommonServiceOptions, type ConfigSchemaValidation, type ConfigService, type ConfigServiceOptions, type CoordinatedRelayOptions, type CordnCodecResult, type CordnCoordinatorClient, type CordnCoordinatorSubscription, type CordnDmAdapterOptions, type CordnDmClient, type CordnGroupMessage, type CordnRelayCoordinatorOptions, type CountRequest, type CountResult, type CountServiceOptions, type DmAdapter, type DmConversation, type DmConversationPage, type DmConversationQuery, type DmHexPubkey, DmMemoryStore, type DmMessage, type DmMessagePage, type DmMessageQuery, type DmMessageStatus, type DmOk, type DmPeer, type DmRelayPool, type DmSendRequest, type DmSendResult, type DmService, type DmServiceOptions, type DmStatus, type DmSubscribeRequest, type DmSubscription, type DmTimestamp, type HostCacheBridge, type HostKeyEvent, type HostKeysBridge, type HostMediaBridge, type HttpUploaderOptions, type HttpUploaderRails, type IdentityServiceOptions, type IntentArchetypeSupport, type IntentAvailability, type IntentBehavior, type IntentCandidate, type IntentCatalogEntry, type IntentHandlerPreference, type IntentOpenParams, type IntentRequest, type IntentResolver, type IntentResolverContext, type IntentResult, type IntentServiceOptions, type IntentWindowController, type KeysServiceOptions, type LinkOpenContext, type LinkServiceOptions, type ListsServiceContext, type ListsServiceOptions, type ManifestArchetypeInput, type MaybePromise, type MediaMetadataLike, type MediaPlaybackOwner, type MediaServiceOptions, type MediaSessionCreateOptions, type MediaSessionTarget, type MediaSourceRef, type NdrDmAdapterOptions, type NdrRelayTransport, type NdrRelayTransportOptions, type NdrRumorLike, type NdrRuntimeLike, type Nip17DmAdapterOptions, type NostrTag, type Notification, type NotificationServiceOptions, type NotifyServiceOptions, type OutboxEventOptions, type OutboxEventResult, type OutboxPublishOptions, type OutboxPublishResult, type OutboxQueryOptions, type OutboxRelayPlan, type OutboxRelayPool, type OutboxResult, type OutboxRouter, type OutboxRouterSubscription, type OutboxServiceOptions, type OutboxSubscribeOptions, type OutboxSubscriptionSink, type OutboxTarget, type RailServerConfig, type RelayListEntry, type RelayPoolOutboxRouterOptions, type RelayPoolServiceOptions, type ResourceInfo, type ResourceInfoContext, type ResourceInfoProvider, type ResourceSchemeInfo, type ResourceService, type ResourceServiceOptions, type SerialServiceContext, type SerialServiceOptions, type SignEvent, type ThemeService, type ThemeServiceOptions, type UploadDimensions, type UploadInfo, type UploadInfoContext, type UploadInfoProvider, type UploadRail, type UploadRailInfo, type UploadRequest, type UploadResult, type UploadServiceOptions, type UploadState, type UploadStatus, type Uploader, type UploaderContext, type WebrtcServiceContext, type WebrtcServiceOptions, createAudioService, createBleService, createBrowserMediaBridge, createCacheService, createCatalogIntentResolver, createCommonService, createConfigService, createCoordinatedRelay, createCordnDmAdapter, createCordnRelayCoordinatorClient, createCountService, createDmService, createHttpUploader, createIdentityService, createIntentService, createKeysService, createLinkService, createListsService, createMediaService, createNdrDmAdapter, createNdrRelayTransport, createNip17DmAdapter, createNotificationService, createNotifyService, createOutboxService, createRelayPoolOutboxRouter, createRelayPoolService, createResourceService, createSerialService, createThemeService, createUploadService, createWebrtcService, manifestToIntentCatalogEntry };

package/dist/index.js

@@ -426,6 +426,7 @@ function createIdentityService(options) {
 }
 
 // src/relay-pool-service.ts
+import { createRelayEventResultWithHints } from "@kehto/runtime";
 var EOSE_FALLBACK_MS = 15e3;
 function createRelayPoolService(options) {
   const tracked = /* @__PURE__ */ new Map();
@@ -470,7 +471,7 @@ function createRelayPoolService(options) {
             }
             return;
           }
-          send({ type: "relay.event", subId, event: item });
+          send({ type: "relay.event", subId, result: createRelayEventResultWithHints(item, relayUrls2) });
         }, relayUrls2);
         tracked.set(subKey, { handle, eoseTimer });
         return;
@@ -516,6 +517,7 @@ function createRelayPoolService(options) {
 }
 
 // src/cache-service.ts
+import { createRelayEventResult } from "@kehto/runtime";
 function createCacheService(options) {
   return {
     descriptor: {
@@ -535,7 +537,7 @@ function createCacheService(options) {
         }
         options.query(filters).then((events) => {
           for (const event of events) {
-            send({ type: "relay.event", subId, event });
+            send({ type: "relay.event", subId, result: createRelayEventResult(event) });
           }
           send({ type: "relay.eose", subId });
         }).catch(() => {
@@ -647,6 +649,7 @@ function isPlainObject(value) {
 }
 
 // src/coordinated-relay.ts
+import { createRelayEventResult as createRelayEventResult2, createRelayEventResultWithHints as createRelayEventResultWithHints2 } from "@kehto/runtime";
 var DEFAULT_EOSE_TIMEOUT_MS = 15e3;
 function createCoordinatedRelay(options) {
   const timeoutMs = options.eoseTimeoutMs ?? DEFAULT_EOSE_TIMEOUT_MS;
@@ -669,10 +672,13 @@ function createCoordinatedRelay(options) {
     handleMessage(windowId, message, send) {
       const relayMessage = message;
       if (message.type === "relay.subscribe") {
-        let deliver2 = function(event) {
+        let deliver2 = function(event, relayHints) {
           if (tracked.seenIds.has(event.id)) return;
           tracked.seenIds.add(event.id);
-          if (subs.has(subKey)) send({ type: "relay.event", subId, event });
+          if (subs.has(subKey)) {
+            const result2 = relayHints ? createRelayEventResultWithHints2(event, relayHints) : createRelayEventResult2(event);
+            send({ type: "relay.event", subId, result: result2 });
+          }
         };
         var deliver = deliver2;
         const subId = relayMessage.subId;
@@ -728,7 +734,7 @@ function createCoordinatedRelay(options) {
               maybeSendEose(subKey, subId, send);
               return;
             }
-            deliver2(item);
+            deliver2(item, relayUrls2);
             if (cacheAvailable) {
               try {
                 options.cache.store(item);
@@ -2024,6 +2030,59 @@ var OUTBOX_DESCRIPTOR = {
   version: OUTBOX_SERVICE_VERSION,
   description: "NAP-OUTBOX outbox-aware relay routing \u2014 getEvent/query/subscribe/publish/resolveRelays"
 };
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function stringArray(value) {
+  if (!Array.isArray(value)) return void 0;
+  const strings = value.filter((item) => typeof item === "string");
+  return strings.length > 0 ? strings : void 0;
+}
+function uint(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : void 0;
+}
+function sanitizeEventOptions(raw) {
+  if (!isRecord(raw)) return void 0;
+  const out = {};
+  if (typeof raw.author === "string") out.author = raw.author;
+  const relays = stringArray(raw.relays);
+  if (relays) out.relays = relays;
+  const timeoutMs = uint(raw.timeoutMs);
+  if (timeoutMs !== void 0) out.timeoutMs = timeoutMs;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function sanitizeQueryOptions(raw) {
+  if (!isRecord(raw)) return void 0;
+  const out = {};
+  const authors = stringArray(raw.authors);
+  if (authors) out.authors = authors;
+  const relays = stringArray(raw.relays);
+  if (relays) out.relays = relays;
+  const limit = uint(raw.limit);
+  if (limit !== void 0) out.limit = limit;
+  const timeoutMs = uint(raw.timeoutMs);
+  if (timeoutMs !== void 0) out.timeoutMs = timeoutMs;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+var sanitizeSubscribeOptions = sanitizeQueryOptions;
+function sanitizePublishOptions(raw) {
+  if (!isRecord(raw)) return void 0;
+  const out = {};
+  const relays = stringArray(raw.relays);
+  if (relays) out.relays = relays;
+  const targetAuthors = stringArray(raw.targetAuthors);
+  if (targetAuthors) out.targetAuthors = targetAuthors;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function sanitizeTarget(raw) {
+  if (!isRecord(raw)) return void 0;
+  const out = {};
+  const authors = stringArray(raw.authors);
+  if (authors) out.authors = authors;
+  if (typeof raw.pubkey === "string") out.pubkey = raw.pubkey;
+  if (raw.direction === "read" || raw.direction === "write") out.direction = raw.direction;
+  return out;
+}
 function normalizeFilters(raw) {
   if (Array.isArray(raw)) {
     const filters = raw.filter((f) => typeof f === "object" && f !== null);
@@ -2040,17 +2099,14 @@ function buildEventQuery(eventId, eventOptions) {
     queryOptions.authors = [eventOptions.author];
   }
   if (Array.isArray(eventOptions?.relays)) queryOptions.relays = eventOptions.relays;
-  if (eventOptions?.strategy !== void 0) queryOptions.strategy = eventOptions.strategy;
   if (eventOptions?.timeoutMs !== void 0) queryOptions.timeoutMs = eventOptions.timeoutMs;
   return { filter, queryOptions };
 }
 function eventResultFromQuery(eventId, result2) {
-  const event = result2.events.find((candidate) => candidate.id === eventId);
-  const eventResult = {
-    relays: event ? result2.relays[eventId] ?? [] : []
-  };
-  if (event) eventResult.event = event;
-  if (!event) eventResult.error = result2.error ?? "not found";
+  const relayResult = result2.events.find((candidate) => candidate.event.id === eventId);
+  const eventResult = {};
+  if (relayResult) eventResult.result = relayResult;
+  if (!relayResult) eventResult.error = result2.error ?? "not found";
   else if (result2.error !== void 0) eventResult.error = result2.error;
   if (result2.incomplete !== void 0) eventResult.incomplete = result2.incomplete;
   return eventResult;
@@ -2060,15 +2116,14 @@ function fallbackGetEvent(router, eventId, eventOptions) {
   return router.query([filter], queryOptions).then((result2) => eventResultFromQuery(eventId, result2));
 }
 function sendEventResult(id, eventId, result2, send) {
-  if (result2.event && result2.event.id !== eventId) {
-    send({ type: "outbox.getEvent.result", id, relays: [], error: "not found" });
+  if (result2.result && result2.result.event.id !== eventId) {
+    send({ type: "outbox.getEvent.result", id, error: "not found" });
     return;
   }
   send({
     type: "outbox.getEvent.result",
     id,
-    ...result2.event === void 0 ? {} : { event: result2.event },
-    relays: result2.relays,
+    ...result2.result === void 0 ? {} : { result: result2.result },
     ...result2.incomplete === void 0 ? {} : { incomplete: result2.incomplete },
     ...result2.error === void 0 ? {} : { error: result2.error }
   });
@@ -2077,12 +2132,12 @@ function handleGetEvent(router, msg, send) {
   const m = msg;
   const id = m.id ?? "";
   if (typeof m.eventId !== "string" || m.eventId.length === 0) {
-    send({ type: "outbox.getEvent.result", id, relays: [], error: "invalid filter" });
+    send({ type: "outbox.getEvent.result", id, error: "invalid filter" });
     return;
   }
   const getEvent = router.getEvent ?? ((eventId, eventOptions) => fallbackGetEvent(router, eventId, eventOptions));
-  void getEvent(m.eventId, m.options).then((result2) => sendEventResult(id, m.eventId, result2, send)).catch(
-    (err2) => send({ type: "outbox.getEvent.result", id, relays: [], error: toErrorMessage(err2) })
+  void getEvent(m.eventId, sanitizeEventOptions(m.options)).then((result2) => sendEventResult(id, m.eventId, result2, send)).catch(
+    (err2) => send({ type: "outbox.getEvent.result", id, error: toErrorMessage(err2) })
   );
 }
 function createOutboxService(options) {
@@ -2096,20 +2151,19 @@ function createOutboxService(options) {
     const id = m.id ?? "";
     const filters = normalizeFilters(m.filters);
     if (!filters) {
-      send({ type: "outbox.query.result", id, events: [], relays: {}, error: "invalid filter" });
+      send({ type: "outbox.query.result", id, events: [], error: "invalid filter" });
       return;
     }
-    void router.query(filters, m.options).then(
+    void router.query(filters, sanitizeQueryOptions(m.options)).then(
       (result2) => send({
         type: "outbox.query.result",
         id,
         events: result2.events,
-        relays: result2.relays,
         ...result2.incomplete === void 0 ? {} : { incomplete: result2.incomplete },
         ...result2.error === void 0 ? {} : { error: result2.error }
       })
     ).catch(
-      (err2) => send({ type: "outbox.query.result", id, events: [], relays: {}, error: toErrorMessage(err2) })
+      (err2) => send({ type: "outbox.query.result", id, events: [], error: toErrorMessage(err2) })
     );
   }
   function handleSubscribe(windowId, msg, send) {
@@ -2125,14 +2179,13 @@ function createOutboxService(options) {
       return;
     }
     const sink = {
-      event: (event, relay) => send({ type: "outbox.event", subId, event, ...relay === void 0 ? {} : { relay } }),
-      eose: () => send({ type: "outbox.eose", subId }),
+      event: (result2) => send({ type: "outbox.event", subId, result: result2 }),
       closed: (reason) => {
         subscriptions.delete(subKey);
         send({ type: "outbox.closed", subId, ...reason === void 0 ? {} : { reason } });
       }
     };
-    subscriptions.set(subKey, router.subscribe(filters, m.options, sink));
+    subscriptions.set(subKey, router.subscribe(filters, sanitizeSubscribeOptions(m.options), sink));
   }
   function handleClose(windowId, msg, send) {
     const m = msg;
@@ -2150,7 +2203,7 @@ function createOutboxService(options) {
       send({ type: "outbox.publish.result", id, ok: false, error: "invalid filter" });
       return;
     }
-    void router.publish(m.event, m.options).then(
+    void router.publish(m.event, sanitizePublishOptions(m.options)).then(
       (result2) => send({
         type: "outbox.publish.result",
         id,
@@ -2167,11 +2220,12 @@ function createOutboxService(options) {
   function handleResolveRelays(msg, send) {
     const m = msg;
     const id = m.id ?? "";
-    if (!m.target || typeof m.target !== "object") {
+    const target = sanitizeTarget(m.target);
+    if (!target) {
       send({ type: "outbox.resolveRelays.result", id, error: "invalid filter" });
       return;
     }
-    void router.resolveRelays(m.target).then((plan) => send({ type: "outbox.resolveRelays.result", id, plan })).catch(
+    void router.resolveRelays(target).then((plan) => send({ type: "outbox.resolveRelays.result", id, plan })).catch(
       (err2) => send({ type: "outbox.resolveRelays.result", id, error: toErrorMessage(err2) })
     );
   }
@@ -2219,6 +2273,7 @@ function toErrorMessage(err2) {
 }
 
 // src/relay-pool-outbox-router.ts
+import { createRelayEventResultWithHints as createRelayEventResultWithHints3 } from "@kehto/runtime";
 var DEFAULT_QUERY_TIMEOUT_MS = 4e3;
 function defaultRelayAllowed(url) {
   return typeof url === "string" && (url.startsWith("wss://") || url.startsWith("ws://"));
@@ -2231,11 +2286,6 @@ function deriveAuthors(filters, optionAuthors) {
   for (const author of optionAuthors ?? []) authors.add(author);
   return [...authors];
 }
-function wantsWriteRelays(direction, strategy) {
-  if (strategy === "outbox") return true;
-  if (strategy === "inbox") return false;
-  return direction === "read";
-}
 function allowed(ctx, urls) {
   const out = /* @__PURE__ */ new Set();
   for (const url of urls) {
@@ -2243,8 +2293,8 @@ function allowed(ctx, urls) {
   }
   return [...out];
 }
-async function resolvePlan(ctx, pubkeys, direction, strategy, relayHints) {
-  const useWrite = wantsWriteRelays(direction, strategy);
+async function resolvePlan(ctx, pubkeys, direction, relayHints) {
+  const useWrite = direction === "read";
   const collected = /* @__PURE__ */ new Set();
   const missingAuthors = [];
   let sawNip65 = false;
@@ -2292,10 +2342,10 @@ function admitEvent(ctx, collector, event) {
   );
 }
 function buildCollectResult(collector, timedOut) {
-  const events = [...collector.seen.values()];
-  const relayObj = {};
-  for (const event of events) relayObj[event.id] = [...collector.relayMap.get(event.id) ?? []];
-  return { events, relayMap: relayObj, incomplete: timedOut };
+  const events = [...collector.seen.values()].map(
+    (event) => createRelayEventResultWithHints3(event, [...collector.relayMap.get(event.id) ?? []])
+  );
+  return { events, incomplete: timedOut };
 }
 function collectFromRelays(ctx, filters, relayUrls2, timeoutMs) {
   return new Promise((resolve) => {
@@ -2340,28 +2390,27 @@ function relayPoolSubscribe(ctx, filters, relayUrl, cb) {
 }
 async function queryImpl(ctx, filters, options) {
   if (!ctx.relayPool.isAvailable()) {
-    return { events: [], relays: {}, incomplete: true, error: "relay list unavailable" };
+    return { events: [], incomplete: true, error: "relay list unavailable" };
   }
-  const strategy = options?.strategy ?? "auto";
   const authors = deriveAuthors(filters, options?.authors);
-  const plan = await resolvePlan(ctx, authors, "read", strategy, options?.relays);
+  const plan = await resolvePlan(ctx, authors, "read", options?.relays);
   if (plan.relays.length === 0) {
-    return { events: [], relays: {}, incomplete: true, error: "relay list unavailable" };
+    return { events: [], incomplete: true, error: "relay list unavailable" };
   }
   const timeoutMs = options?.timeoutMs ?? ctx.defaultTimeoutMs;
   const collected = await collectFromRelays(ctx, filters, plan.relays, timeoutMs);
   const incomplete = collected.incomplete || (plan.missingAuthors?.length ?? 0) > 0;
   let events = collected.events;
   if (options?.limit !== void 0 && events.length > options.limit) {
-    events = [...events].sort((a, b) => b.created_at - a.created_at).slice(0, options.limit);
+    events = [...events].sort((a, b) => b.event.created_at - a.event.created_at).slice(0, options.limit);
   }
-  const result2 = { events, relays: collected.relayMap };
+  const result2 = { events };
   if (incomplete) result2.incomplete = true;
   return result2;
 }
 async function getEventImpl(ctx, eventId, options) {
   if (typeof eventId !== "string" || eventId.length === 0) {
-    return { relays: [], error: "invalid filter" };
+    return { error: "invalid filter" };
   }
   const filter = { ids: [eventId] };
   const queryOptions = { limit: 1 };
@@ -2370,15 +2419,12 @@ async function getEventImpl(ctx, eventId, options) {
     queryOptions.authors = [options.author];
   }
   if (Array.isArray(options?.relays)) queryOptions.relays = options.relays;
-  if (options?.strategy !== void 0) queryOptions.strategy = options.strategy;
   if (options?.timeoutMs !== void 0) queryOptions.timeoutMs = options.timeoutMs;
   const queryResult = await queryImpl(ctx, [filter], queryOptions);
-  const event = queryResult.events.find((candidate) => candidate.id === eventId);
-  const result2 = {
-    relays: event ? queryResult.relays[eventId] ?? [] : []
-  };
-  if (event) result2.event = event;
-  if (!event) result2.error = queryResult.error ?? "not found";
+  const eventResult = queryResult.events.find((candidate) => candidate.event.id === eventId);
+  const result2 = {};
+  if (eventResult) result2.result = eventResult;
+  if (!eventResult) result2.error = queryResult.error ?? "not found";
   else if (queryResult.error !== void 0) result2.error = queryResult.error;
   if (queryResult.incomplete !== void 0) result2.incomplete = queryResult.incomplete;
   return result2;
@@ -2392,43 +2438,28 @@ function closeLiveSub(sub) {
   }
   sub.handles.length = 0;
 }
-function attachLiveRelay(ctx, sub, filters, relayUrl, live, sink) {
+function attachLiveRelay(ctx, sub, filters, relayUrl, sink) {
   sub.handles.push(relayPoolSubscribe(ctx, filters, relayUrl, (item) => {
     if (sub.closed) return;
-    if (item === "EOSE") {
-      sub.eoseCount += 1;
-      if (!sub.eoseSent && sub.eoseCount >= sub.relayCount) {
-        sub.eoseSent = true;
-        sink.eose();
-        if (!live) {
-          sub.closed = true;
-          closeLiveSub(sub);
-          sink.closed();
-        }
-      }
-      return;
-    }
+    if (item === "EOSE") return;
     if (sub.seen.has(item.id)) return;
     void ctx.verify(item).then((ok) => {
       if (!ok || sub.closed || sub.seen.has(item.id)) return;
       sub.seen.add(item.id);
-      sink.event(item, relayUrl);
+      sink.event(createRelayEventResultWithHints3(item, [relayUrl]));
     });
   }));
 }
 function startSubscription(ctx, filters, options, sink) {
-  const live = options?.live ?? true;
-  const strategy = options?.strategy ?? "auto";
   const authors = deriveAuthors(filters, options?.authors);
-  const sub = { handles: [], seen: /* @__PURE__ */ new Set(), closed: false, eoseCount: 0, relayCount: 0, eoseSent: false };
-  void resolvePlan(ctx, authors, "read", strategy, options?.relays).then((plan) => {
+  const sub = { handles: [], seen: /* @__PURE__ */ new Set(), closed: false };
+  void resolvePlan(ctx, authors, "read", options?.relays).then((plan) => {
     if (sub.closed) return;
     if (plan.relays.length === 0) {
       sink.closed("relay list unavailable");
       return;
     }
-    sub.relayCount = plan.relays.length;
-    for (const relayUrl of plan.relays) attachLiveRelay(ctx, sub, filters, relayUrl, live, sink);
+    for (const relayUrl of plan.relays) attachLiveRelay(ctx, sub, filters, relayUrl, sink);
   }).catch((err2) => {
     if (!sub.closed) sink.closed(err2 instanceof Error ? err2.message : "subscribe failed");
   });
@@ -2441,12 +2472,11 @@ function startSubscription(ctx, filters, options, sink) {
   };
 }
 async function resolvePublishTargets(ctx, signed, options) {
-  const strategy = options?.strategy ?? "auto";
   const targets = /* @__PURE__ */ new Set();
-  const authorPlan = await resolvePlan(ctx, [signed.pubkey], "read", strategy === "inbox" ? "auto" : "outbox");
+  const authorPlan = await resolvePlan(ctx, [signed.pubkey], "read");
   for (const url of authorPlan.relays) targets.add(url);
   if (options?.targetAuthors && options.targetAuthors.length > 0) {
-    const inboxPlan = await resolvePlan(ctx, options.targetAuthors, "write", "inbox");
+    const inboxPlan = await resolvePlan(ctx, options.targetAuthors, "write");
     for (const url of inboxPlan.relays) targets.add(url);
   }
   for (const url of options?.relays ?? []) targets.add(url);
@@ -2508,7 +2538,7 @@ function createRelayPoolOutboxRouter(options) {
     publish: (template, publishOptions) => publishImpl(ctx, template, publishOptions),
     resolveRelays: (target) => {
       const pubkeys = target.authors ?? (target.pubkey ? [target.pubkey] : []);
-      return resolvePlan(ctx, pubkeys, target.direction ?? "read", target.strategy ?? "auto");
+      return resolvePlan(ctx, pubkeys, target.direction ?? "read");
     }
   };
 }