@agent-score/commerce 2.3.0 → 2.5.0

package/dist/identity/nextjs.mjs

@@ -155,7 +155,520 @@ function denialReasonToBody(reason) {
   return body;
 }
 
+// src/aip/verify.ts
+import { decodeJwt, decodeProtectedHeader, importJWK as importJWK2, jwtVerify } from "jose";
+
+// src/aip/http-signature.ts
+import { calculateJwkThumbprint, importJWK } from "jose";
+var { subtle } = globalThis.crypto;
+var b64ToBytes = (b64) => {
+  const bin = atob(b64);
+  const out = new Uint8Array(bin.length);
+  for (let i = 0; i < bin.length; i++) {
+    out[i] = bin.charCodeAt(i);
+  }
+  return out;
+};
+var AIP_COVERED_COMPONENTS = ["@method", "@authority", "@path", "agent-identity"];
+var AIP_SIGNATURE_TAG = "agent-identity";
+var DEFAULT_MAX_SKEW_SECONDS = 60;
+var normalizeAuthority = (authority) => {
+  const lower = authority.trim().toLowerCase();
+  const colon = lower.lastIndexOf(":");
+  if (colon === -1) {
+    return lower;
+  }
+  if (lower.includes("]") && colon < lower.indexOf("]")) {
+    return lower;
+  }
+  const host = lower.slice(0, colon);
+  const port = lower.slice(colon + 1);
+  if (port === "80" || port === "443") {
+    return host;
+  }
+  return lower;
+};
+var componentValue = (name, input) => {
+  switch (name) {
+    case "@method":
+      return input.method.toUpperCase();
+    case "@authority":
+      return normalizeAuthority(input.authority);
+    case "@path":
+      return input.path;
+    case "agent-identity":
+      return input.agentIdentity.trim();
+    default:
+      return input.extra?.[name] ?? null;
+  }
+};
+var serializeComponentList = (components) => `(${components.map((c) => `"${c}"`).join(" ")})`;
+var serializeParams = (p) => {
+  const parts = [];
+  if (p.created !== void 0) {
+    parts.push(`created=${p.created}`);
+  }
+  if (p.expires !== void 0) {
+    parts.push(`expires=${p.expires}`);
+  }
+  if (p.keyid !== void 0) {
+    parts.push(`keyid="${p.keyid}"`);
+  }
+  if (p.alg !== void 0) {
+    parts.push(`alg="${p.alg}"`);
+  }
+  if (p.tag !== void 0) {
+    parts.push(`tag="${p.tag}"`);
+  }
+  return parts.map((s) => `;${s}`).join("");
+};
+var buildSignatureBase = (params, input) => {
+  const lines = [];
+  for (const name of params.components) {
+    const value = componentValue(name, input);
+    if (value === null) {
+      throw new MissingComponentError(name);
+    }
+    lines.push(`"${name}": ${value}`);
+  }
+  const paramsValue = serializeComponentList(params.components) + serializeParams(params);
+  lines.push(`"@signature-params": ${paramsValue}`);
+  return lines.join("\n");
+};
+var MissingComponentError = class extends Error {
+  constructor(component) {
+    super(`signature base missing covered component: ${component}`);
+    this.component = component;
+    this.name = "MissingComponentError";
+  }
+  component;
+};
+var parseSignatureInput = (header, tag = AIP_SIGNATURE_TAG) => {
+  const members = splitDictionary(header);
+  if (members.length === 0) {
+    return null;
+  }
+  const parsed = members.map((m) => {
+    const params = parseInnerListMember(m.value);
+    return params ? { label: m.label, params } : null;
+  }).filter((x) => x !== null);
+  if (parsed.length === 0) {
+    return null;
+  }
+  const tagged = parsed.find((p) => p.params.tag === tag);
+  if (tagged) {
+    return tagged;
+  }
+  if (parsed.length === 1 && parsed[0].params.tag === void 0) {
+    return parsed[0];
+  }
+  return null;
+};
+var parseSignatureValue = (header, label) => {
+  const members = splitDictionary(header);
+  const member = members.find((m) => m.label === label);
+  if (!member) {
+    return null;
+  }
+  const v = member.value.trim();
+  if (!v.startsWith(":") || !v.endsWith(":") || v.length < 2) {
+    return null;
+  }
+  const b64 = v.slice(1, -1);
+  try {
+    return b64ToBytes(b64);
+  } catch {
+    return null;
+  }
+};
+var splitDictionary = (header) => {
+  const out = [];
+  let depth = 0;
+  let inBytes = false;
+  let inString = false;
+  let current = "";
+  for (let i = 0; i < header.length; i++) {
+    const ch = header[i];
+    if (inString) {
+      current += ch;
+      if (ch === '"' && header[i - 1] !== "\\") {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      current += ch;
+      continue;
+    }
+    if (ch === ":") {
+      inBytes = !inBytes;
+      current += ch;
+      continue;
+    }
+    if (!inBytes && ch === "(") {
+      depth++;
+      current += ch;
+      continue;
+    }
+    if (!inBytes && ch === ")") {
+      depth = Math.max(0, depth - 1);
+      current += ch;
+      continue;
+    }
+    if (!inBytes && depth === 0 && ch === ",") {
+      pushMember(out, current);
+      current = "";
+      continue;
+    }
+    current += ch;
+  }
+  pushMember(out, current);
+  return out;
+};
+var pushMember = (out, raw) => {
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return;
+  }
+  const eq = trimmed.indexOf("=");
+  if (eq === -1) {
+    return;
+  }
+  const label = trimmed.slice(0, eq).trim();
+  const value = trimmed.slice(eq + 1).trim();
+  if (label) {
+    out.push({ label, value });
+  }
+};
+var parseInnerListMember = (value) => {
+  const open = value.indexOf("(");
+  const close = value.indexOf(")", open + 1);
+  if (open === -1 || close === -1) {
+    return null;
+  }
+  const listBody = value.slice(open + 1, close).trim();
+  const components = listBody.length === 0 ? [] : (listBody.match(/"[^"]*"/g) ?? []).map((s) => s.slice(1, -1));
+  const params = { components };
+  const paramStr = value.slice(close + 1);
+  const re = /;\s*([a-zA-Z][a-zA-Z0-9_-]*)\s*=\s*("(?:[^"\\]|\\.)*"|-?\d+)/g;
+  let match;
+  while ((match = re.exec(paramStr)) !== null) {
+    const key = match[1];
+    const raw = match[2];
+    const val = raw.startsWith('"') ? raw.slice(1, -1) : Number(raw);
+    if (key === "created") {
+      params.created = val;
+    } else if (key === "expires") {
+      params.expires = val;
+    } else if (key === "keyid") {
+      params.keyid = val;
+    } else if (key === "tag") {
+      params.tag = val;
+    } else if (key === "alg") {
+      params.alg = val;
+    }
+  }
+  return params;
+};
+var verifyMessageSignature = async (input) => {
+  const selected = parseSignatureInput(input.signatureInput);
+  if (!selected) {
+    return { ok: false, reason: "no_aip_signature" };
+  }
+  const { label, params } = selected;
+  if (params.alg !== void 0 && !["ed25519", "eddsa"].includes(params.alg.toLowerCase())) {
+    return { ok: false, reason: "unsupported_alg" };
+  }
+  for (const required of AIP_COVERED_COMPONENTS) {
+    if (!params.components.includes(required)) {
+      return { ok: false, reason: "missing_covered_component" };
+    }
+  }
+  const now = input.now ?? Math.floor(Date.now() / 1e3);
+  const skew = input.maxSkewSeconds ?? DEFAULT_MAX_SKEW_SECONDS;
+  if (params.created !== void 0 && params.created > now + skew) {
+    return { ok: false, reason: "created_in_future" };
+  }
+  if (params.expires !== void 0 && params.expires < now - skew) {
+    return { ok: false, reason: "expired" };
+  }
+  if (!params.keyid) {
+    return { ok: false, reason: "missing_keyid" };
+  }
+  const cnf = input.cnfJwk;
+  if (cnf.kty !== "OKP" || cnf.crv !== "Ed25519" || typeof cnf.x !== "string" || cnf.x.length === 0) {
+    return { ok: false, reason: "unsupported_cnf_key" };
+  }
+  let thumbprint;
+  try {
+    thumbprint = await calculateJwkThumbprint(input.cnfJwk, "sha256");
+  } catch {
+    return { ok: false, reason: "unsupported_cnf_key" };
+  }
+  if (params.keyid !== thumbprint) {
+    return { ok: false, reason: "keyid_mismatch" };
+  }
+  const sig = parseSignatureValue(input.signature, label);
+  if (!sig) {
+    return { ok: false, reason: "malformed_signature" };
+  }
+  let base;
+  try {
+    base = buildSignatureBase(params, {
+      method: input.method,
+      authority: input.authority,
+      path: input.path,
+      agentIdentity: input.agentIdentity,
+      extra: input.extraComponents
+    });
+  } catch (err) {
+    if (err instanceof MissingComponentError) {
+      return { ok: false, reason: "missing_covered_component" };
+    }
+    throw err;
+  }
+  let valid;
+  try {
+    const key = await importJWK(input.cnfJwk, "EdDSA");
+    if (!(key instanceof CryptoKey)) {
+      return { ok: false, reason: "signature_invalid" };
+    }
+    valid = await subtle.verify(
+      { name: "Ed25519" },
+      key,
+      sig,
+      new TextEncoder().encode(base)
+    );
+  } catch {
+    return { ok: false, reason: "signature_invalid" };
+  }
+  return valid ? { ok: true, params } : { ok: false, reason: "signature_invalid" };
+};
+
+// src/aip/types.ts
+var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var isNonEmptyString = (v) => typeof v === "string" && v.length > 0;
+var isAitShape = (payload) => isObject(payload) && isObject(payload.cnf) && isObject(payload.agent);
+var validateAitPayload = (payload) => {
+  if (!isObject(payload)) {
+    return { ok: false, reason: "not_an_object" };
+  }
+  if (!isNonEmptyString(payload.aip_version)) {
+    return { ok: false, reason: "missing_aip_version" };
+  }
+  if (!isNonEmptyString(payload.iss)) {
+    return { ok: false, reason: "missing_iss" };
+  }
+  if (!isNonEmptyString(payload.sub)) {
+    return { ok: false, reason: "missing_sub" };
+  }
+  if (typeof payload.iat !== "number") {
+    return { ok: false, reason: "missing_iat" };
+  }
+  if (typeof payload.exp !== "number") {
+    return { ok: false, reason: "missing_exp" };
+  }
+  if (!isObject(payload.cnf) || !isObject(payload.cnf.jwk)) {
+    return { ok: false, reason: "missing_cnf" };
+  }
+  if (!isObject(payload.agent) || !isNonEmptyString(payload.agent.provider)) {
+    return { ok: false, reason: "missing_agent_provider" };
+  }
+  if (payload.trust_level === "human_confirmed") {
+    const auth = payload.auth;
+    const amr = isObject(auth) ? auth.amr : void 0;
+    if (!Array.isArray(amr) || amr.length === 0) {
+      return { ok: false, reason: "human_confirmed_without_amr" };
+    }
+  }
+  return { ok: true, payload };
+};
+
+// src/aip/verify.ts
+var AGENT_IDENTITY_HEADER = "agent-identity";
+var verifyAit = async (ctx, opts) => {
+  if (ctx.agentIdentityHeaders.length === 0) {
+    return { ok: false, reason: "no_token" };
+  }
+  if (!ctx.signatureInput || !ctx.signature) {
+    return { ok: false, reason: "pop_signature_missing" };
+  }
+  let lastFailure = "malformed_token";
+  for (const raw of ctx.agentIdentityHeaders) {
+    const token = stripBearer(raw);
+    let header;
+    let payload;
+    try {
+      header = decodeProtectedHeader(token);
+      payload = decodeJwt(token);
+    } catch {
+      lastFailure = "malformed_token";
+      continue;
+    }
+    if (header.alg === void 0 || header.alg.toLowerCase() === "none") {
+      lastFailure = "malformed_token";
+      continue;
+    }
+    if (!isAitShape(payload)) {
+      lastFailure = "malformed_token";
+      continue;
+    }
+    const validated = validateAitPayload(payload);
+    if (!validated.ok) {
+      lastFailure = "invalid_claims";
+      continue;
+    }
+    const claims = validated.payload;
+    const keyLookup = await opts.jwks.getKey(claims.iss, header.kid);
+    if (!keyLookup.ok) {
+      lastFailure = keyLookup.reason === "untrusted_issuer" || keyLookup.reason === "insecure_issuer" ? "untrusted_issuer" : "key_unavailable";
+      continue;
+    }
+    const jwtClockTolerance = opts.maxSkewSeconds ?? 60;
+    try {
+      const idpKey = await importJWK2(keyLookup.key, normalizeAlg(header.alg));
+      await jwtVerify(token, idpKey, {
+        // Pin the signature algorithm allowlist (RFC 8725 §3.1) — also rejects `alg:none`. Without
+        // this, jose accepts whatever alg the resolved JWK supports, so a trusted IdP publishing a
+        // non-Ed25519 (e.g. RSA/EC) `use:sig` key would let an attacker present an RS256/ES256
+        // token that verifies. Matches the server-side allowlist in core/api aip-verify.
+        algorithms: AIT_SIGNING_ALGS,
+        clockTolerance: jwtClockTolerance,
+        currentDate: opts.now !== void 0 ? new Date(opts.now * 1e3) : void 0
+      });
+    } catch (err) {
+      lastFailure = isExpiry(err) ? "expired_token" : "idp_signature_invalid";
+      continue;
+    }
+    const nowSec = opts.now ?? Math.floor(Date.now() / 1e3);
+    if (claims.iat > nowSec + jwtClockTolerance) {
+      lastFailure = "expired_token";
+      continue;
+    }
+    const popResult = await verifyMessageSignature({
+      method: ctx.method,
+      authority: ctx.authority,
+      path: ctx.path,
+      agentIdentity: raw,
+      signatureInput: ctx.signatureInput,
+      signature: ctx.signature,
+      cnfJwk: claims.cnf.jwk,
+      now: opts.now,
+      maxSkewSeconds: opts.maxSkewSeconds
+    });
+    if (!popResult.ok) {
+      lastFailure = "pop_signature_invalid";
+      continue;
+    }
+    return { ok: true, ait: { payload: claims, iss: claims.iss, cnfJwk: claims.cnf.jwk, token } };
+  }
+  return { ok: false, reason: lastFailure };
+};
+var stripBearer = (value) => {
+  const trimmed = value.trim();
+  return /^bearer\s+/i.test(trimmed) ? trimmed.replace(/^bearer\s+/i, "") : trimmed;
+};
+var AIT_SIGNING_ALGS = ["EdDSA", "ES256"];
+var normalizeAlg = (alg) => alg.toLowerCase() === "eddsa" ? "EdDSA" : alg;
+var isExpiry = (err) => typeof err === "object" && err !== null && err.code === "ERR_JWT_EXPIRED";
+
+// src/aip/request.ts
+var readAgentIdentityHeaders = (headers) => {
+  const raw = headers.get(AGENT_IDENTITY_HEADER);
+  if (!raw) {
+    return [];
+  }
+  return raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+};
+var deriveAuthority = (req, url) => req.headers.get("host") ?? url.host;
+var buildVerifyContextFromRequest = (req) => {
+  const url = new URL(req.url);
+  return {
+    method: req.method,
+    authority: deriveAuthority(req, url),
+    path: url.pathname,
+    agentIdentityHeaders: readAgentIdentityHeaders(req.headers),
+    signatureInput: req.headers.get("signature-input"),
+    signature: req.headers.get("signature")
+  };
+};
+var hasAgentIdentityHeader = (req) => readAgentIdentityHeaders(req.headers).length > 0;
+
+// src/aip/gate.ts
+var verifyFromContext = async (ctx, opts) => {
+  const result = await verifyAit(ctx, { jwks: opts.jwks, now: opts.now, maxSkewSeconds: opts.maxSkewSeconds });
+  return result.ok ? { ok: true, ait: result.ait } : { ok: false, failure: result.reason };
+};
+var verifyAitRequest = (req, opts) => verifyFromContext(buildVerifyContextFromRequest(req), opts);
+var aipErrorCode = (failure) => {
+  switch (failure) {
+    case "no_token":
+    case "pop_signature_missing":
+      return "agent_identity_required";
+    case "untrusted_issuer":
+      return "untrusted_issuer";
+    case "expired_token":
+      return "expired_token";
+    case "invalid_claims":
+      return "insufficient_claims";
+    case "key_unavailable":
+      return "idp_unavailable";
+    case "malformed_token":
+    case "idp_signature_invalid":
+    case "pop_signature_invalid":
+      return "invalid_signature";
+    default:
+      return "invalid_signature";
+  }
+};
+var aipErrorStatus = (failure) => {
+  switch (failure) {
+    case "key_unavailable":
+      return 503;
+    case "untrusted_issuer":
+    case "invalid_claims":
+      return 403;
+    default:
+      return 401;
+  }
+};
+var aipErrorDetail = (failure) => {
+  switch (failure) {
+    case "no_token":
+      return "No Agent-Identity token was presented.";
+    case "pop_signature_missing":
+      return "The request is missing the RFC 9421 HTTP Message Signature that proves possession of the token-bound key.";
+    case "untrusted_issuer":
+      return "The token's issuer is not in this service's trusted-issuer list.";
+    case "expired_token":
+      return "The Agent Identity Token has expired.";
+    case "invalid_claims":
+      return "The token is missing required claims for this endpoint.";
+    case "malformed_token":
+      return "The Agent-Identity header could not be parsed as an Agent Identity Token.";
+    case "idp_signature_invalid":
+      return "The identity provider's signature on the token failed verification.";
+    case "pop_signature_invalid":
+      return "The request signature did not match the key bound to the token.";
+    case "key_unavailable":
+      return "The identity provider's signing key could not be resolved.";
+    default:
+      return "Token verification failed.";
+  }
+};
+var buildAipErrorBody = (failure) => {
+  const code = aipErrorCode(failure);
+  return {
+    type: `urn:aip:error:${code}`,
+    title: code.replace(/_/g, " "),
+    status: aipErrorStatus(failure),
+    detail: aipErrorDetail(failure)
+  };
+};
+
 // src/core.ts
