@haven_ai/signer 0.1.37-alpha.0 → 0.2.1-alpha.0

package/dist/index.cjs

@@ -503,10 +503,12 @@ async function loadSignerCredentials(path = process.env.HAVEN_CREDENTIALS) {
   if (path) return loadFromFile(path);
   const envKey = stringField(process.env.HAVEN_DELEGATE_KEY);
   if (envKey) {
+    const accountAddress = readAccountAddressEnv(process.env);
     return {
       delegateKey: envKey,
       agentId: stringField(process.env.HAVEN_AGENT_ID),
-      safeAddress: stringField(process.env.HAVEN_SAFE_ADDRESS),
+      accountAddress,
+      safeAddress: accountAddress,
       chainId: chainIdField(process.env.HAVEN_CHAIN_ID, "HAVEN_CHAIN_ID"),
       network: stringField(process.env.HAVEN_NETWORK),
       x402BindingSigner: stringField(process.env.HAVEN_X402_BINDING_SIGNER)
@@ -536,10 +538,12 @@ async function loadFromFile(path) {
   if (!delegateKey) {
     throw new Error("Haven credentials are missing delegate_key \u2014 the edge signer needs it to sign.");
   }
+  const accountAddress = readAccountAddressField(raw);
   return {
     delegateKey,
     agentId: stringField(raw.agent_id ?? raw.agentId),
-    safeAddress: stringField(raw.safe_address ?? raw.safeAddress),
+    accountAddress,
+    safeAddress: accountAddress,
     chainId: chainIdField(raw.chain_id ?? raw.chainId, "chain_id"),
     network: stringField(raw.network),
     x402BindingSigner: stringField(
@@ -548,6 +552,12 @@ async function loadFromFile(path) {
     sourcePath: path
   };
 }
+function readAccountAddressField(raw) {
+  return stringField(raw.account_address ?? raw.safe_address ?? raw.safeAddress);
+}
+function readAccountAddressEnv(env) {
+  return stringField(env.HAVEN_ACCOUNT_ADDRESS ?? env.HAVEN_WALLET_ADDRESS ?? env.HAVEN_SAFE_ADDRESS);
+}
 function stringField(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
@@ -619,6 +629,49 @@ function stableStringify(value) {
   const object = value;
   return `{${Object.keys(object).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(object[key])}`).join(",")}}`;
 }
+var HavenSignContextError = class extends sdk.HavenSigningError {
+  /**
+   * #3001 / #3010 review: the recovery path, when signing OTHER bytes is
+   * actually a remedy — a transport failure (timeout, unreachable) or a
+   * body this signer could not read. `typed_data_b64` is NOT in the default
+   * quote result since #1272: obtain it by re-running the SAME quote tool
+   * with the SAME idempotency_key plus `include_signing_payload: true`.
+   * Absent on a backend REFUSAL: an expired, executed or unsignable intent
+   * cannot be rescued by re-signing its bytes.
+   */
+  fallback;
+  /**
+   * #3001: `AgentPaymentNextAction` values the signer already emits — the
+   * version-mismatch refusal's `stop_and_tell_user` for the classes where
+   * retrying the same call cannot help, and `payment_window_expired` (with
+   * `retry_with_new_quote`) for the backend's 410 `expired`, exactly as the
+   * plain `HavenError` branch already does for that code.
+   */
+  next_action;
+  retry_with_new_quote;
+  /** Present only for `SIGN_CONTEXT_REFUSED` (the backend's HTTP status). */
+  http_status;
+  /** Present only for `SIGN_CONTEXT_REFUSED`: the backend's own `error_code`. */
+  backend_error_code;
+  constructor(message, code, refusal) {
+    super(message);
+    this.code = code;
+    this.name = "HavenSignContextError";
+    if (code === "SIGN_CONTEXT_REFUSED") {
+      this.http_status = refusal?.httpStatus;
+      this.backend_error_code = refusal?.errorCode;
+      if (refusal?.httpStatus === 410 || refusal?.errorCode === "expired") {
+        this.next_action = sdk.AgentPaymentNextAction.PaymentWindowExpired;
+        this.retry_with_new_quote = true;
+      } else {
+        this.next_action = sdk.AgentPaymentNextAction.StopAndTellUser;
+      }
+    } else {
+      this.fallback = "typed_data_b64";
+      this.next_action = sdk.AgentPaymentNextAction.StopAndTellUser;
+    }
+  }
+};
 async function loadHavenIdentity(credentialsPath) {
   if (!credentialsPath) return null;
   try {
@@ -633,30 +686,50 @@ async function loadHavenIdentity(credentialsPath) {
     return null;
   }
 }
-async function fetchX402SignContext(identity, paymentId, fetchImpl = fetch) {
+var SIGN_CONTEXT_TIMEOUT_MS = 15e3;
+async function fetchX402SignContext(identity, paymentId, fetchImpl = fetch, timeoutMs = SIGN_CONTEXT_TIMEOUT_MS) {
   let response;
   try {
     response = await fetchImpl(
       `${identity.apiUrl}/x402/${encodeURIComponent(paymentId)}/sign-context`,
-      { headers: { Authorization: `Bearer ${identity.apiKey}` } }
+      {
+        headers: { Authorization: `Bearer ${identity.apiKey}` },
+        signal: AbortSignal.timeout(timeoutMs)
+      }
     );
   } catch (err) {
-    throw new sdk.HavenSigningError(
-      `Could not reach Haven to fetch the signing context for ${paymentId}: ${err instanceof Error ? err.message : String(err)}. Retry, or pass typed_data_b64 from the quote result instead.`
+    const timedOut = err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError");
+    throw new HavenSignContextError(
+      timedOut ? `Haven did not answer the signing-context fetch for ${paymentId} within ${timeoutMs} ms. Retry, or pass typed_data_b64 from the quote result instead.` : `Could not reach Haven to fetch the signing context for ${paymentId}: ${err instanceof Error ? err.message : String(err)}. Retry, or pass typed_data_b64 from the quote result instead.`,
+      timedOut ? "SIGN_CONTEXT_TIMEOUT" : "SIGN_CONTEXT_UNREACHABLE"
     );
   }
-  const body = await response.json().catch(() => ({}));
+  let body;
+  try {
+    body = await response.json();
+  } catch (err) {
+    if (err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError")) {
+      throw new HavenSignContextError(
+        `Haven did not finish sending the signing context for ${paymentId} within ${timeoutMs} ms. Retry, or pass typed_data_b64 from the quote result instead.`,
+        "SIGN_CONTEXT_TIMEOUT"
+      );
+    }
+    body = {};
+  }
   if (!response.ok) {
     const detail = typeof body.error === "string" ? body.error : `HTTP ${response.status}`;
-    throw new sdk.HavenSigningError(
-      `Haven refused the signing-context fetch for ${paymentId}: ${detail}` + (response.status === 404 ? " \u2014 check the payment_id came from this agent\u2019s own quote." : response.status === 410 ? " Re-run the quote with the same idempotency key, then sign the fresh payment_id." : "")
+    throw new HavenSignContextError(
+      `Haven refused the signing-context fetch for ${paymentId}: ${detail}` + (response.status === 404 ? " \u2014 check the payment_id came from this agent\u2019s own quote." : response.status === 410 ? " Re-run the quote with the same idempotency key, then sign the fresh payment_id." : ""),
+      "SIGN_CONTEXT_REFUSED",
+      { httpStatus: response.status, errorCode: typeof body.error_code === "string" ? body.error_code : void 0 }
     );
   }
   const signData = body.sign_data;
   const x402Expected = body.x402_expected;
   if (!signData || typeof signData.hash !== "string" || !signData.typed_data || typeof signData.typed_data !== "object" || !x402Expected) {
-    throw new sdk.HavenSigningError(
-      "The Haven sign-context response is missing sign_data.typed_data or x402_expected \u2014 the backend may predate #1263. Pass typed_data_b64 from the quote result instead."
+    throw new HavenSignContextError(
+      "The Haven sign-context response is missing sign_data.typed_data or x402_expected \u2014 the backend may predate #1263. Pass typed_data_b64 from the quote result instead.",
+      "SIGN_CONTEXT_MALFORMED"
     );
   }
   const paymentRequired = body.payment_required;
@@ -1087,6 +1160,18 @@ function normalizeError(err) {
       next_action: sdk.AgentPaymentNextAction.StopAndTellUser
     };
   }
+  if (err instanceof HavenSignContextError) {
+    return {
+      success: false,
+      code: err.code,
+      message: err.message,
+      next_action: err.next_action,
+      ...err.fallback !== void 0 ? { fallback: err.fallback } : {},
+      ...err.retry_with_new_quote ? { retry_with_new_quote: true } : {},
+      ...err.http_status !== void 0 ? { http_status: err.http_status } : {},
+      ...err.backend_error_code !== void 0 ? { backend_error_code: err.backend_error_code } : {}
+    };
+  }
   if (err instanceof sdk.HavenSigningError) {
     return { success: false, code: err.code, message: err.message };
   }
@@ -1233,7 +1318,7 @@ async function writeAckFile(path$1, hash) {
   );
 }
 var SIGNER_NAME = "@haven_ai/signer";
-var SIGNER_VERSION = "0.1.37-alpha.0";
+var SIGNER_VERSION = "0.2.1-alpha.0";
 async function resolveEdgeSigner(options = {}) {
   const { signer } = await resolveSignerRuntime(options);
   return signer;
@@ -1272,7 +1357,7 @@ function buildSignerMcpServer(signer, options = {}) {
     audit: {
       auditPath: options.auditPath ?? defaultSigningAuditPath(credentialsPath),
       delegateAddress: signer.delegateAddress,
-      safeAddress: options.credentials?.safeAddress,
+      safeAddress: options.credentials?.accountAddress ?? options.credentials?.safeAddress,
       chainId: options.credentials?.chainId
     },
     // #1263: the payment_id signing path — the ONLY network call this server
@@ -1322,7 +1407,7 @@ async function runSignerConsentGate(signer, credentials, options) {
   return ensureSignerConsent(
     {
       delegateAddress: signer.delegateAddress,
-      safeAddress: credentials?.safeAddress,
+      safeAddress: credentials?.accountAddress ?? credentials?.safeAddress,
       agentId: credentials?.agentId,
       chainId: credentials?.chainId,
       network: credentials?.network,
@@ -1362,6 +1447,8 @@ exports.defaultSigningAuditPath = defaultSigningAuditPath;
 exports.ensureSignerConsent = ensureSignerConsent;
 exports.hashPayloadForAudit = hashPayloadForAudit;
 exports.loadSignerCredentials = loadSignerCredentials;
+exports.readAccountAddressEnv = readAccountAddressEnv;
+exports.readAccountAddressField = readAccountAddressField;
 exports.renderSignerConsentBlock = renderSignerConsentBlock;
 exports.resolveEdgeSigner = resolveEdgeSigner;
 exports.resolveSignerRuntime = resolveSignerRuntime;