@haven_ai/connect 0.1.37-alpha.0 → 0.2.0-alpha.0

package/dist/cli.js

@@ -267,7 +267,7 @@ function signerPayload(input) {
     delegate_key: input.delegateKey,
     delegate_address: input.delegateAddress,
     agent_id: input.agentId,
-    safe_address: input.safeAddress,
+    account_address: input.accountAddress,
     chain_id: input.chainId,
     network: input.network,
     x402_binding_signer: input.x402BindingSigner,
@@ -278,7 +278,7 @@ function identityPayload(input) {
   return {
     api_key: input.apiKey,
     agent_id: input.agentId,
-    safe_address: input.safeAddress,
+    account_address: input.accountAddress,
     chain_id: input.chainId,
     network: input.network,
     api_url: input.apiUrl,
@@ -291,7 +291,7 @@ function agentPayload(input) {
   return {
     agent_id: input.agentId,
     delegate_address: input.delegateAddress,
-    safe_address: input.safeAddress,
+    account_address: input.accountAddress,
     chain_id: input.chainId,
     network: input.network,
     agent_budget: input.agentBudget,
@@ -325,13 +325,20 @@ async function readStoredCredentials(serverName, agentIdOrSlug, baseDir) {
     apiUrl,
     hostedMcpUrl,
     delegateAddress: asString(agent.delegate_address) ?? asString(signer.delegate_address),
-    safeAddress: asString(identity.safe_address) ?? asString(agent.safe_address),
+    ...readStoredAccountAddress(identity, agent),
     chainId: typeof identity.chain_id === "number" ? identity.chain_id : void 0,
     network: asString(identity.network),
     x402BindingSigner: asString(signer.x402_binding_signer),
     agentBudget: Array.isArray(identity.agent_budget) ? identity.agent_budget : void 0
   };
 }
+function readStoredAccountAddress(identity, agent) {
+  const fresh = asString(identity.account_address) ?? asString(agent.account_address);
+  if (fresh) return { accountAddress: fresh, accountAddressKey: "account_address" };
+  const legacy = asString(identity.safe_address) ?? asString(agent.safe_address);
+  if (legacy) return { accountAddress: legacy, accountAddressKey: "safe_address" };
+  return {};
+}
 async function discoverSoleAgentDirectory(baseDir) {
   const root = defaultCredentialRoot(baseDir);
   let entries = [];
@@ -543,9 +550,9 @@ var init_runtime_manifest = __esm({
       mcpPackage: "@haven_ai/mcp",
       mcpVersion: MCP_VERSION,
       sdkPackage: "@haven_ai/sdk",
-      sdkVersion: "0.1.37-alpha.0",
+      sdkVersion: "0.2.0-alpha.0",
       signerPackage: "@haven_ai/signer",
-      signerVersion: "0.1.37-alpha.0",
+      signerVersion: "0.2.0-alpha.0",
       // Sourced from the SDK, never a literal (#1161). This field read '20.0.0'
       // while every package's `engines` said `>=24` and the docs said `>=24.0.0`,
       // so the guard that was supposed to enforce the floor waved Node v23 through
@@ -1433,7 +1440,7 @@ async function buildLocalMcpConsentInput(identityPath, signerPath) {
       apiKey: credentials.apiKey,
       apiUrl: credentials.apiUrl,
       agentId: credentials.agentId,
-      safeAddress: credentials.safeAddress,
+      safeAddress: credentials.accountAddress ?? credentials.safeAddress,
       delegateAddress: credentials.delegateAddress,
       chainId: credentials.chainId,
       allowanceSummary: credentials.allowanceSummary
@@ -2475,7 +2482,7 @@ async function buildSignerConsentInput(signerPath) {
   });
   return {
     delegateAddress: signer.delegateAddress,
-    safeAddress: credentials.safeAddress,
+    safeAddress: credentials.accountAddress ?? credentials.safeAddress,
     agentId: credentials.agentId,
     chainId: credentials.chainId,
     network: credentials.network,
@@ -3313,7 +3320,9 @@ async function finishRekey(options, deps = {}) {
     apiKey: options.newApiKey,
     delegateKey: pending.new_delegate_key,
     delegateAddress: pending.new_delegate_address,
-    safeAddress: stored.safeAddress ?? identity.safe_address ?? void 0,
+    // #2908: the stored value (already new-name-first) wins; the hosted
+    // identity's `account_address` twin before its deprecated `safe_address`.
+    accountAddress: stored.accountAddress ?? identity.account_address ?? identity.safe_address ?? void 0,
     chainId: stored.chainId ?? identity.chain_id ?? void 0,
     network: stored.network,
     agentBudget: stored.agentBudget,
@@ -3499,6 +3508,7 @@ var init_rekey_restart = __esm({
 // src/doctor.ts
 var doctor_exports = {};
 __export(doctor_exports, {
+  describeAccountAddressKey: () => describeAccountAddressKey,
   runDoctor: () => runDoctor,
   runRepair: () => runRepair
 });
@@ -3649,6 +3659,15 @@ async function readIdentity(directory) {
     return void 0;
   }
 }
+function describeAccountAddressKey(identity, signerFile) {
+  const files = [identity, signerFile];
+  const has = (key) => files.some((f) => typeof f?.[key] === "string" && f[key].trim() !== "");
+  if (has("account_address")) return "account address stored as account_address";
+  if (has("safe_address")) {
+    return "account address stored under the pre-#2908 name safe_address \u2014 still read; the next --rekey or setup rewrites it as account_address";
+  }
+  return "no account address stored";
+}
 async function checksForAgent(entry, input, deps) {
   const { directory, identity, sidecar } = entry;
   const checks = [];
@@ -3665,7 +3684,7 @@ async function checksForAgent(entry, input, deps) {
     id: "credentials",
     label: "Agent credentials",
     ok: credentialsOk,
-    detail: credentialsOk ? `identity.json and signer.json parse (agent ${identity?.agent_id ?? "unknown"})` : "identity.json or signer.json is missing or unparseable.",
+    detail: credentialsOk ? `identity.json and signer.json parse (agent ${identity?.agent_id ?? "unknown"}; ${describeAccountAddressKey(identity, signerFile)})` : "identity.json or signer.json is missing or unparseable.",
     ...credentialsOk ? {} : { repair: `Re-run the full setup with a fresh token: ${RERUN} --setup <token>.` }
   });
   if (!sidecar) {
@@ -4396,7 +4415,7 @@ async function pathExists2(path) {
 init_unwire();
 init_local_mcp_runtime();
 init_runtime_manifest();
-var CONNECTOR_VERSION = "0.1.37-alpha.0";
+var CONNECTOR_VERSION = "0.2.0-alpha.0";
 var CONNECT_OUTCOME_SCHEMA_VERSION = 1;
 var failureOutcomesByError = /* @__PURE__ */ new WeakMap();
 function failureOutcomeFor(runtimeHint, error) {
@@ -4572,7 +4591,7 @@ async function executeConnect(options, deps, trace) {
     apiKey: localApiKey,
     delegateKey: localKey.privateKey,
     delegateAddress: localKey.address,
-    safeAddress: setup.haven_wallet.address,
+    accountAddress: setup.haven_wallet.address,
     chainId: setup.haven_wallet.chain_id,
     network: setup.haven_wallet.network,
     agentBudget: setup.agent_budget.map((budget) => ({