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

package/dist/index.js

@@ -600,7 +600,10 @@ async function runConnector(connectorCommand, spawner, onStderr) {
 
 // src/commands.ts
 var DEFAULT_API = "https://havenbackend-production-8a00.up.railway.app";
-var CLI_VERSION = "0.1.37-alpha.0";
+var CLI_VERSION = "0.2.0-alpha.0";
+function accountAddressOf(s) {
+  return s.account_address ?? s.safe_address ?? "";
+}
 async function run(argv, deps = {}) {
   const out = deps.out ?? ((l) => process.stdout.write(`${l}
 `));
@@ -871,35 +874,35 @@ async function cmdWhoami(args, d) {
 }
 async function cmdWalletsList(args, d) {
   const { api } = await authed(args, d);
-  const { safes } = await api.get("/user/safes");
+  const { safes } = await api.get("/user/accounts");
   emit(
     d,
     args.flags.json,
     safes,
     () => safes.length === 0 ? "No Haven wallets yet." : table(
       ["NAME", "NETWORK", "ADDRESS", "DEFAULT"],
-      safes.map((s) => [s.name, chainName(s.chain_id), truncateAddress(s.safe_address), s.is_default ? "\u2713" : ""])
+      safes.map((s) => [s.name, chainName(s.chain_id), truncateAddress(accountAddressOf(s)), s.is_default ? "\u2713" : ""])
     )
   );
   return EXIT.ok;
 }
 async function cmdWalletsBalances(args, d) {
   const { api } = await authed(args, d);
-  const { safes } = await api.get("/user/safes");
+  const { safes } = await api.get("/user/accounts");
   const safe = pickSafe(safes, args.flags.safe);
   if (!safe) {
     if (args.flags.safe) throw new UsageError(`No wallet matches "${args.flags.safe}".`);
     throw new CliApiError("No Haven wallet found.", 404);
   }
   const { balances } = await api.get(
-    `/balances/${safe.safe_address}?chain_id=${safe.chain_id}`
+    `/balances/${accountAddressOf(safe)}?chain_id=${safe.chain_id}`
   );
   emit(
     d,
     args.flags.json,
-    { safe: safe.name, chainId: safe.chain_id, balances },
+    { account: safe.name, safe: safe.name, chainId: safe.chain_id, balances },
     () => [
-      `${safe.name} \xB7 ${chainName(safe.chain_id)} \xB7 ${truncateAddress(safe.safe_address)}`,
+      `${safe.name} \xB7 ${chainName(safe.chain_id)} \xB7 ${truncateAddress(accountAddressOf(safe))}`,
       balances.length === 0 ? "  (no balances)" : table(["TOKEN", "BALANCE"], balances.map((b) => [b.symbol, b.formatted]))
     ].join("\n")
   );
@@ -908,17 +911,17 @@ async function cmdWalletsBalances(args, d) {
 function pickSafe(safes, ref) {
   if (!ref) return safes.find((s) => s.is_default) ?? safes[0];
   const lower = ref.toLowerCase();
-  return safes.find((s) => s.id === ref || s.safe_address.toLowerCase() === lower);
+  return safes.find((s) => s.id === ref || accountAddressOf(s).toLowerCase() === lower);
 }
 async function cmdWalletsFunding(args, d) {
   const { api } = await authed(args, d);
-  const { safes } = await api.get("/user/safes");
+  const { safes } = await api.get("/user/accounts");
   const safe = pickSafe(safes, args.flags.safe);
   if (!safe) {
     if (args.flags.safe) throw new UsageError(`No wallet matches "${args.flags.safe}".`);
     throw new CliApiError("No Haven wallet found.", 404);
   }
-  const funding = await api.get(`/user/safes/${safe.id}/funding`);
+  const funding = await api.get(`/user/accounts/${safe.id}/funding`);
   if (!args.flags.wait) {
     emitFunding(d, funding);
     return EXIT.ok;
@@ -939,7 +942,7 @@ async function cmdWalletsFunding(args, d) {
       );
     }
     await d.sleep(pollMs);
-    current = await api.get(`/user/safes/${safe.id}/funding`);
+    current = await api.get(`/user/accounts/${safe.id}/funding`);
     if (current.funded) break;
     d.o.note(`Still waiting after ${elapsedLabel(Date.now() - started)} \u2014 funded: no.`);
   }
@@ -1056,11 +1059,13 @@ async function cmdBudgetGrant(args, d) {
       EXIT.refused
     );
   }
-  if (!agent.safe_address || !agent.safe_chain_id) {
+  const accountAddress = agent.account_address ?? agent.safe_address;
+  const accountChainId = agent.account_chain_id ?? agent.safe_chain_id;
+  if (!accountAddress || !accountChainId) {
     throw new HavenCliError(`Agent ${id} has no wallet assigned yet \u2014 connect it first.`, EXIT.refused);
   }
   const { balances } = await api.get(
-    `/balances/${agent.safe_address}?chain_id=${agent.safe_chain_id}`
+    `/balances/${accountAddress}?chain_id=${accountChainId}`
   );
   const wanted = args.flags.token.trim().toUpperCase();
   const token = balances.find((b) => b.symbol.toUpperCase() === wanted);
@@ -1229,13 +1234,13 @@ async function cmdWalletRename(args, d) {
   const name = nameParts.join(" ").trim();
   if (!id || !name) throw new UsageError("Usage: haven wallets rename <id> <name>");
   const { api } = await authed(args, d);
-  await api.put(`/user/safes/${id}`, { name });
-  emit(d, args.flags.json, { ok: true, safe_id: id, name }, () => `Wallet ${id} renamed to "${name}".`);
+  await api.put(`/user/accounts/${id}`, { name });
+  emit(d, args.flags.json, { ok: true, account_id: id, safe_id: id, name }, () => `Wallet ${id} renamed to "${name}".`);
   return EXIT.ok;
 }
 async function resolveSafeId(args, api) {
   if (!args.flags.safe) return void 0;
-  const { safes } = await api.get("/user/safes");
+  const { safes } = await api.get("/user/accounts");
   const safe = pickSafe(safes, args.flags.safe);
   if (!safe) throw new UsageError(`No wallet matches "${args.flags.safe}".`);
   return safe.id;
@@ -1247,7 +1252,10 @@ async function cmdActivityList(args, d) {
     offset: String(args.flags.offset ?? 0),
     limit: String(args.flags.limit ?? 25)
   });
-  if (safeId) params.set("safeId", safeId);
+  if (safeId) {
+    params.set("accountId", safeId);
+    params.set("safeId", safeId);
+  }
   if (args.flags.agent) params.set("agentId", args.flags.agent);
   const { transactions } = await api.get(`/transactions?${params.toString()}`);
   const visible = args.flags.direction ? transactions.filter((t) => t.direction === args.flags.direction) : transactions;
@@ -1276,7 +1284,10 @@ async function cmdActivityExport(args, d) {
     offset: String(args.flags.offset ?? 0),
     limit: String(args.flags.limit ?? 1e3)
   });
-  if (safeId) params.set("safeId", safeId);
+  if (safeId) {
+    params.set("accountId", safeId);
+    params.set("safeId", safeId);
+  }
   if (args.flags.agent) params.set("agentId", args.flags.agent);
   const { transactions } = await api.get(`/transactions?${params.toString()}`);
   const visible = args.flags.direction ? transactions.filter((t) => t.direction === args.flags.direction) : transactions;
@@ -1292,7 +1303,8 @@ async function cmdActivityExport(args, d) {
     "safe_address",
     "agent_name",
     "tx_hash",
-    "chain_id"
+    "chain_id",
+    "account_address"
   ];
   const rows = visible.map((t) => [
     new Date(t.timestamp * 1e3).toISOString(),
@@ -1303,10 +1315,11 @@ async function cmdActivityExport(args, d) {
     t.tokenSymbol ?? t.asset ?? "",
     t.tokenAddress ?? "",
     (t.direction === "in" ? t.from : t.to) ?? "",
-    t.safeAddress ?? "",
+    t.accountAddress ?? t.safeAddress ?? "",
     t.agentName ?? "",
     t.hash,
-    t.chainId != null ? String(t.chainId) : ""
+    t.chainId != null ? String(t.chainId) : "",
+    t.accountAddress ?? t.safeAddress ?? ""
   ]);
   d.o.text(toCsv(headers, rows), { format: "csv", rows: rows.length });
   return EXIT.ok;
@@ -1347,14 +1360,14 @@ async function cmdCatalogList(args, d) {
   return EXIT.ok;
 }
 async function resolveWalletAndToken(args, api, symbol) {
-  const { safes } = await api.get("/user/safes");
+  const { safes } = await api.get("/user/accounts");
   if (safes.length === 0) {
     throw new HavenCliError("No wallet on this account yet \u2014 finish onboarding first.", EXIT.refused);
   }
-  const safe = args.flags.safe ? safes.find((s) => s.id === args.flags.safe || s.safe_address === args.flags.safe) : safes.find((s) => s.is_default) ?? safes[0];
+  const safe = args.flags.safe ? safes.find((s) => s.id === args.flags.safe || accountAddressOf(s) === args.flags.safe) : safes.find((s) => s.is_default) ?? safes[0];
   if (!safe) throw new UsageError(`No wallet matches --safe ${args.flags.safe}`);
   const { balances } = await api.get(
-    `/balances/${safe.safe_address}?chain_id=${safe.chain_id}`
+    `/balances/${accountAddressOf(safe)}?chain_id=${safe.chain_id}`
   );
   const wanted = symbol.trim().toUpperCase();
   const token = balances.find((b) => b.symbol.toUpperCase() === wanted);
@@ -1401,6 +1414,10 @@ async function cmdAgentsConnect(args, d) {
   if (!amount.ok) throw new UsageError(amount.message);
   const setup = await api.post("/agent-connection-setups", {
     name,
+    // #2908: both id keys for the window — `account_id` is the #2907 twin
+    // (landing in P0's second round), `safe_id` is what a server without it
+    // reads; the request works against either.
+    account_id: safeId,
     safe_id: safeId,
     allowances: [
       {