@haven_ai/mcp 0.2.0-alpha.0 → 0.3.0-alpha.0

package/README.md

@@ -44,9 +44,12 @@ Create a private JSON file from the values in the Haven agent handoff:
 `delegate_key` is required. Without it the MCP server cannot sign locally.
 `account_address` is the name the connector writes since #2908; a file that
 still says `safe_address` (or `safeAddress`) is read the same way, permanently.
-The same holds for the environment: `HAVEN_ACCOUNT_ADDRESS` is read first, and
-the older `HAVEN_WALLET_ADDRESS` / `HAVEN_SAFE_ADDRESS` are accepted for one
-release (#2914 removes them).
+The environment is **not** the same: only `HAVEN_ACCOUNT_ADDRESS` is read.
+`HAVEN_WALLET_ADDRESS` and `HAVEN_SAFE_ADDRESS` were accepted for one release
+and #2914 removed them, so a machine still configured through either resolves
+no account address at all. The credential-FILE fallback above is permanent —
+a file on disk never rewrites itself — and the environment is not, which is
+the whole difference between the two paragraphs.
 
 The Haven connector may also write split credentials:
 

package/dist/cli.cjs

@@ -56,7 +56,6 @@ async function loadCredentialsFromFile(path) {
     delegateKey,
     agentId: stringField(raw.agent_id ?? raw.agentId),
     accountAddress,
-    safeAddress: accountAddress,
     delegateAddress: stringField(raw.delegate_address ?? raw.delegateAddress),
     chainId: numberField(raw.chain_id ?? raw.chainId),
     network: stringField(raw.network),
@@ -86,13 +85,11 @@ async function loadCredentialsFromSplitFiles(identityPath, signerPath) {
       identity.agent_id ?? identity.agentId,
       signer.agent_id ?? signer.agentId
     ),
-    ...accountAddressTwins(
-      matchingStringField(
-        "account_address",
-        readAccountAddressField(identity),
-        readAccountAddressField(signer),
-        { caseInsensitive: true }
-      )
+    accountAddress: matchingStringField(
+      "account_address",
+      readAccountAddressField(identity),
+      readAccountAddressField(signer),
+      { caseInsensitive: true }
     ),
     delegateAddress: matchingStringField(
       "delegate_address",
@@ -147,7 +144,7 @@ function loadCredentialsFromEnv() {
     apiKey,
     delegateKey,
     agentId: stringField(process.env.HAVEN_AGENT_ID),
-    ...accountAddressTwins(readAccountAddressEnv(process.env)),
+    accountAddress: readAccountAddressEnv(process.env),
     chainId: numberField(process.env.HAVEN_CHAIN_ID),
     network: stringField(process.env.HAVEN_NETWORK),
     apiUrl: stringField(process.env.HAVEN_API_URL)
@@ -157,10 +154,22 @@ 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 accountAddressTwins(address) {
-  return { accountAddress: address, safeAddress: address };
+  const current = stringField(env.HAVEN_ACCOUNT_ADDRESS);
+  for (const name of ["HAVEN_WALLET_ADDRESS", "HAVEN_SAFE_ADDRESS"]) {
+    const retired = stringField(env[name]);
+    if (!retired) continue;
+    if (!current) {
+      throw new Error(
+        `${name} is retired (#2906) \u2014 Haven accounts are addressed as accounts, not Safes. Set HAVEN_ACCOUNT_ADDRESS to the same value. Refusing rather than ignoring it, because an unset account address silently skips the sweep-destination check.`
+      );
+    }
+    if (retired.toLowerCase() !== current.toLowerCase()) {
+      throw new Error(
+        `${name} and HAVEN_ACCOUNT_ADDRESS were both set to different addresses. Remove the retired name, or make them match \u2014 picking one silently would hide the mismatch.`
+      );
+    }
+  }
+  return current;
 }
 function stringField(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
@@ -374,6 +383,8 @@ function createToolHandlers(haven) {
         const attempt = () => haven.fetch(merchantUrl, init, { idempotencyKey });
         let response = await attempt();
         if (!response.ok) {
+          const notReady = await merchantNotReadyErrorFor(response);
+          if (notReady) throw notReady;
           const discovered = await sdk.discoverMerchantMcpUrl(merchantUrl);
           if (!discovered || sdk.sameUrl(discovered, merchantUrl)) {
             throw discoveryMissError(response, merchantUrl, discovered);
@@ -382,6 +393,8 @@ function createToolHandlers(haven) {
           merchantUrl = discovered;
           const retryResponse = await attempt();
           if (!retryResponse.ok) {
+            const notReadyAtDiscovered = await merchantNotReadyErrorFor(retryResponse);
+            if (notReadyAtDiscovered) throw notReadyAtDiscovered;
             throw discoveryMissError(retryResponse, merchantUrl, discovered, inputUrl);
           }
           response = retryResponse;
@@ -615,12 +628,50 @@ function parseMaybeJson(text) {
     return text;
   }
 }
+var MerchantNotReadyError = class extends Error {
+  code = sdk.AgentPaymentFailureCode.MerchantNotReady;
+  statusCode = 503;
+  nextAction = sdk.AgentPaymentNextAction.StopAndTellUser;
+  // Genuinely retryable — unlike a rejection, nothing about THIS call was
+  // wrong; the merchant's own wallet needs to recover first.
+  retryWithNewQuote = true;
+  constructor(message) {
+    super(message);
+    this.name = "MerchantNotReadyError";
+  }
+};
+async function merchantNotReadyErrorFor(response) {
+  if (response.status !== 503) return null;
+  let body;
+  try {
+    body = await response.clone().json();
+  } catch {
+    return null;
+  }
+  if (!body || typeof body !== "object" || body.error !== "merchant_not_ready") {
+    return null;
+  }
+  const { reason_code, settlements_remaining, retry_after_s } = body;
+  return new MerchantNotReadyError(
+    "The merchant refused this call: it cannot settle a payment right now" + (typeof reason_code === "string" ? ` (reason_code: ${reason_code})` : "") + (typeof settlements_remaining === "number" ? `, settlements_remaining: ${settlements_remaining}` : "") + ". No payment was created." + (typeof retry_after_s === "number" ? ` Retry after approximately ${retry_after_s}s.` : " This is often transient; retry later.")
+  );
+}
 function discoveryMissError(response, merchantUrl, discovered, discoveredFromUrl) {
   const base = discoveredFromUrl ? `Merchant call to ${merchantUrl} failed with HTTP ${response.status} (at the DISCOVERED endpoint ${merchantUrl}, resolved from ${discoveredFromUrl} via the merchant discovery document).` : `Merchant call to ${merchantUrl} failed with HTTP ${response.status}.`;
   const guidance = discoveredFromUrl ? "" : discovered ? ` Same-origin discovery resolved the same URL (${discovered}), which still did not answer successfully.` : ` No same-origin discovery document was found at /.well-known/haven-demo-merchant or /. If ${merchantUrl} is a base merchant URL, pass the exact MCP endpoint instead (often <origin>/mcp).`;
   return new sdk.HavenApiError(`${base}${guidance}`, response.status || 400);
 }
 function normalizeError(err) {
+  if (err instanceof MerchantNotReadyError) {
+    return {
+      success: false,
+      code: err.code,
+      message: err.message,
+      statusCode: err.statusCode,
+      nextAction: err.nextAction,
+      retry_with_new_quote: err.retryWithNewQuote
+    };
+  }
   if (err instanceof sdk.HavenPaymentStateError) {
     return {
       success: false,
@@ -681,7 +732,7 @@ function computeConsentHash(input) {
     input.apiKeyPrefix,
     input.apiUrl ?? "",
     input.agentId ?? "",
-    (input.safeAddress ?? "").toLowerCase(),
+    (input.accountAddress ?? "").toLowerCase(),
     (input.delegateAddress ?? "").toLowerCase(),
     input.chainId ?? ""
   ].join("|");
@@ -700,7 +751,7 @@ function renderConsentBlock(input, hash) {
   ];
   if (input.apiUrl) lines.push(`Haven API: ${input.apiUrl}`);
   if (input.agentId) lines.push(`Agent ID:  ${input.agentId}`);
-  if (input.safeAddress) lines.push(`Haven wallet (Safe): ${input.safeAddress}`);
+  if (input.accountAddress) lines.push(`Haven wallet (Safe): ${input.accountAddress}`);
   if (input.delegateAddress) lines.push(`Delegate (local signer): ${input.delegateAddress}`);
   if (typeof input.chainId === "number") lines.push(`Chain ID:  ${input.chainId}`);
   lines.push("");
@@ -807,14 +858,14 @@ async function writeAckFile(path$1, hash) {
 }
 async function consentInputFromClient(haven, seed, toolNames) {
   let allowanceSummary = seed.allowanceSummary ?? [];
-  let safeAddress = seed.safeAddress;
+  let accountAddress = seed.accountAddress;
   let delegateAddress = seed.delegateAddress;
   let chainId = seed.chainId;
   try {
     const summary = await haven.getAllowances();
     const list = isAllowanceSummary(summary) ? summary.allowances : Array.isArray(summary) ? summary : [];
     if (isAllowanceSummary(summary)) {
-      safeAddress = summary.accountAddress ?? summary.safeAddress ?? safeAddress;
+      accountAddress = summary.accountAddress ?? accountAddress;
       delegateAddress = summary.delegateAddress;
       chainId = typeof summary.chainId === "number" ? summary.chainId : chainId;
     }
@@ -830,7 +881,7 @@ async function consentInputFromClient(haven, seed, toolNames) {
     apiKeyPrefix: derivePrefix(seed.apiKey),
     apiUrl: seed.apiUrl,
     agentId: seed.agentId,
-    safeAddress,
+    accountAddress,
     delegateAddress,
     chainId,
     toolNames,
@@ -864,7 +915,7 @@ async function resolveHavenClient(options = {}) {
   return { client, credentials };
 }
 var MCP_NAME = "@haven_ai/mcp";
-var MCP_VERSION = "0.2.0-alpha.0";
+var MCP_VERSION = "0.3.0-alpha.0";
 var MCP_INSTRUCTIONS = [
   "Haven local MCP server: signs in-process with the delegate key it holds on",
   "this machine \u2014 the key never leaves this process. Call haven_get_agent",
@@ -937,7 +988,7 @@ async function runConsentGate(haven, credentials, options) {
       apiKey: credentials.apiKey,
       apiUrl: credentials.apiUrl,
       agentId: credentials.agentId,
-      safeAddress: credentials.accountAddress ?? credentials.safeAddress,
+      accountAddress: credentials.accountAddress,
       delegateAddress: credentials.delegateAddress,
       chainId: credentials.chainId,
       allowanceSummary: credentials.allowanceSummary