+import { createHash } from "crypto";
 import {
   AgentScore,
   InvalidCredentialError,
@@ -257,8 +770,9 @@ var INVALID_CREDENTIAL_INSTRUCTIONS = JSON.stringify({
   ],
   user_message: "The operator_token is not recognized. Use a different stored token, or restart the verification session flow to mint a new one."
 });
-function buildAgentMemoryHint() {
+function buildAgentMemoryHint(aipTrustedIssuers) {
   const api = CANONICAL_AGENTSCORE_API;
+  const acceptsAip = aipTrustedIssuers !== void 0 && aipTrustedIssuers.length > 0;
   return {
     save_for_future_agentscore_gates: true,
     pattern_summary: "AgentScore is a cross-merchant identity substrate for agent commerce. Any endpoint that returns 403 missing_identity / identity_verification_required or 402 challenges referencing AgentScore uses the same identity system. One KYC works across all AgentScore merchants \u2014 no re-verification per site. Save this pattern (and the endpoints below) to persistent memory so future AgentScore encounters skip the cold-start session flow.",
@@ -266,8 +780,12 @@ function buildAgentMemoryHint() {
     identity_check_endpoint: `${api}/v1/credentials`,
     identity_paths: {
       wallet: "If paying from a crypto wallet you have used before on any AgentScore merchant, send `X-Wallet-Address: 0x...`. Shortest path; no token lifecycle to manage.",
-      operator_token: "For any rail (Stripe SPT, card, or a wallet you have not linked yet), send `X-Operator-Token: opc_...`. Reusable across merchants until the token expires."
+      operator_token: "For any rail (Stripe SPT, card, or a wallet you have not linked yet), send `X-Operator-Token: opc_...`. Reusable across merchants until the token expires.",
+      ...acceptsAip && {
+        agent_identity: 'If you hold an AIP Agent Identity Token from a trusted issuer (see aip_trusted_issuers), present it: send the JWT in an `Agent-Identity` header plus an RFC 9421 HTTP Message Signature (Signature-Input + Signature over @method @authority @path agent-identity, tag="agent-identity") signed with the token-bound cnf key. The merchant verifies it and applies its policy \u2014 no separate AgentScore credential needed.'
+      }
     },
+    ...acceptsAip && { aip_trusted_issuers: aipTrustedIssuers },
     bootstrap: "If you have neither a linked wallet nor a valid operator_token, follow the session/verify flow in the per-request `agent_instructions` block. This happens at most once per agent identity \u2014 after first verification, the operator_token and any subsequently used wallet are reusable everywhere.",
     do_not_persist_in_memory: ["operator_token", "poll_secret"],
     persist_in_credential_store: ["operator_token"]
@@ -289,11 +807,12 @@ function createAgentScoreCore(options) {
     baseUrl: rawBaseUrl = "https://api.agentscore.sh",
     chain: gateChain,
     userAgent,
-    createSessionOnMissing
+    createSessionOnMissing,
+    aipTrustedIssuers
   } = options;
   const baseUrl = stripTrailingSlashes(rawBaseUrl);
-  const agentMemoryHint = buildAgentMemoryHint();
-  const defaultUa = `@agent-score/commerce@${"2.3.0"}`;
+  const agentMemoryHint = buildAgentMemoryHint(aipTrustedIssuers);
+  const defaultUa = `@agent-score/commerce@${"2.5.0"}`;
   const userAgentHeader = userAgent ? `${userAgent} (${defaultUa})` : defaultUa;
   const sdk = new AgentScore({ apiKey, baseUrl, userAgent: userAgentHeader });
   const sessionSdkCache = /* @__PURE__ */ new Map();
@@ -311,6 +830,7 @@ function createAgentScoreCore(options) {
     return s;
   }
   const cache = new TTLCache(cacheSeconds * 1e3);
+  const lastSignerRaw = /* @__PURE__ */ new Map();
   async function tryMintSessionDenial(ctx) {
     if (!createSessionOnMissing) return void 0;
     try {
@@ -368,13 +888,18 @@ function createAgentScoreCore(options) {
     }
   }
   async function evaluate(identity, ctx, signer) {
-    if (!identity || !identity.address && !identity.operatorToken) {
+    if (!identity || !identity.address?.trim() && !identity.operatorToken?.trim() && !identity.aipToken?.trim()) {
       if (failOpen) return { kind: "allow" };
       const sessionReason = await tryMintSessionDenial(ctx);
       if (sessionReason) return { kind: "deny", reason: sessionReason };
+      const acceptsAip = aipTrustedIssuers !== void 0 && aipTrustedIssuers.length > 0;
+      const aipStep = acceptsAip ? [
+        `If you hold an AIP Agent Identity Token from a trusted issuer (${aipTrustedIssuers.join(", ")}): present it \u2014 send the JWT in an Agent-Identity header plus an RFC 9421 HTTP Message Signature (Signature-Input + Signature over @method @authority @path agent-identity, tag="agent-identity") signed with the token-bound cnf key. This satisfies identity in one round trip without an AgentScore credential.`
+      ] : [];
       const missingIdentityInstructions = JSON.stringify({
         action: "probe_identity_then_session",
         steps: [
+          ...aipStep,
           "If you have a wallet AND this merchant accepts a wallet-signing rail (Tempo MPP or x402 \u2014 see openapi.json x-payment-info): send X-Wallet-Address and retry. If the wallet is already linked to an AgentScore operator (via prior SIWE claim or prior captureWallet), this passes in one round trip. If the wallet is unlinked or the account has no KYC, the 403 will include a verify_url \u2014 share it with the user to claim the wallet + complete KYC, then retry.",
           "If step 1 is denied or you already have a stored operator_token (valid + not expired): send X-Operator-Token: opc_... and retry.",
           "If neither applies: retry with NO identity header. Merchants that auto-create verification sessions (most AgentScore merchants do) return verify_url + session_id + poll_secret in the 403 body \u2014 share verify_url with the user, then poll poll_url every 5s with the X-Poll-Secret header until status=verified (the poll returns a one-time operator_token). If the retry returns the same bare 403, this merchant does not support self-service session bootstrapping \u2014 direct the user to https://agentscore.sh/sign-up to create an AgentScore identity and mint an operator_token from their dashboard (https://agentscore.sh/dashboard/verify). The user hands the opc_... to you, and you retry with X-Operator-Token."
@@ -390,7 +915,7 @@ function createAgentScoreCore(options) {
         }
       };
     }
-    const cacheKey = identity.operatorToken?.toLowerCase() ?? (identity.address ? normalizeAddress(identity.address) : "");
+    const cacheKey = identity.aipToken ? `aip:${createHash("sha256").update(identity.aipToken).digest("hex")}` : identity.operatorToken?.toLowerCase() ?? (identity.address ? normalizeAddress(identity.address) : "");
     const cached = cache.get(cacheKey);
     if (cached) {
       if (cached.allow) {
@@ -435,7 +960,7 @@ function createAgentScoreCore(options) {
         // regardless of policy.require_sanctions_clear (which gates the separate NAME screen).
         ...signer && { signer: { address: signer.address, network: signer.network } }
       };
-      const result = identity.address ? await sdk.assess(identity.address, { ...opts, operatorToken: identity.operatorToken }) : await sdk.assess(null, { ...opts, operatorToken: identity.operatorToken });
+      const result = identity.aipToken ? await sdk.assess(null, { ...opts, aipToken: identity.aipToken }) : identity.address ? await sdk.assess(identity.address, { ...opts, operatorToken: identity.operatorToken }) : await sdk.assess(null, { ...opts, operatorToken: identity.operatorToken });
       data = result;
     } catch (err) {
       if (err instanceof PaymentRequiredError) {
@@ -506,6 +1031,9 @@ function createAgentScoreCore(options) {
     const decisionReasons = data.decision_reasons ?? [];
     const allow = decision === "allow" || decision == null;
     cache.set(cacheKey, { allow, decision: decision ?? void 0, reasons: decisionReasons, raw: data });
+    if (identity.address !== void 0 && identity.operatorToken === void 0 && identity.aipToken === void 0 && (data.signer_match !== void 0 || data.signer_sanctions !== void 0)) {
+      lastSignerRaw.set(normalizeAddress(identity.address), data);
+    }
     if (allow) {
       const quota = data.quota;
       return {
@@ -570,9 +1098,7 @@ function createAgentScoreCore(options) {
   }
   function getSignerVerdict(claimedAddress) {
     const claimedNorm = normalizeAddress(claimedAddress);
-    const cached = cache.get(claimedNorm);
-    if (!cached) return void 0;
-    const raw = cached.raw;
+    const raw = lastSignerRaw.get(claimedNorm) ?? cache.get(claimedNorm)?.raw;
     if (!raw) return void 0;
     const rawMatch = raw.signer_match;
     const rawSanctions = raw.signer_sanctions;
@@ -626,6 +1152,18 @@ async function extractSolanaSignerFromCredential(credential) {
   }
 }
 async function extractPaymentSigner(request, x402PaymentHeader) {
+  if (x402PaymentHeader) {
+    try {
+      const decoded = atob(x402PaymentHeader);
+      const parsed = JSON.parse(decoded);
+      const from = parsed?.payload?.authorization?.from;
+      if (typeof from === "string" && /^0x[0-9a-fA-F]{40}$/.test(from)) {
+        return { address: from.toLowerCase(), network: "evm" };
+      }
+    } catch (err) {
+      console.warn("[gate] x402 signer extraction failed:", err instanceof Error ? err.message : err);
+    }
+  }
   const authHeader = request.headers.get("authorization");
   if (authHeader) {
     try {
@@ -645,18 +1183,6 @@ async function extractPaymentSigner(request, x402PaymentHeader) {
       console.warn("[gate] MPP signer extraction failed:", err instanceof Error ? err.message : err);
     }
   }
-  if (x402PaymentHeader) {
-    try {
-      const decoded = atob(x402PaymentHeader);
-      const parsed = JSON.parse(decoded);
-      const from = parsed?.payload?.authorization?.from;
-      if (typeof from === "string" && /^0x[0-9a-fA-F]{40}$/.test(from)) {
-        return { address: from.toLowerCase(), network: "evm" };
-      }
-    } catch (err) {
-      console.warn("[gate] x402 signer extraction failed:", err instanceof Error ? err.message : err);
-    }
-  }
   return null;
 }
 function readX402PaymentHeader(request) {
@@ -702,6 +1228,42 @@ function createAgentScoreGate(options) {
     return { allowed: false, response };
   };
 }
+var defaultAipResponse = (body) => new Response(JSON.stringify(body), { status: body.status, headers: { "content-type": "application/problem+json" } });
+function createAipGate(options) {
+  const { onDenied, ...gateOpts } = options;
+  return async (req) => {
+    const result = await verifyAitRequest(req, gateOpts);
+    if (result.ok) {
+      return { allowed: true, ait: result.ait };
+    }
+    const body = buildAipErrorBody(result.failure);
+    const response = onDenied ? await onDenied(req, body) : defaultAipResponse(body);
+    return { allowed: false, response };
+  };
+}
+function withAipGate(options, handler) {
+  const guard = createAipGate(options);
+  return async (req, ctx) => {
+    const result = await guard(req);
+    if (!result.allowed) {
+      return result.response;
+    }
+    return handler(req, { ait: result.ait }, ctx);
+  };
+}
+function withConditionalAipGate(options, handler) {
+  const guard = createAipGate(options);
+  return async (req, ctx) => {
+    if (!hasAgentIdentityHeader(req)) {
+      return handler(req, {}, ctx);
+    }
+    const result = await guard(req);
+    if (!result.allowed) {
+      return result.response;
+    }
+    return handler(req, { ait: result.ait }, ctx);
+  };
+}
 
 // src/identity/nextjs.ts
 function withAgentScoreGate(options, handler) {
@@ -750,7 +1312,10 @@ function conditionalAgentscoreMiddleware(options) {
 export {
   agentscoreMiddleware,
   conditionalAgentscoreMiddleware,
+  createAipGate,
   withAgentScoreGate,
-  withConditionalAgentScoreGate
+  withAipGate,
+  withConditionalAgentScoreGate,
+  withConditionalAipGate
 };
 //# sourceMappingURL=nextjs.mjs.map