@kehto/paja 0.14.0 → 0.15.0

package/dist/browser-host.js

@@ -1329,7 +1329,7 @@ function handleRelayPublish(context, windowId, m) {
     sendRelayPublishResult(hooks, windowId, id, false, void 0, "invalid event template");
     return;
   }
-  const signer = hooks.auth.getSigner();
+  const signer = hooks.auth.getSigner(windowId);
   const signEvent = signer?.signEvent?.bind(signer);
   if (!signEvent) {
     sendRelayPublishResult(hooks, windowId, id, false, void 0, "no signer configured");
@@ -1440,7 +1440,7 @@ function handleRelayPublishEncrypted(context, windowId, msg) {
     replyPe(false, { error: `unsupported encryption scheme: ${encryption}` });
     return;
   }
-  const peSigner = hooks.auth.getSigner();
+  const peSigner = hooks.auth.getSigner(windowId);
   if (!peSigner) {
     replyPe(false, { error: "no signer configured" });
     return;
@@ -1449,12 +1449,9 @@ function handleRelayPublishEncrypted(context, windowId, msg) {
     replyPe(false, { error: "invalid event template" });
     return;
   }
-  publishEncrypted(context, windowId, id, recipient, encryption, eventTemplate, replyPe);
+  publishEncrypted(context, windowId, id, recipient, encryption, eventTemplate, peSigner, replyPe);
 }
-function publishEncrypted(context, windowId, id, recipient, encryption, eventTemplate, replyPe) {
-  const { hooks } = context;
-  const peSigner = hooks.auth.getSigner();
-  if (!peSigner) return;
+function publishEncrypted(context, windowId, id, recipient, encryption, eventTemplate, peSigner, replyPe) {
   (async () => {
     try {
       const plaintext = String(eventTemplate.content ?? "");
@@ -1697,7 +1694,7 @@ function createIdentityHandler(context) {
       return;
     }
     const action = msg.type.slice("identity.".length);
-    const signer = hooks.auth.getSigner();
+    const signer = hooks.auth.getSigner(windowId);
     const fallback = createCanonicalDomainResult(msg);
     if (!fallback) return;
     const sendResult = (payload = {}) => {
@@ -2835,8 +2832,8 @@ function createAuthAdapter(shellHooks) {
     getUserPubkey() {
       return shellHooks.auth.getUserPubkey();
     },
-    getSigner() {
-      return shellHooks.auth.getSigner();
+    getSigner(windowId) {
+      return shellHooks.auth.getSigner(windowId);
     }
   };
 }
@@ -11087,11 +11084,20 @@ function requestKey(windowId, requestId) {
   return `${windowId}\0${requestId}`;
 }
 function assertResourceOptions(options) {
-  if (typeof options?.fetch !== "function" || typeof options?.isOriginGranted !== "function" || typeof options?.getConnectGrants !== "function" || typeof options?.resolveIdentity !== "function") {
+  if (typeof options?.fetch !== "function") {
     throw new Error(
-      "[RESOURCE-01 / H-03] createResourceService requires {fetch, isOriginGranted, getConnectGrants, resolveIdentity} \u2014 all four options are required from day one. The grants source (getConnectGrants) MUST be wired at construction time to prevent unguarded fetch proxying."
+      "[RESOURCE-01] createResourceService requires a runtime-provided fetch resolver."
     );
   }
+  const hasOriginPolicy = options.isOriginGranted !== void 0 || options.getConnectGrants !== void 0;
+  if (hasOriginPolicy && (typeof options.isOriginGranted !== "function" || typeof options.getConnectGrants !== "function" || typeof options.resolveIdentity !== "function")) {
+    throw new Error(
+      "[RESOURCE-01] optional origin policy requires {isOriginGranted, getConnectGrants, resolveIdentity} together."
+    );
+  }
+  if (options.resolveIdentity !== void 0 && typeof options.resolveIdentity !== "function") {
+    throw new Error("[RESOURCE-01] resolveIdentity must be a function when provided.");
+  }
 }
 function trackRequest(state, requestId, windowId, controller) {
   const key = requestKey(windowId, requestId);
@@ -11147,7 +11153,7 @@ function normalizeResourceInfo(info) {
 }
 async function resolveResourceInfo(options, windowId) {
   const configured = options.resourceInfo ?? DEFAULT_RESOURCE_INFO;
-  const info = typeof configured === "function" ? await configured({ windowId, identity: options.resolveIdentity(windowId) }) : configured;
+  const info = typeof configured === "function" ? await configured({ windowId, identity: options.resolveIdentity?.(windowId) ?? null }) : configured;
   return normalizeResourceInfo(info);
 }
 async function handleInfo(options, windowId, requestId, send) {
@@ -11181,22 +11187,29 @@ function classifyResourceFailure(error) {
     message: error instanceof Error ? error.message : String(error)
   };
 }
-async function fetchResourceItem(options, identity, info, url, signal) {
+async function fetchResourceItem(options, windowId, info, url, signal) {
   const parsedUrl = parseResourceUrl(url);
   if (!parsedUrl) return resourceInvalidRequest(url, `invalid URL: ${url}`);
-  const scheme = parsedUrl.protocol.slice(0, -1).toLowerCase();
-  if (!info.schemes.some((item) => item.enabled && item.scheme.toLowerCase() === scheme)) {
-    return { ok: false, url, error: "unsupported-scheme", message: `scheme ${scheme} is not enabled` };
-  }
-  const origin = parsedUrl.origin;
-  const grants = options.getConnectGrants(identity.dTag, identity.aggregateHash);
-  if (!options.isOriginGranted(origin, grants)) {
-    return {
-      ok: false,
-      url,
-      error: "blocked-by-policy",
-      message: `origin ${origin} not granted`
-    };
+  if (options.isOriginGranted && options.getConnectGrants) {
+    const identity = options.resolveIdentity?.(windowId) ?? null;
+    if (!identity) {
+      return {
+        ok: false,
+        url,
+        error: "blocked-by-policy",
+        message: "napplet identity not resolvable for runtime origin policy"
+      };
+    }
+    const origin = parsedUrl.origin;
+    const grants = options.getConnectGrants(identity.dTag, identity.aggregateHash);
+    if (!options.isOriginGranted(origin, grants)) {
+      return {
+        ok: false,
+        url,
+        error: "blocked-by-policy",
+        message: `origin ${origin} not granted by runtime policy`
+      };
+    }
   }
   try {
     const response = await options.fetch(url, {
@@ -11226,16 +11239,11 @@ async function fetchResourceItem(options, identity, info, url, signal) {
 }
 async function handleBytes(options, state, windowId, msg, send) {
   const { requestId, url } = msg;
-  const identity = options.resolveIdentity(windowId);
-  if (!identity) {
-    sendResourceError(send, requestId, "napplet identity not resolvable", "blocked-by-policy");
-    return;
-  }
   const controller = new AbortController();
   trackRequest(state, requestId, windowId, controller);
   try {
     const info = await resolveResourceInfo(options, windowId);
-    const item = await fetchResourceItem(options, identity, info, url, controller.signal);
+    const item = await fetchResourceItem(options, windowId, info, url, controller.signal);
     if (controller.signal.aborted) return;
     if (!item.ok) {
       sendResourceError(send, requestId, item.message, item.error);
@@ -11262,11 +11270,6 @@ async function handleBytesMany(options, state, windowId, msg, send) {
     sendBytesManyError(send, requestId, "resource.bytesMany requires a non-empty urls array", "invalid-request");
     return;
   }
-  const identity = options.resolveIdentity(windowId);
-  if (!identity) {
-    sendBytesManyError(send, requestId, "napplet identity not resolvable", "blocked-by-policy");
-    return;
-  }
   let info;
   try {
     info = await resolveResourceInfo(options, windowId);
@@ -11284,7 +11287,7 @@ async function handleBytesMany(options, state, windowId, msg, send) {
   try {
     const items = [];
     for (const url of urls) {
-      const item = await fetchResourceItem(options, identity, info, url, controller.signal);
+      const item = await fetchResourceItem(options, windowId, info, url, controller.signal);
       if (controller.signal.aborted) return;
       if (item.ok) {
         items.push({
@@ -11343,7 +11346,7 @@ function createResourceService(options) {
   const descriptor = {
     name: "resource",
     version: RESOURCE_SERVICE_VERSION,
-    description: "NAP-RESOURCE reference service \u2014 shell-proxied authenticated fetch (RESOURCE-01..06)"
+    description: "NAP-RESOURCE service \u2014 runtime-resolved byte transport (RESOURCE-01..06)"
   };
   const handler = {
     descriptor,
@@ -18186,6 +18189,9 @@ function createPajaResourceFetch(options = {}) {
     if (url.protocol === "blossom:") {
       return fetchBlossomResource(value, init.signal, options);
     }
+    if (url.protocol === "http:" || url.protocol === "https:") {
+      return fetchNetworkResource(value, init.signal, options.fetch ?? globalThis.fetch);
+    }
     if (url.protocol !== "data:") {
       throw new ResourceServiceError("unsupported-scheme", `Paja does not enable ${url.protocol}`);
     }
@@ -18205,7 +18211,11 @@ function createPajaResourceFetch(options = {}) {
   };
 }
 function pajaResourceInfo(blossomServers = []) {
-  const schemes = [{ scheme: "data", enabled: true }];
+  const schemes = [
+    { scheme: "data", enabled: true },
+    { scheme: "https", enabled: true },
+    { scheme: "http", enabled: true }
+  ];
   if (usableBlossomServers(blossomServers).length > 0) {
     schemes.push({ scheme: "blossom", enabled: true });
   }
@@ -18215,6 +18225,35 @@ function pajaResourceInfo(blossomServers = []) {
     maxUrls: PAJA_RESOURCE_MAX_URLS
   };
 }
+async function fetchNetworkResource(value, signal, fetcher) {
+  let response;
+  try {
+    response = await fetcher(value, {
+      method: "GET",
+      signal,
+      credentials: "omit",
+      referrerPolicy: "no-referrer"
+    });
+  } catch (error) {
+    if (signal.aborted || isAbortError(error)) throw error;
+    throw new ResourceServiceError(
+      "network-error",
+      error instanceof Error ? error.message : String(error)
+    );
+  }
+  if (response.status === 404 || response.status === 410) {
+    throw new ResourceServiceError("not-found", "HTTP resource was not found");
+  }
+  if (!response.ok) {
+    throw new ResourceServiceError("network-error", `HTTP resource returned ${response.status}`);
+  }
+  const bytes = await readCappedResponse(response, signal);
+  const mime = sniffSafeResourceMime(bytes);
+  if (!mime) {
+    throw new ResourceServiceError("decode-failed", "resource bytes are not an enabled safe media type");
+  }
+  return new Response(arrayBufferFor(bytes), { headers: { "content-type": mime } });
+}
 async function fetchBlossomResource(value, signal, options) {
   const match = BLOSSOM_RESOURCE_PATTERN.exec(value);
   if (!match?.[1]) {
@@ -19421,12 +19460,17 @@ async function createPajaBrowserFsBackend(options) {
 // src/browser-dev-runtime.ts
 var DEV_SIGNER_SECRET_KEY = generateSecretKey();
 var PAJA_DEV_SIGNER_PUBKEY = getPublicKey(DEV_SIGNER_SECRET_KEY);
-function createPajaDevSigner(getSimulation, confirm) {
+function createPajaDevSigner(getSimulation, confirm, source) {
   return {
     getPublicKey: () => PAJA_DEV_SIGNER_PUBKEY,
     getRelays: () => Object.fromEntries(getPajaRelayUrls(getSimulation()).map((relay) => [relay, { read: true, write: true }])),
     async signEvent(event) {
-      if (!await confirm({ action: "sign", event })) {
+      const signerContext = source ? { ...source, signerPubkey: PAJA_DEV_SIGNER_PUBKEY } : void 0;
+      if (!await confirm({
+        action: "sign",
+        event,
+        ...signerContext ? { signerContext } : {}
+      })) {
         throw new Error("Paja signing request denied");
       }
       const template = { ...event };
@@ -19549,10 +19593,12 @@ function createDevTheme(mode, values) {
 function getRuntimePubkey(getSimulation, signerProvider) {
   return signerProvider?.getPubkey() || (signerProvider?.getMethod() === "dev" ? PAJA_DEV_SIGNER_PUBKEY : "") || getSimulation().identity.pubkey;
 }
-function createRuntimeSigner(getSimulation, confirmRequest, signerProvider) {
-  const signer = signerProvider?.getSigner();
+function createRuntimeSigner(getSimulation, confirmRequest, signerProvider, source) {
+  const signer = signerProvider?.getSigner(source);
   if (!signer) {
-    if (signerProvider?.getMethod() === "dev") return createPajaDevSigner(getSimulation, confirmRequest);
+    if (signerProvider?.getMethod() === "dev") {
+      return createPajaDevSigner(getSimulation, confirmRequest, source);
+    }
     const fixedPubkey = getSimulation().identity.pubkey;
     if (fixedPubkey) {
       return {
@@ -19596,9 +19642,6 @@ function createDevServices(backend, getSimulation, relayConfig, onThemeService,
   const services = {
     resource: createResourceService({
       fetch: createPajaResourceFetch({ getBlossomServers }),
-      isOriginGranted: (origin, grants) => grants.includes(origin),
-      getConnectGrants: () => ["null"],
-      resolveIdentity: (windowId) => getIdentity?.(windowId) ?? null,
       resourceInfo: () => pajaResourceInfo(getBlossomServers())
     })
   };
@@ -19772,6 +19815,18 @@ function createDevServices(backend, getSimulation, relayConfig, onThemeService,
   return { services, refreshAvailability };
 }
 function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadcast, confirmRequest, signerProvider, getIdentity, onEnvironmentChanged, intentHost, userActivation, notifyOptions, configOptions) {
+  const resolveIdentity = (windowId) => getIdentity?.(windowId) ?? {
+    dTag: config.window.dTag,
+    aggregateHash: config.window.aggregateHash
+  };
+  const signerSource = (windowId) => {
+    const napplet = resolveIdentity(windowId);
+    return {
+      windowId,
+      napplet,
+      runtimeScope: config.target?.mode === "iframe-url" ? `target-url:${config.target.url}` : `artifact:${napplet.aggregateHash}`
+    };
+  };
   const relayBackend = createPajaRelayBackend(getSimulation, confirmRequest);
   const relayConfig = createPajaRelayConfig(getSimulation);
   const uploadRuntime = getSimulation().upload.mode === "blossom" ? createPajaUploadRuntime({
@@ -19781,10 +19836,7 @@ function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadca
     queryDiscovery: (relayUrls2, filters) => relayBackend.query(relayUrls2, filters),
     getRelayUrls: () => relayConfig.getRelayUrls(["discovery", "super"]),
     confirmRequest,
-    getNappletIdentity: (windowId) => getIdentity?.(windowId) ?? {
-      dTag: config.window.dTag,
-      aggregateHash: config.window.aggregateHash
-    },
+    getNappletIdentity: resolveIdentity,
     subscribeSignerChange: signerProvider?.subscribe?.bind(signerProvider)
   }) : void 0;
   const getBlossomServers = () => [
@@ -19804,20 +19856,14 @@ function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadca
     uploadRuntime,
     signerProvider,
     intentHost,
-    getIdentity ?? (() => ({
-      dTag: config.window.dTag,
-      aggregateHash: config.window.aggregateHash
-    })),
+    resolveIdentity,
     userActivation,
     notifyOptions,
     configOptions
   );
   const services = serviceBundle.services;
   const ready = createPajaBrowserFsBackend({
-    getIdentity: (windowId) => getIdentity?.(windowId) ?? {
-      dTag: config.window.dTag,
-      aggregateHash: config.window.aggregateHash
-    },
+    getIdentity: resolveIdentity,
     userActivation
   }).then((fsBackend) => {
     if (!fsBackend) return;
@@ -19839,7 +19885,12 @@ function createPajaAdapter(config, getSimulation, onThemeService, onThemeBroadca
     windowManager: { createWindow: () => null },
     auth: {
       getUserPubkey: () => getRuntimePubkey(getSimulation, signerProvider),
-      getSigner: () => createRuntimeSigner(getSimulation, confirmRequest, signerProvider)
+      getSigner: (windowId) => createRuntimeSigner(
+        getSimulation,
+        confirmRequest,
+        signerProvider,
+        windowId ? signerSource(windowId) : void 0
+      )
     },
     services,
     get capabilities() {
@@ -20105,13 +20156,18 @@ function renderAclControls(state, bridge) {
 function renderSignerStatus(state, signerPubkey) {
   const el = document.getElementById("signer-status");
   const controls = document.getElementById("signer-controls");
-  if (!el || !controls) return;
+  const clearConsent = document.getElementById("signer-consent-clear");
+  if (!el || !controls || !(clearConsent instanceof HTMLButtonElement)) return;
   const fallbackPubkey = state.simulation.identity.pubkey || (state.signer.method === "dev" ? signerPubkey : "");
   const pubkey2 = state.simulation.identity.pubkey || state.signer.pubkey || (state.signer.method === "dev" ? signerPubkey : "");
   const methodLabel = state.signer.method === "nip07" ? "NIP-07" : state.signer.method === "nip46" ? "bunker" : state.signer.method === "dev" ? "dev" : "none";
   const relay = state.signer.relay ? ` \xB7 relay ${state.signer.relay}` : "";
   const prefix = state.signer.status === "disconnected" ? "no signer connected" : state.signer.status === "error" ? `${methodLabel} error: ${state.signer.error ?? "unknown error"} \xB7 fallback pubkey ${fallbackPubkey}` : `${methodLabel} ${state.signer.status} \xB7 pubkey ${pubkey2 || "(none)"}${relay}`;
-  el.textContent = `${prefix} \xB7 every sign/publish request prompts`;
+  const consentSummary = state.signerConsentCount === 0 ? "signing asks every time" : `${state.signerConsentCount} remembered signing approval${state.signerConsentCount === 1 ? "" : "s"}`;
+  el.textContent = `${prefix} \xB7 ${consentSummary} \xB7 publishing asks every time`;
+  clearConsent.hidden = state.signerConsentCount === 0;
+  clearConsent.textContent = `Forget ${state.signerConsentCount} remembered approval${state.signerConsentCount === 1 ? "" : "s"}`;
+  clearConsent.onclick = () => state.clearSignerConsent();
   const previousInput = controls.querySelector("#signer-bunker-uri")?.value ?? "";
   const devButton = document.createElement("button");
   devButton.type = "button";
@@ -20325,20 +20381,35 @@ function readNip07Signer() {
   if (typeof signer.getPublicKey !== "function" || typeof signer.signEvent !== "function") return null;
   return signer;
 }
-function createConfirmedSigner(signer, confirmRequest) {
+function createConfirmedSigner(signer, confirmRequest, source) {
   return {
     ...signer,
     async signEvent(event) {
       if (typeof signer.signEvent !== "function") {
         throw new Error("Signer does not support event signing");
       }
-      if (!await confirmRequest({ action: "sign", event })) {
+      const signerContext = await resolveSignerContext(signer, source);
+      if (!await confirmRequest({
+        action: "sign",
+        event,
+        ...signerContext ? { signerContext } : {}
+      })) {
         throw new Error("Paja signing request denied");
       }
       return signer.signEvent(event);
     }
   };
 }
+async function resolveSignerContext(signer, source) {
+  if (!source || typeof signer.getPublicKey !== "function") return void 0;
+  try {
+    const signerPubkey = await signer.getPublicKey();
+    if (!/^[0-9a-f]{64}$/i.test(signerPubkey)) return void 0;
+    return { ...source, signerPubkey };
+  } catch {
+    return void 0;
+  }
+}
 function createNip07Adapter(signer) {
   return {
     getPublicKey: signer.getPublicKey?.bind(signer),
@@ -20370,7 +20441,10 @@ function createPajaSignerController(options) {
   };
   return {
     getState: () => cloneState(state),
-    getSigner: () => activeSigner,
+    getSigner(source) {
+      if (!activeSigner) return null;
+      return createConfirmedSigner(activeSigner, options.confirmRequest, source);
+    },
     getMethod: () => state.method,
     getPubkey: () => state.pubkey,
     subscribe(listener) {
@@ -20396,7 +20470,7 @@ function createPajaSignerController(options) {
         const signer = readNip07Signer();
         if (!signer) throw new Error("NIP-07 signer not found");
         const pubkey2 = await signer.getPublicKey();
-        activeSigner = createConfirmedSigner(createNip07Adapter(signer), options.confirmRequest);
+        activeSigner = createNip07Adapter(signer);
         update({ method: "nip07", status: "connected", pubkey: pubkey2, relay: null, error: null });
       } catch (error) {
         activeSigner = null;
@@ -20426,7 +20500,7 @@ function createPajaSignerController(options) {
         });
         const pubkey2 = await client.connect();
         activeClient = client;
-        activeSigner = createConfirmedSigner(client.getSigner(), options.confirmRequest);
+        activeSigner = client.getSigner();
         update({ method: "nip46", status: "connected", pubkey: pubkey2, relay: parsed.relay, error: null });
       } catch (error) {
         closeClient();
@@ -20437,6 +20511,171 @@ function createPajaSignerController(options) {
   };
 }
 
+// src/browser-signer-consent.ts
+var PAJA_SIGNER_CONSENT_STORAGE_KEY = "kehto:paja:signer-consent:v1";
+var PAJA_SIGNER_CONSENT_VERSION = 1;
+var MAX_CONSENT_SUBJECTS = 128;
+var MAX_KINDS_PER_SUBJECT = 128;
+var MAX_IDENTITY_FIELD_LENGTH = 512;
+function createPajaSignerConsentStore(storage = readPajaSignerConsentStorage()) {
+  let grants = readConsentDocument(storage).grants;
+  const persist = () => {
+    if (!storage) return;
+    const document2 = {
+      version: PAJA_SIGNER_CONSENT_VERSION,
+      grants
+    };
+    try {
+      storage.setItem(PAJA_SIGNER_CONSENT_STORAGE_KEY, JSON.stringify(document2));
+    } catch {
+    }
+  };
+  const recordFor = (context) => {
+    const subject = normalizeContext(context);
+    if (!subject) return null;
+    return grants.find((grant2) => sameSubject(grant2, subject)) ?? null;
+  };
+  const ensureRecord = (context) => {
+    const subject = normalizeContext(context);
+    if (!subject) return null;
+    const existing = grants.find((grant2) => sameSubject(grant2, subject));
+    if (existing) return existing;
+    if (grants.length >= MAX_CONSENT_SUBJECTS) return null;
+    const created = { ...subject, trusted: false, kinds: [] };
+    grants = [...grants, created];
+    return created;
+  };
+  return {
+    match(context, kind) {
+      const normalizedKind = normalizeKind(kind);
+      if (normalizedKind === null) return null;
+      const record = recordFor(context);
+      if (!record) return null;
+      if (record.trusted) return "napplet";
+      return record.kinds.includes(normalizedKind) ? "kind" : null;
+    },
+    rememberKind(context, kind) {
+      const normalizedKind = normalizeKind(kind);
+      if (normalizedKind === null) return false;
+      const record = ensureRecord(context);
+      if (!record) return false;
+      if (record.trusted || record.kinds.includes(normalizedKind)) return true;
+      if (record.kinds.length >= MAX_KINDS_PER_SUBJECT) return false;
+      record.kinds = [...record.kinds, normalizedKind].sort((left, right) => left - right);
+      persist();
+      return true;
+    },
+    trustNapplet(context) {
+      const record = ensureRecord(context);
+      if (!record) return false;
+      if (!record.trusted || record.kinds.length > 0) {
+        record.trusted = true;
+        record.kinds = [];
+        persist();
+      }
+      return true;
+    },
+    clear() {
+      const previous = grants;
+      grants = [];
+      if (!storage) return true;
+      try {
+        storage.removeItem(PAJA_SIGNER_CONSENT_STORAGE_KEY);
+        return true;
+      } catch {
+        try {
+          const empty = {
+            version: PAJA_SIGNER_CONSENT_VERSION,
+            grants: []
+          };
+          storage.setItem(PAJA_SIGNER_CONSENT_STORAGE_KEY, JSON.stringify(empty));
+          return true;
+        } catch {
+          grants = previous;
+          return false;
+        }
+      }
+    },
+    count() {
+      return grants.reduce((total, grant2) => total + (grant2.trusted ? 1 : grant2.kinds.length), 0);
+    }
+  };
+}
+function isPajaSignerConsentContext(context) {
+  return normalizeContext(context) !== null;
+}
+function readPajaSignerConsentStorage() {
+  if (typeof window === "undefined") return null;
+  try {
+    return window.localStorage;
+  } catch {
+    return null;
+  }
+}
+function readConsentDocument(storage) {
+  const empty = () => ({ version: PAJA_SIGNER_CONSENT_VERSION, grants: [] });
+  if (!storage) return empty();
+  try {
+    const raw = storage.getItem(PAJA_SIGNER_CONSENT_STORAGE_KEY);
+    if (!raw) return empty();
+    const parsed = JSON.parse(raw);
+    if (parsed.version !== PAJA_SIGNER_CONSENT_VERSION || !Array.isArray(parsed.grants)) return empty();
+    const grants = [];
+    for (const candidate of parsed.grants.slice(0, MAX_CONSENT_SUBJECTS)) {
+      const record = normalizeRecord(candidate);
+      if (!record || grants.some((existing) => sameSubject(existing, record))) continue;
+      grants.push(record);
+    }
+    return { version: PAJA_SIGNER_CONSENT_VERSION, grants };
+  } catch {
+    return empty();
+  }
+}
+function normalizeRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const candidate = value;
+  const subject = normalizeSubject(
+    candidate.signerPubkey,
+    candidate.dTag,
+    candidate.aggregateHash,
+    candidate.runtimeScope
+  );
+  if (!subject || typeof candidate.trusted !== "boolean" || !Array.isArray(candidate.kinds)) return null;
+  const kinds = [...new Set(candidate.kinds.map((kind) => normalizeKind(kind)).filter((kind) => kind !== null))].slice(0, MAX_KINDS_PER_SUBJECT).sort((left, right) => left - right);
+  return {
+    ...subject,
+    trusted: candidate.trusted,
+    kinds: candidate.trusted ? [] : kinds
+  };
+}
+function normalizeContext(context) {
+  return normalizeSubject(
+    context.signerPubkey,
+    context.napplet.dTag,
+    context.napplet.aggregateHash,
+    context.runtimeScope
+  );
+}
+function normalizeSubject(signerPubkey, dTag, aggregateHash, runtimeScope) {
+  if (typeof signerPubkey !== "string" || !/^[0-9a-f]{64}$/i.test(signerPubkey)) return null;
+  if (!validIdentityField(dTag) || !validIdentityField(aggregateHash) || !validIdentityField(runtimeScope)) return null;
+  return {
+    signerPubkey: signerPubkey.toLowerCase(),
+    dTag,
+    aggregateHash,
+    runtimeScope
+  };
+}
+function validIdentityField(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= MAX_IDENTITY_FIELD_LENGTH;
+}
+function normalizeKind(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 && value <= 65535 ? value : null;
+}
+function sameSubject(left, right) {
+  return left.signerPubkey === right.signerPubkey && left.dTag === right.dTag && left.aggregateHash === right.aggregateHash && left.runtimeScope === right.runtimeScope;
+}
+
 // src/browser-host-signer.ts
 function confirmationDetails(...lines) {
   return lines.filter((line) => line !== void 0).join("\n");
@@ -20444,27 +20683,86 @@ function confirmationDetails(...lines) {
 function confirmationCopy(title, summary, approveLabel, ...details) {
   return { title, summary, details: confirmationDetails(...details), approveLabel };
 }
-function createPajaConfirmationController(getState) {
+function createPajaConfirmationController(getState, options = {}) {
   const dialog = document.getElementById("paja-confirmation-dialog");
   const title = document.getElementById("paja-confirmation-title");
   const summary = document.getElementById("paja-confirmation-summary");
   const details = document.getElementById("paja-confirmation-details");
   const approve = document.getElementById("paja-confirmation-approve");
   const deny = document.getElementById("paja-confirmation-deny");
+  const signerConsent = document.getElementById("paja-signer-consent");
+  const signerConsentOnce = document.getElementById("paja-signer-consent-once");
+  const signerConsentKind = document.getElementById("paja-signer-consent-kind");
+  const signerConsentNapplet = document.getElementById("paja-signer-consent-napplet");
+  const signerConsentKindValue = document.getElementById("paja-signer-consent-kind-value");
+  const signerConsentNappletValue = document.getElementById("paja-signer-consent-napplet-value");
   const ready = dialog instanceof HTMLDialogElement && title instanceof HTMLElement && summary instanceof HTMLElement && details instanceof HTMLElement && approve instanceof HTMLButtonElement && deny instanceof HTMLButtonElement;
+  const signerConsentReady = signerConsent instanceof HTMLFieldSetElement && signerConsentOnce instanceof HTMLInputElement && signerConsentKind instanceof HTMLInputElement && signerConsentNapplet instanceof HTMLInputElement && signerConsentKindValue instanceof HTMLElement && signerConsentNappletValue instanceof HTMLElement;
+  const consentStore = createPajaSignerConsentStore(
+    options.storage === void 0 ? void 0 : options.storage
+  );
   const queue = [];
   let active = null;
   let previousFocus = null;
   let disposed = false;
+  const reportSignerConsentChange = () => {
+    options.onSignerConsentChange?.(consentStore.count());
+  };
+  const configureSignerConsent = (request) => {
+    if (!signerConsentReady) return;
+    signerConsent.hidden = true;
+    signerConsentOnce.checked = true;
+    signerConsentKind.checked = false;
+    signerConsentNapplet.checked = false;
+    const candidate = signerConsentCandidate(request);
+    if (!candidate) return;
+    signerConsent.hidden = false;
+    signerConsentKindValue.textContent = String(candidate.kind);
+    signerConsentNappletValue.textContent = candidate.context.napplet.dTag;
+  };
+  const rememberSignerChoice = (request) => {
+    if (!signerConsentReady) return "once";
+    const candidate = signerConsentCandidate(request);
+    if (!candidate) return "once";
+    if (signerConsentNapplet.checked && consentStore.trustNapplet(candidate.context)) {
+      reportSignerConsentChange();
+      return "trust-napplet";
+    }
+    if (signerConsentKind.checked && consentStore.rememberKind(candidate.context, candidate.kind)) {
+      reportSignerConsentChange();
+      return "remember-kind";
+    }
+    return "once";
+  };
+  const rememberedSignerChoice = (request) => {
+    const candidate = signerConsentCandidate(request);
+    return candidate ? consentStore.match(candidate.context, candidate.kind) : null;
+  };
   const pump = () => {
     if (!ready || disposed || active) return;
-    active = queue.shift() ?? null;
+    while (!active && queue.length > 0) {
+      const candidate = queue.shift() ?? null;
+      if (!candidate) break;
+      const remembered = rememberedSignerChoice(candidate.request);
+      if (!remembered) {
+        active = candidate;
+        break;
+      }
+      recordPajaConfirmation(
+        getState(),
+        candidate.request,
+        true,
+        remembered === "kind" ? "remembered-kind" : "remembered-napplet"
+      );
+      candidate.approve();
+    }
     if (!active) return;
     const copy = describeConfirmation(active.request);
     title.textContent = copy.title;
     summary.textContent = copy.summary;
     details.textContent = copy.details;
     approve.textContent = copy.approveLabel;
+    configureSignerConsent(active.request);
     previousFocus = document.activeElement instanceof HTMLElement ? document.activeElement : null;
     dialog.showModal();
     deny.focus();
@@ -20474,7 +20772,8 @@ function createPajaConfirmationController(getState) {
     if (!current) return;
     active = null;
     if (ready && dialog.open) dialog.close();
-    recordPajaConfirmation(getState(), current.request, allowed2);
+    const approvalMode = allowed2 ? rememberSignerChoice(current.request) : void 0;
+    recordPajaConfirmation(getState(), current.request, allowed2, approvalMode);
     if (allowed2) current.approve();
     else current.deny();
     previousFocus?.focus();
@@ -20528,6 +20827,12 @@ function createPajaConfirmationController(getState) {
         });
       }
     },
+    clearSignerConsent() {
+      const cleared = consentStore.clear();
+      reportSignerConsentChange();
+      return cleared;
+    },
+    getSignerConsentCount: () => consentStore.count(),
     dispose() {
       if (disposed) return;
       disposed = true;
@@ -20544,6 +20849,13 @@ function createPajaConfirmationController(getState) {
     }
   };
 }
+function signerConsentCandidate(request) {
+  if (request.action !== "sign" || !request.signerContext) return null;
+  if (!isPajaSignerConsentContext(request.signerContext)) return null;
+  const kind = request.event.kind;
+  if (typeof kind !== "number" || !Number.isSafeInteger(kind) || kind < 0 || kind > 65535) return null;
+  return { context: request.signerContext, kind };
+}
 function describeConfirmation(request) {
   if (request.action === "upload") {
     return confirmationCopy(
@@ -20625,15 +20937,22 @@ function describeConfirmation(request) {
   const event = request.event;
   const kind = typeof event.kind === "number" ? event.kind : "unknown";
   const content = typeof event.content === "string" && event.content.length > 0 ? event.content.slice(0, 240) : "(empty content)";
+  const signerContext = request.signerContext;
   return {
     title: request.action === "sign" ? "Sign this Nostr event?" : "Publish this Nostr event?",
-    summary: request.action === "sign" ? "The active signer will authorize this event." : "Paja will send this event to the configured relay set.",
-    details: `Kind: ${kind}
-Content: ${content}`,
+    summary: request.action === "sign" ? signerContext ? `${signerContext.napplet.dTag} requests a signature from the active signer.` : "A Paja host operation requests a signature from the active signer." : "Paja will send this event to the configured relay set.",
+    details: confirmationDetails(
+      signerContext ? `Napplet: ${signerContext.napplet.dTag} (${signerContext.windowId})` : void 0,
+      signerContext ? `Identity hash: ${signerContext.napplet.aggregateHash}` : void 0,
+      signerContext?.runtimeScope.startsWith("target-url:") ? `Target URL: ${signerContext.runtimeScope.slice("target-url:".length)}` : void 0,
+      signerContext ? `Signer: ${signerContext.signerPubkey}` : void 0,
+      `Kind: ${kind}`,
+      `Content: ${content}`
+    ),
     approveLabel: request.action === "sign" ? "Sign" : "Publish"
   };
 }
-function recordPajaConfirmation(state, request, allowed2) {
+function recordPajaConfirmation(state, request, allowed2, signerApprovalMode) {
   if (request.action === "upload") {
     appendPajaMessageLog(state, "paja", {
       type: `paja.upload.${allowed2 ? "confirmed" : "denied"}`,
@@ -20702,9 +21021,16 @@ function recordPajaConfirmation(state, request, allowed2) {
   }
   if (!("event" in request)) return;
   const event = request.event;
+  const signerContext = request.signerContext;
   appendPajaMessageLog(state, "paja", {
     type: `paja.${request.action}.${allowed2 ? "confirmed" : "denied"}`,
-    kind: typeof event.kind === "number" ? event.kind : "unknown"
+    kind: typeof event.kind === "number" ? event.kind : "unknown",
+    windowId: signerContext?.windowId,
+    dTag: signerContext?.napplet.dTag,
+    aggregateHash: signerContext?.napplet.aggregateHash,
+    runtimeScope: signerContext?.runtimeScope,
+    signerPubkey: signerContext?.signerPubkey,
+    approval: signerApprovalMode
   });
 }
 function createHostSignerController(getState, refreshState, confirmRequest) {
@@ -22316,6 +22642,7 @@ function snapshotPajaBrowserState(state, runtime) {
     services: state.services,
     simulation: runtime.currentSimulation,
     signer: state.signer,
+    signerConsentCount: state.signerConsentCount,
     resolvedTarget: state.resolvedTarget,
     pointerStatus: state.pointerStatus,
     activeTabId: state.activeTabId,
@@ -22331,13 +22658,22 @@ function snapshotPajaBrowserState(state, runtime) {
   };
 }
 function createPajaBrowserState(context) {
-  const { config, bridge, adapter, signerController, capabilities, runtime } = context;
+  const {
+    config,
+    bridge,
+    adapter,
+    signerController,
+    confirmationController,
+    capabilities,
+    runtime
+  } = context;
   return {
     config,
     capabilities,
     services: Object.keys(adapter.services ?? {}).sort(),
     simulation: runtime.currentSimulation,
     signer: signerController.getState(),
+    signerConsentCount: confirmationController.getSignerConsentCount(),
     resolvedTarget: null,
     pointerValue: readInitialPointerValue(config),
     pointerStatus: config.target.mode === "runtime-pointer" ? "idle" : "",
@@ -22390,6 +22726,12 @@ function createPajaBrowserState(context) {
     connectBunker(uri) {
       return signerController.connectBunker(uri);
     },
+    clearSignerConsent() {
+      const cleared = confirmationController.clearSignerConsent();
+      appendPajaMessageLog(this, "paja", {
+        type: cleared ? "paja.signer-consent.cleared" : "paja.signer-consent.clear-failed"
+      });
+    },
     async loadPointer(value) {
       await loadRuntimePointer(this, context, value);
     },
@@ -22425,7 +22767,16 @@ async function installPajaHost() {
     () => contextRef,
     { persistTabs: persistRuntimeTabs }
   ));
-  const confirmationController = createPajaConfirmationController(() => stateRef);
+  const confirmationController = createPajaConfirmationController(
+    () => stateRef,
+    {
+      onSignerConsentChange(count) {
+        if (!stateRef) return;
+        stateRef.signerConsentCount = count;
+        setSimulationStatus(stateRef);
+      }
+    }
+  );
   const signerController = createHostSignerController(
     () => stateRef,
     setSimulationStatus,
@@ -22466,6 +22817,7 @@ async function installPajaHost() {
     bridge,
     adapter,
     signerController,
+    confirmationController,
     capabilities,
     runtime,
     navigateFrame,