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

package/dist/cli.js

@@ -28,7 +28,7 @@ function createSigningAuditEntry(tool, payloadHash, context, now = /* @__PURE__
     payload_hash: payloadHash,
     delegate_address: context.delegateAddress
   };
-  if (context.safeAddress) entry.safe_address = context.safeAddress;
+  if (context.accountAddress) entry.safe_address = context.accountAddress;
   if (typeof context.chainId === "number") entry.chain_id = context.chainId;
   return entry;
 }
@@ -983,7 +983,7 @@ function createToolHandlers(signer, options = {}) {
         authorization: args.authorization,
         expectedAuth: args.expected_auth,
         // Cross-check `to` against the Safe in the local credential when present.
-        expectedSafe: options.audit?.safeAddress
+        expectedSafe: options.audit?.accountAddress
       });
       await auditSigning(
         "haven_sign_sweep_delegate",
@@ -1108,7 +1108,7 @@ var SIGNER_CONSENT_SURFACE_VERSION = 2;
 function computeSignerConsentHash(input) {
   const identity = [
     input.delegateAddress.toLowerCase(),
-    (input.safeAddress ?? "").toLowerCase(),
+    (input.accountAddress ?? "").toLowerCase(),
     input.agentId ?? "",
     input.chainId ?? "",
     input.network ?? ""
@@ -1127,7 +1127,7 @@ function renderSignerConsentBlock(input, hash) {
     "",
     `Delegate address: ${input.delegateAddress}`
   ];
-  lines.push(`Haven wallet:     ${input.safeAddress ?? "not provided to this signer"}`);
+  lines.push(`Haven wallet:     ${input.accountAddress ?? "not provided to this signer"}`);
   if (input.agentId) lines.push(`Agent ID:         ${input.agentId}`);
   if (typeof input.chainId === "number") lines.push(`Chain ID:         ${input.chainId}`);
   if (input.network) lines.push(`Network:          ${input.network}`);
@@ -1229,7 +1229,6 @@ async function loadSignerCredentials(path = process.env.HAVEN_CREDENTIALS) {
       delegateKey: envKey,
       agentId: stringField(process.env.HAVEN_AGENT_ID),
       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)
@@ -1264,7 +1263,6 @@ async function loadFromFile(path) {
     delegateKey,
     agentId: stringField(raw.agent_id ?? raw.agentId),
     accountAddress,
-    safeAddress: accountAddress,
     chainId: chainIdField(raw.chain_id ?? raw.chainId, "chain_id"),
     network: stringField(raw.network),
     x402BindingSigner: stringField(
@@ -1277,7 +1275,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);
+  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;
@@ -1320,7 +1333,7 @@ async function warnIfCredentialFilePermissive(path, log = (message) => process.s
 
 // src/server.ts
 var SIGNER_NAME = "@haven_ai/signer";
-var SIGNER_VERSION = "0.2.1-alpha.0";
+var SIGNER_VERSION = "0.3.0-alpha.0";
 async function resolveSignerRuntime(options = {}) {
   assertSupportedNodeVersion(options.nodeVersion);
   if (options.delegateKey) {
@@ -1355,7 +1368,7 @@ function buildSignerMcpServer(signer, options = {}) {
     audit: {
       auditPath: options.auditPath ?? defaultSigningAuditPath(credentialsPath),
       delegateAddress: signer.delegateAddress,
-      safeAddress: options.credentials?.accountAddress ?? options.credentials?.safeAddress,
+      accountAddress: options.credentials?.accountAddress,
       chainId: options.credentials?.chainId
     },
     // #1263: the payment_id signing path — the ONLY network call this server
@@ -1405,7 +1418,7 @@ async function runSignerConsentGate(signer, credentials, options) {
   return ensureSignerConsent(
     {
       delegateAddress: signer.delegateAddress,
-      safeAddress: credentials?.accountAddress ?? credentials?.safeAddress,
+      accountAddress: credentials?.accountAddress,
       agentId: credentials?.agentId,
       chainId: credentials?.chainId,
       network: credentials?.network,