@haven_ai/cli 0.0.0-dev.202609042048.ad6cc9b → 0.0.0-dev.202609050705.51c3d92

package/dist/index.cjs

@@ -71,7 +71,10 @@ function helpText() {
     "Auth:",
     "  login [--email <e>]     Sign in (password via prompt or HAVEN_PASSWORD)",
     "  logout                  Clear the saved session",
-    "  whoami                  Show the signed-in user",
+    "  whoami                  Show the signed-in user, session expiry and API URL",
+    "",
+    "For agents:",
+    "  guide                   Print the agent onboarding runbook (same text as /for-agents.md)",
     "",
     "Read:",
     "  wallets list            List your Haven wallets",
@@ -95,11 +98,14 @@ function helpText() {
     "  contacts add <name> <address> | contacts remove <id>",
     "",
     "Options:",
-    "  --json                  Machine-readable output (for scripting)",
+    "  --json                  One JSON value on stdout, prose on stderr, on every",
+    "                          command including refusals: { ok: false, error: { code, message, hint? } }",
     "  --yes, -y               Skip the confirmation prompt for destructive actions",
     "  --api <url>             Backend URL (default: HAVEN_API_URL or http://localhost:3001)",
     "  --help, --version",
     "",
+    "Exit codes: 0 ok \xB7 1 failed \xB7 2 usage \xB7 3 not authenticated \xB7 4 refused \xB7 5 network",
+    "",
     "On-chain actions (deploy, budgets, approvers, send) are signed in the",
     "dashboard \u2014 this CLI reads and manages; it never holds your keys."
   ].join("\n");
@@ -242,53 +248,157 @@ function toCsv(headers, rows) {
   return lines.join("\r\n");
 }
 
+// src/errors.ts
+var EXIT = {
+  ok: 0,
+  /** Something failed and none of the specific codes below describe it. */
+  failed: 1,
+  /** The command line was wrong: unknown command, missing argument, bad flag. */
+  usage: 2,
+  /** No stored session, or the backend rejected the one we have. Log in again. */
+  notAuthenticated: 3,
+  /** Authenticated, and the backend refused anyway (403, 410, other 4xx). */
+  refused: 4,
+  /** The backend could not be reached at all. */
+  network: 5
+};
+var UsageError = class extends Error {
+  hint;
+  constructor(message, hint) {
+    super(message);
+    this.name = "UsageError";
+    this.hint = hint;
+  }
+};
+function toFailure(err) {
+  if (err instanceof UsageError) {
+    return { code: "usage", exit: EXIT.usage, message: err.message, hint: err.hint };
+  }
+  if (err instanceof CliApiError) {
+    if (err.status === 0) {
+      return {
+        code: "network",
+        exit: EXIT.network,
+        message: err.message,
+        hint: "Check the network and `--api`, then retry."
+      };
+    }
+    if (err.status === 401) {
+      return {
+        code: "not_authenticated",
+        exit: EXIT.notAuthenticated,
+        message: err.message,
+        hint: "Run `haven login` (or set HAVEN_EMAIL and HAVEN_PASSWORD)."
+      };
+    }
+    if (err.status >= 400 && err.status < 500) {
+      return { code: "refused", exit: EXIT.refused, message: err.message };
+    }
+    return { code: "failed", exit: EXIT.failed, message: err.message };
+  }
+  return { code: "failed", exit: EXIT.failed, message: err instanceof Error ? err.message : String(err) };
+}
+
+// src/output.ts
+function createOutput(json, out, err) {
+  return {
+    json,
+    data(payload, human) {
+      out(json ? JSON.stringify(payload, null, 2) : human());
+    },
+    text(content, meta) {
+      out(json ? JSON.stringify({ ok: true, ...meta, content }, null, 2) : content);
+    },
+    note(line) {
+      if (json) err(line);
+      else out(line);
+    },
+    failure(failure) {
+      const body = {
+        ok: false,
+        error: {
+          code: failure.code,
+          message: failure.message,
+          ...failure.hint ? { hint: failure.hint } : {}
+        }
+      };
+      if (json) out(JSON.stringify(body, null, 2));
+      else err(failure.hint ? `${failure.message}
+${failure.hint}` : failure.message);
+    }
+  };
+}
+
+// src/agent-guidance-text.ts
+var HAVEN_AGENT_RUNBOOK_MD = "# Haven for agents \u2014 set your user up to let you pay\n\nYou are an AI agent whose user has no Haven account yet, or has one but has not connected you.\n\n> Links below are paths on this same host: resolve them against the URL you fetched this file from.\n\n## What Haven is, in three sentences\n\nYour user gives you a **budget on their own account** \u2014 not their wallet, and not a key to their funds. The budget is a delegation they sign, enforced on-chain: a payment over it, to the wrong recipient, or past its expiry is refused at execution time, not by a dashboard promise. Haven constructs and relays the payments; you get an agent credential and a signing key made on your machine, and your user can revoke the budget without you and without Haven.\n\n## The sequence\n\nFour of the six steps are your user's \u2014 each needs a human signature or a human decision. The rest is yours. If they already have a funded account, start at step 3.\n\n1. **HUMAN \u2014 create the account.** Name, email, password, then a passkey (Face ID / Touch ID) or a wallet. Never offer to enter any of it: you must not have their password, and the passkey is bound to their device.\n2. **HUMAN \u2014 fund it.** USDC on Base, to the address the dashboard shows.\n3. **HUMAN \u2014 create the agent, set its budget**, and paste you the **setup prompt** it hands back.\n4. **YOU \u2014 run the connector command** in that prompt (below). It makes your signing key locally, registering only the public address.\n5. **HUMAN \u2014 approve the budget** with their passkey, in the Haven tab they created the agent in: it advances to the approval step by itself once your run registers.\n6. **YOU \u2014 verify, then pay.**\n\n## Hand-off scripts\n\nSend these as your own message, `<host>` replaced by the host you fetched this file from. Say what you cannot do, not only what they must.\n\n**Before signup** (step 1):\n\n> I can do everything except the parts that need your signature. Please open `<host>/signup?next=/agents&via=agent` \u2014 name, email, password, then a passkey (Face ID / Touch ID) or a wallet. That is your account's key: I should not have it, and I will never ask for your password. Already have one? `<host>/login?next=/agents`.\n\n**At the passkey step:**\n\n> The passkey must be made on your own device \u2014 it is what keeps the account yours, so nobody, Haven included, can move your funds without you. If this browser cannot, open `<host>/onboarding?next=/agents` on your phone and finish there.\n\n**At funding** (step 2):\n\n> Your Haven account needs USDC on Base before I can pay for anything \u2014 USDC only, no ETH: Haven sponsors the gas. The dashboard shows the address to send it to; a small amount first is fine.\n\n**At the budget** (step 3):\n\n> On `<host>/agents`, create an agent for me and set a budget \u2014 say 25 USDC per day. That is the limit I cannot exceed. It hands back a setup prompt: paste it to me and I run it here.\n\n**At budget approval** (step 5) \u2014 the moment your run reports that approval is required, before anything else. Send the first if your run carried `approval.url`, the second if it did not.\n\n> Setup is done on my side. Approve the budget here: <approval.url>. Approve it with your passkey; nothing can be spent until you do.\n\n> Setup is done on my side. Go back to the Haven tab where you created the agent \u2014 it should now be asking you to approve the budget. Approve it with your passkey; nothing can be spent until you do.\n\n## What you run\n\nThe setup prompt carries a **connector command** shaped like this:\n\n```\nnpx -y @haven_ai/connect@<channel> --setup EXAMPLE-SETUP-TOKEN-NOT-REAL --api <api-url> --ack-local-tools\n```\n\nRun the prompt's version, not this one: the token is one-time, the API URL is the backend's own, and `<channel>` is the npm tag your prompt names \u2014 never a tag you pick. The rules below come from that prompt, so \"me\" in them is your user, not Haven.\n\n- If you are an AI agent running this command yourself rather than a human pasting it, you should append --json: the connector then emits one machine-readable, secret-free result object on stdout with progress on stderr, and returns promptly instead of blocking while it waits for the budget approval.\n- When a --json outcome reports approval.required: true, your first action must be to relay the approval instruction to me in your own reply \u2014 if the outcome carries approval.url, give me that link; otherwise tell me to return to Haven and approve this agent's budget \u2014 before verifying the connection, restarting anything, or any other step. Never build that link yourself: relay the one the outcome gave you or none at all. Any restart the outcome asks for is a separate instruction to give me afterwards, once the approval is done.\n- If you ran the command without --json, the connector waits for the approval itself and prints its next steps when it finishes: relay the budget-approval instruction to me \u2014 the approval link if those steps printed one, otherwise that you need to return to Haven and approve this agent's budget \u2014 only if those printed next steps still ask for it. If they report the budget as already approved, there is nothing for me to approve.\n- Only two changes to the command above are permitted, and no others: appending --json, and \u2014 only if the connector refuses because it could not determine the agent runtime \u2014 re-running it once with --runtime <name> added, naming the harness you are running in, using one of the values that refusal lists. Never invent a runtime name and never change anything else.\n- Do not print private keys, API keys, credential file contents, or config secrets in chat or logs.\n\nIf the approval wait times out, nothing is lost \u2014 your agent is registered and the budget is still waiting to be approved. Send your user the `approval.url` your run reported, or, if it carried none, ask them to finish it in that same Haven tab. The outcome carries no setup id, so never assemble an approval link out of parts \u2014 relay the whole one it gave you or none at all.\n\n## How to verify\n\nCall `haven_get_agent`, one of the Haven MCP tools the connector wires into your runtime in step 4. It returns identity plus `spend_authority_readiness`:\n\n- `ready` \u2014 a budget is live; you can pay.\n- `needs_approval` \u2014 the connector finished, nobody approved yet. Ask your user again, in their Haven tab; there is no queue to wait in.\n- `revoked` \u2014 the credential is not active; ask your user to create a new agent.\n\n`ready` covers hosted identity and the budget only, not your local signer. Check that with `npx -y @haven_ai/connect@<channel> --doctor`, the same tag your prompt named \u2014 a separate command, so the two-changes rule does not bind it.\n\n## If you cannot open a browser\n\nNothing here needs you to. Steps 1-3 are links: hand your user the full `<host>/\u2026` URL and ask them to say when it is done. Step 5 is a link only when your run reported one in `approval.url` \u2014 otherwise it is the tab they already have open, as above. Then poll `haven_get_agent` until it reads `ready`. Do not route around the sign-in wall \u2014 it makes the account theirs, not yours.\n\n## Vocabulary\n\n| Term | What it is |\n|---|---|\n| **setup prompt** | The text the dashboard hands your user to paste to you. Carries the command and its rules. |\n| **connector command** | The `npx -y @haven_ai/connect@\u2026` line you run. One-time token, one use. |\n| **agent credential** | Your API key (`sk_agent_\u2026`), written to `~/.haven`. It identifies you; alone it cannot move money. |\n| **delegate key** | Your signing key, made on this machine and never sent anywhere. |\n| **budget** | The on-chain delegation your user signed. It authorises the payment; Haven constructs and relays it. |\n\nNext: [your agent hit a 402](/402.md) \xB7 [everything agent-readable](/llms.txt)\n";
+
+// src/token.ts
+function sessionExpiry(token) {
+  const segment = token.split(".")[1];
+  if (!segment) return null;
+  try {
+    const json = Buffer.from(segment.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8");
+    const claims = JSON.parse(json);
+    if (typeof claims.exp !== "number" || !Number.isFinite(claims.exp)) return null;
+    return new Date(claims.exp * 1e3).toISOString();
+  } catch {
+    return null;
+  }
+}
+
 // src/commands.ts
 var DEFAULT_API = "https://havenbackend-production-8a00.up.railway.app";
-var CLI_VERSION = "0.0.0-dev.202609042048.ad6cc9b";
+var CLI_VERSION = "0.0.0-dev.202609050705.51c3d92";
 async function run(argv, deps = {}) {
+  const out = deps.out ?? ((l) => process.stdout.write(`${l}
+`));
+  const err = deps.err ?? ((l) => process.stderr.write(`${l}
+`));
+  const json = argv.includes("--json");
+  const o = createOutput(json, out, err);
   const d = {
     sessionStore: deps.sessionStore ?? createSessionStore(),
     makeApi: deps.makeApi ?? ((baseUrl, token) => createCliApi({ baseUrl, token })),
     promptPassword: deps.promptPassword ?? (() => Promise.reject(new Error("No password input available"))),
-    out: deps.out ?? ((l) => process.stdout.write(`${l}
-`)),
-    err: deps.err ?? ((l) => process.stderr.write(`${l}
-`)),
-    env: deps.env ?? process.env
+    out,
+    err,
+    env: deps.env ?? process.env,
+    o
   };
   let args;
   try {
     args = parseArgs(argv);
   } catch (e) {
-    d.err(e instanceof Error ? e.message : String(e));
-    return 1;
+    return fail(d, new UsageError(e instanceof Error ? e.message : String(e), "Run `haven --help`."));
   }
   if (args.flags.version) {
-    d.out(CLI_VERSION);
-    return 0;
+    o.data({ version: CLI_VERSION }, () => CLI_VERSION);
+    return EXIT.ok;
   }
   if (args.flags.help || !args.command) {
-    d.out(helpText());
-    return 0;
+    o.data({ help: helpText() }, () => helpText());
+    return EXIT.ok;
   }
   try {
     return await dispatch(args, d);
   } catch (e) {
-    if (e instanceof CliApiError) {
-      d.err(e.message);
-      return e.status === 401 ? 2 : 1;
-    }
-    d.err(e instanceof Error ? e.message : String(e));
-    return 1;
+    return fail(d, e);
   }
 }
+function fail(d, err) {
+  const failure = toFailure(err);
+  d.o.failure(failure);
+  return failure.exit;
+}
 async function dispatch(args, d) {
   const key = args.sub ? `${args.command} ${args.sub}` : args.command;
   switch (key) {
+    case "guide":
+      return cmdGuide(args, d);
     case "login":
       return cmdLogin(args, d);
     case "logout":
-      return cmdLogout(d);
+      return cmdLogout(args, d);
     case "whoami":
       return cmdWhoami(args, d);
     case "wallets list":
@@ -326,8 +436,7 @@ async function dispatch(args, d) {
     case "contacts remove":
       return cmdContactsRemove(args, d);
     default:
-      d.err(`Unknown command: ${key}. Run \`haven --help\`.`);
-      return 1;
+      throw new UsageError(`Unknown command: ${key}.`, "Run `haven --help` for the command list.");
   }
 }
 function baseUrlFor(args, d, session) {
@@ -335,40 +444,52 @@ function baseUrlFor(args, d, session) {
 }
 async function authed(args, d) {
   const session = await d.sessionStore.load();
-  if (!session) throw new CliApiError("Not authenticated. Run `haven login` first.", 401);
+  if (!session) throw new CliApiError("Not authenticated.", 401);
   return { session, api: d.makeApi(baseUrlFor(args, d, session), session.token) };
 }
-function emit(d, json, data, human) {
-  d.out(json ? JSON.stringify(data, null, 2) : human());
+function emit(d, _json, data, human) {
+  d.o.data(data, human);
+}
+async function cmdGuide(_args, d) {
+  d.o.data({ ok: true, format: "markdown", content: HAVEN_AGENT_RUNBOOK_MD }, () => HAVEN_AGENT_RUNBOOK_MD);
+  return EXIT.ok;
 }
 async function cmdLogin(args, d) {
   const email = args.flags.email ?? d.env.HAVEN_EMAIL;
   if (!email) {
-    d.err("Provide an email with --email (or HAVEN_EMAIL).");
-    return 1;
+    throw new UsageError("An email is required.", "Pass --email <address>, or set HAVEN_EMAIL.");
   }
   const password = d.env.HAVEN_PASSWORD ?? await d.promptPassword();
   if (!password) {
-    d.err("A password is required.");
-    return 1;
+    throw new UsageError("A password is required.", "Set HAVEN_PASSWORD for a non-interactive run.");
   }
   const baseUrl = baseUrlFor(args, d, null);
   const api = d.makeApi(baseUrl);
   const res = await api.post("/auth/login", { email, password });
   await d.sessionStore.save({ token: res.token, apiBaseUrl: baseUrl, user: res.user });
-  emit(d, args.flags.json, { user: res.user, apiBaseUrl: baseUrl }, () => `Signed in as ${res.user.email}.`);
-  return 0;
+  emit(
+    d,
+    args.flags.json,
+    { ok: true, email: res.user.email, expires_at: sessionExpiry(res.token), user: res.user, apiBaseUrl: baseUrl },
+    () => `Signed in as ${res.user.email}.`
+  );
+  return EXIT.ok;
 }
-async function cmdLogout(d) {
+async function cmdLogout(args, d) {
   await d.sessionStore.clear();
-  d.out("Signed out.");
-  return 0;
+  emit(d, args.flags.json, { ok: true, signed_out: true }, () => "Signed out.");
+  return EXIT.ok;
 }
 async function cmdWhoami(args, d) {
-  const { api } = await authed(args, d);
+  const { session, api } = await authed(args, d);
   const user = await api.get("/auth/me");
-  emit(d, args.flags.json, user, () => `${user.email}${user.name ? ` (${user.name})` : ""}`);
-  return 0;
+  emit(
+    d,
+    args.flags.json,
+    { ...user, id: user.id, email: user.email, expires_at: sessionExpiry(session.token), api_url: session.apiBaseUrl },
+    () => `${user.email}${user.name ? ` (${user.name})` : ""}`
+  );
+  return EXIT.ok;
 }
 async function cmdWalletsList(args, d) {
   const { api } = await authed(args, d);
@@ -382,15 +503,15 @@ async function cmdWalletsList(args, d) {
       safes.map((s) => [s.name, chainName(s.chain_id), truncateAddress(s.safe_address), s.is_default ? "\u2713" : ""])
     )
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdWalletsBalances(args, d) {
   const { api } = await authed(args, d);
   const { safes } = await api.get("/user/safes");
   const safe = pickSafe(safes, args.flags.safe);
   if (!safe) {
-    d.err(args.flags.safe ? `No wallet matches "${args.flags.safe}".` : "No Haven wallet found.");
-    return 1;
+    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}`
@@ -404,7 +525,7 @@ async function cmdWalletsBalances(args, d) {
       balances.length === 0 ? "  (no balances)" : table(["TOKEN", "BALANCE"], balances.map((b) => [b.symbol, b.formatted]))
     ].join("\n")
   );
-  return 0;
+  return EXIT.ok;
 }
 function pickSafe(safes, ref) {
   if (!ref) return safes.find((s) => s.is_default) ?? safes[0];
@@ -423,14 +544,11 @@ async function cmdAgentsList(args, d) {
       agents.map((a) => [a.id, a.name, a.status, budgetSummary(a.allowances)])
     )
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdAgentsShow(args, d) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err("Usage: haven agents show <id>");
-    return 1;
-  }
+  if (!id) throw new UsageError("Usage: haven agents show <id>");
   const { api } = await authed(args, d);
   const agent = await api.get(`/agents/${id}`);
   emit(
@@ -443,14 +561,11 @@ async function cmdAgentsShow(args, d) {
       `budget: ${budgetSummary(agent.allowances)}`
     ].join("\n")
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdBudgetShow(args, d) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err("Usage: haven budget show <agentId>");
-    return 1;
-  }
+  if (!id) throw new UsageError("Usage: haven budget show <agentId>");
   const { api } = await authed(args, d);
   const agent = await api.get(`/agents/${id}`);
   const allowances = agent.allowances ?? [];
@@ -463,7 +578,7 @@ async function cmdBudgetShow(args, d) {
       allowances.map((a) => [a.token_symbol, a.allowance_amount, resetLabel(a.reset_period_min)])
     )
   );
-  return 0;
+  return EXIT.ok;
 }
 function budgetSummary(allowances) {
   if (!allowances || allowances.length === 0) return "\u2014";
@@ -478,75 +593,64 @@ function resetLabel(mins) {
 }
 async function cmdAgentLifecycle(args, d, action) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err(`Usage: haven agents ${action} <id>`);
-    return 1;
-  }
+  if (!id) throw new UsageError(`Usage: haven agents ${action} <id>`);
   const { api } = await authed(args, d);
   await api.post(`/agents/${id}/${action}`);
-  d.out(`Agent ${id} ${action === "pause" ? "paused" : "resumed"}.`);
-  return 0;
+  const status = action === "pause" ? "paused" : "resumed";
+  emit(d, args.flags.json, { ok: true, agent_id: id, status }, () => `Agent ${id} ${status}.`);
+  return EXIT.ok;
 }
 async function cmdAgentRevoke(args, d) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err("Usage: haven agents revoke <id> --yes");
-    return 1;
-  }
+  if (!id) throw new UsageError("Usage: haven agents revoke <id> --yes");
   if (!args.flags.yes) {
-    d.err(`This permanently revokes agent ${id}. Re-run with --yes to confirm.`);
-    return 1;
+    throw new UsageError(
+      `This permanently revokes agent ${id}.`,
+      "Re-run with --yes to confirm. Revoke is terminal \u2014 the agent cannot go back to active."
+    );
   }
   const { api } = await authed(args, d);
   await api.post(`/agents/${id}/revoke`);
-  d.out(`Agent ${id} revoked. To also remove its on-chain allowance, use the dashboard.`);
-  return 0;
+  emit(
+    d,
+    args.flags.json,
+    { ok: true, agent_id: id, status: "revoked" },
+    () => `Agent ${id} revoked. To also remove its on-chain allowance, use the dashboard.`
+  );
+  return EXIT.ok;
 }
 async function cmdAgentRotateKey(args, d) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err("Usage: haven agents rotate-key <id>");
-    return 1;
-  }
+  if (!id) throw new UsageError("Usage: haven agents rotate-key <id>");
   const { api } = await authed(args, d);
   const res = await api.post(`/agents/${id}/rotate-key`);
-  if (args.flags.json) {
-    d.out(JSON.stringify(res, null, 2));
-  } else {
-    d.out("New API key (shown once \u2014 store it now; the old key stops working):");
-    d.out(res.api_key);
-  }
-  return 0;
+  d.o.note("New API key (shown once \u2014 store it now; the old key stops working):");
+  emit(d, args.flags.json, res, () => res.api_key);
+  return EXIT.ok;
 }
 async function cmdAgentRename(args, d) {
   const [id, ...nameParts] = args.positionals;
   const name = nameParts.join(" ").trim();
-  if (!id || !name) {
-    d.err("Usage: haven agents rename <id> <name>");
-    return 1;
-  }
+  if (!id || !name) throw new UsageError("Usage: haven agents rename <id> <name>");
   const { api } = await authed(args, d);
   await api.put(`/agents/${id}`, { name });
-  d.out(`Agent ${id} renamed to "${name}".`);
-  return 0;
+  emit(d, args.flags.json, { ok: true, agent_id: id, name }, () => `Agent ${id} renamed to "${name}".`);
+  return EXIT.ok;
 }
 async function cmdWalletRename(args, d) {
   const [id, ...nameParts] = args.positionals;
   const name = nameParts.join(" ").trim();
-  if (!id || !name) {
-    d.err("Usage: haven wallets rename <id> <name>");
-    return 1;
-  }
+  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 });
-  d.out(`Wallet ${id} renamed to "${name}".`);
-  return 0;
+  emit(d, args.flags.json, { ok: true, 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 safe = pickSafe(safes, args.flags.safe);
-  if (!safe) throw new CliApiError(`No wallet matches "${args.flags.safe}".`, 1);
+  if (!safe) throw new UsageError(`No wallet matches "${args.flags.safe}".`);
   return safe.id;
 }
 async function cmdActivityList(args, d) {
@@ -575,7 +679,7 @@ async function cmdActivityList(args, d) {
       ])
     )
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdActivityExport(args, d) {
   if (args.flags.format === "sie") return exportSie(args, d);
@@ -617,8 +721,8 @@ async function cmdActivityExport(args, d) {
     t.hash,
     t.chainId != null ? String(t.chainId) : ""
   ]);
-  d.out(toCsv(headers, rows));
-  return 0;
+  d.o.text(toCsv(headers, rows), { format: "csv", rows: rows.length });
+  return EXIT.ok;
 }
 function exportType(t) {
   if (t.activityType === "delegate_sweep") return "allowance funding";
@@ -638,8 +742,8 @@ async function exportSie(args, d) {
   if (args.flags.to) params.set("to", args.flags.to);
   if (args.flags.company) params.set("company", args.flags.company);
   const content = await api.getText(`/accounting/export?${params.toString()}`);
-  d.out(content);
-  return 0;
+  d.o.text(content, { format: "sie" });
+  return EXIT.ok;
 }
 async function cmdCatalogList(args, d) {
   const { api } = await authed(args, d);
@@ -653,7 +757,7 @@ async function cmdCatalogList(args, d) {
       entries.map((e) => [e.name, e.category, e.rail, e.price_display ?? "\u2014", e.status])
     )
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdContactsList(args, d) {
   const { api } = await authed(args, d);
@@ -664,30 +768,24 @@ async function cmdContactsList(args, d) {
     contacts,
     () => contacts.length === 0 ? "No contacts yet." : table(["ID", "NAME", "ADDRESS"], contacts.map((c) => [c.id, c.name, truncateAddress(c.address)]))
   );
-  return 0;
+  return EXIT.ok;
 }
 async function cmdContactsAdd(args, d) {
   const [address, ...nameParts] = [...args.positionals].reverse();
   const name = nameParts.reverse().join(" ").trim();
-  if (!name || !address) {
-    d.err("Usage: haven contacts add <name> <address>");
-    return 1;
-  }
+  if (!name || !address) throw new UsageError("Usage: haven contacts add <name> <address>");
   const { api } = await authed(args, d);
   const contact = await api.post("/contacts", { name, address });
   emit(d, args.flags.json, contact, () => `Added contact "${contact.name}" (${truncateAddress(contact.address)}).`);
-  return 0;
+  return EXIT.ok;
 }
 async function cmdContactsRemove(args, d) {
   const id = args.positionals[0];
-  if (!id) {
-    d.err("Usage: haven contacts remove <id>");
-    return 1;
-  }
+  if (!id) throw new UsageError("Usage: haven contacts remove <id>");
   const { api } = await authed(args, d);
   await api.del(`/contacts/${id}`);
-  d.out(`Contact ${id} removed.`);
-  return 0;
+  emit(d, args.flags.json, { ok: true, contact_id: id, removed: true }, () => `Contact ${id} removed.`);
+  return EXIT.ok;
 }
 
 exports.CliApiError = CliApiError;