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

package/dist/index.js

@@ -600,9 +600,9 @@ async function runConnector(connectorCommand, spawner, onStderr) {
 
 // src/commands.ts
 var DEFAULT_API = "https://havenbackend-production-8a00.up.railway.app";
-var CLI_VERSION = "0.2.0-alpha.0";
+var CLI_VERSION = "0.3.0-alpha.0";
 function accountAddressOf(s) {
-  return s.account_address ?? s.safe_address ?? "";
+  return s.account_address ?? "";
 }
 async function run(argv, deps = {}) {
   const out = deps.out ?? ((l) => process.stdout.write(`${l}
@@ -872,24 +872,32 @@ async function cmdWhoami(args, d) {
   );
   return EXIT.ok;
 }
+function accountsEnvelope(body) {
+  if (!Array.isArray(body.accounts)) {
+    throw new Error(
+      "GET /user/accounts did not return an `accounts` array. This CLI needs a Haven backend from the release that carries #2914 or later; an older server returns the retired `safes` envelope. Upgrade the backend, or pin an older @haven_ai/cli."
+    );
+  }
+  return body.accounts;
+}
 async function cmdWalletsList(args, d) {
   const { api } = await authed(args, d);
-  const { safes } = await api.get("/user/accounts");
+  const accounts = accountsEnvelope(await api.get("/user/accounts"));
   emit(
     d,
     args.flags.json,
-    safes,
-    () => safes.length === 0 ? "No Haven wallets yet." : table(
+    accounts,
+    () => accounts.length === 0 ? "No Haven wallets yet." : table(
       ["NAME", "NETWORK", "ADDRESS", "DEFAULT"],
-      safes.map((s) => [s.name, chainName(s.chain_id), truncateAddress(accountAddressOf(s)), s.is_default ? "\u2713" : ""])
+      accounts.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/accounts");
-  const safe = pickSafe(safes, args.flags.safe);
+  const accounts = accountsEnvelope(await api.get("/user/accounts"));
+  const safe = pickSafe(accounts, 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);
@@ -900,7 +908,7 @@ async function cmdWalletsBalances(args, d) {
   emit(
     d,
     args.flags.json,
-    { account: safe.name, safe: safe.name, chainId: safe.chain_id, balances },
+    { account: safe.name, chainId: safe.chain_id, balances },
     () => [
       `${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]))
@@ -908,15 +916,15 @@ async function cmdWalletsBalances(args, d) {
   );
   return EXIT.ok;
 }
-function pickSafe(safes, ref) {
-  if (!ref) return safes.find((s) => s.is_default) ?? safes[0];
+function pickSafe(accounts, ref) {
+  if (!ref) return accounts.find((s) => s.is_default) ?? accounts[0];
   const lower = ref.toLowerCase();
-  return safes.find((s) => s.id === ref || accountAddressOf(s).toLowerCase() === lower);
+  return accounts.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/accounts");
-  const safe = pickSafe(safes, args.flags.safe);
+  const accounts = accountsEnvelope(await api.get("/user/accounts"));
+  const safe = pickSafe(accounts, 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);
@@ -1059,8 +1067,8 @@ async function cmdBudgetGrant(args, d) {
       EXIT.refused
     );
   }
-  const accountAddress = agent.account_address ?? agent.safe_address;
-  const accountChainId = agent.account_chain_id ?? agent.safe_chain_id;
+  const accountAddress = agent.account_address;
+  const accountChainId = agent.account_chain_id;
   if (!accountAddress || !accountChainId) {
     throw new HavenCliError(`Agent ${id} has no wallet assigned yet \u2014 connect it first.`, EXIT.refused);
   }
@@ -1235,27 +1243,24 @@ async function cmdWalletRename(args, d) {
   if (!id || !name) throw new UsageError("Usage: haven wallets rename <id> <name>");
   const { api } = await authed(args, d);
   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}".`);
+  emit(d, args.flags.json, { ok: true, account_id: id, name }, () => `Wallet ${id} renamed to "${name}".`);
   return EXIT.ok;
 }
-async function resolveSafeId(args, api) {
+async function resolveAccountId(args, api) {
   if (!args.flags.safe) return void 0;
-  const { safes } = await api.get("/user/accounts");
-  const safe = pickSafe(safes, args.flags.safe);
+  const accounts = accountsEnvelope(await api.get("/user/accounts"));
+  const safe = pickSafe(accounts, args.flags.safe);
   if (!safe) throw new UsageError(`No wallet matches "${args.flags.safe}".`);
   return safe.id;
 }
 async function cmdActivityList(args, d) {
   const { api } = await authed(args, d);
-  const safeId = await resolveSafeId(args, api);
+  const accountId = await resolveAccountId(args, api);
   const params = new URLSearchParams({
     offset: String(args.flags.offset ?? 0),
     limit: String(args.flags.limit ?? 25)
   });
-  if (safeId) {
-    params.set("accountId", safeId);
-    params.set("safeId", safeId);
-  }
+  if (accountId) params.set("accountId", accountId);
   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;
@@ -1270,7 +1275,7 @@ async function cmdActivityList(args, d) {
         t.direction === "in" ? "in" : "out",
         `${t.direction === "in" ? "+" : "-"}${t.valueFormatted} ${t.asset}`,
         t.source ?? "transfer",
-        t.safeName ?? ""
+        t.accountName ?? ""
       ])
     )
   );
@@ -1279,15 +1284,12 @@ async function cmdActivityList(args, d) {
 async function cmdActivityExport(args, d) {
   if (args.flags.format === "sie") return exportSie(args, d);
   const { api } = await authed(args, d);
-  const safeId = await resolveSafeId(args, api);
+  const accountId = await resolveAccountId(args, api);
   const params = new URLSearchParams({
     offset: String(args.flags.offset ?? 0),
     limit: String(args.flags.limit ?? 1e3)
   });
-  if (safeId) {
-    params.set("accountId", safeId);
-    params.set("safeId", safeId);
-  }
+  if (accountId) params.set("accountId", accountId);
   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;
@@ -1300,7 +1302,6 @@ async function cmdActivityExport(args, d) {
     "token_symbol",
     "token_address",
     "counterparty_address",
-    "safe_address",
     "agent_name",
     "tx_hash",
     "chain_id",
@@ -1315,11 +1316,10 @@ async function cmdActivityExport(args, d) {
     t.tokenSymbol ?? t.asset ?? "",
     t.tokenAddress ?? "",
     (t.direction === "in" ? t.from : t.to) ?? "",
-    t.accountAddress ?? t.safeAddress ?? "",
     t.agentName ?? "",
     t.hash,
     t.chainId != null ? String(t.chainId) : "",
-    t.accountAddress ?? t.safeAddress ?? ""
+    t.accountAddress ?? ""
   ]);
   d.o.text(toCsv(headers, rows), { format: "csv", rows: rows.length });
   return EXIT.ok;
@@ -1360,11 +1360,11 @@ async function cmdCatalogList(args, d) {
   return EXIT.ok;
 }
 async function resolveWalletAndToken(args, api, symbol) {
-  const { safes } = await api.get("/user/accounts");
-  if (safes.length === 0) {
+  const accounts = accountsEnvelope(await api.get("/user/accounts"));
+  if (accounts.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 || accountAddressOf(s) === args.flags.safe) : safes.find((s) => s.is_default) ?? safes[0];
+  const safe = args.flags.safe ? accounts.find((s) => s.id === args.flags.safe || accountAddressOf(s) === args.flags.safe) : accounts.find((s) => s.is_default) ?? accounts[0];
   if (!safe) throw new UsageError(`No wallet matches --safe ${args.flags.safe}`);
   const { balances } = await api.get(
     `/balances/${accountAddressOf(safe)}?chain_id=${safe.chain_id}`
@@ -1375,7 +1375,7 @@ async function resolveWalletAndToken(args, api, symbol) {
     const known = balances.map((b) => b.symbol).join(", ");
     throw new UsageError(`Unknown token ${symbol} on this wallet's chain. Available: ${known || "none"}`);
   }
-  return { safeId: safe.id, token };
+  return { accountId: safe.id, token };
 }
 var SETTLED = /* @__PURE__ */ new Set(["active", "expired", "cancelled", "failed"]);
 async function pollSetup(api, setupId, d, wait) {
@@ -1409,16 +1409,12 @@ async function cmdAgentsConnect(args, d) {
   if (!args.flags.budget || !args.flags.token || args.flags.period === void 0) {
     throw new UsageError("--budget, --token and --period are required (period is whole minutes; 0 means one-time)");
   }
-  const { safeId, token } = await resolveWalletAndToken(args, api, args.flags.token);
+  const { accountId, token } = await resolveWalletAndToken(args, api, args.flags.token);
   const amount = parseTokenAmount(args.flags.budget, token.decimals, token.symbol);
   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,
+    account_id: accountId,
     allowances: [
       {
         token_address: token.address ?? "0x0000000000000000000000000000000000000000",