@thecorporation/cli 26.3.46 → 26.3.48

package/dist/index.js

@@ -9,174 +9,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/animation.ts
-function renderFrame(frame) {
-  const cols = [];
-  for (let i = 0; i < BUILDINGS.length; i++) {
-    const building = BUILDINGS[i];
-    const h = building.length;
-    const visible = Math.max(0, Math.min(h, frame - i));
-    const width = building[0]?.length ?? 6;
-    const blank = " ".repeat(width);
-    const col = Array(MAX_HEIGHT - visible).fill(blank);
-    col.push(...building.slice(h - visible));
-    cols.push(col);
-  }
-  const lines = [];
-  for (let row = 0; row < MAX_HEIGHT; row++) {
-    lines.push(cols.map((col) => col[row]).join(""));
-  }
-  return lines.join("\n");
-}
-async function withAnimation(fn) {
-  if (!process.stdout.isTTY) {
-    return fn();
-  }
-  let frame = 0;
-  let animDone = false;
-  const spinChars = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-  let spinIdx = 0;
-  let lastLineCount = 0;
-  const clearPrev = () => {
-    if (lastLineCount > 0) {
-      process.stdout.write(`\x1B[${lastLineCount}A\x1B[0J`);
-    }
-  };
-  const drawFrame = () => {
-    clearPrev();
-    if (!animDone) {
-      const art = renderFrame(frame);
-      const output = `${GOLD}${art}${RESET}
-`;
-      process.stdout.write(output);
-      lastLineCount = MAX_HEIGHT + 1;
-      frame++;
-      if (frame >= TOTAL_FRAMES) {
-        animDone = true;
-      }
-    } else {
-      const line = `${GOLD}${spinChars[spinIdx % spinChars.length]} Loading...${RESET}
-`;
-      process.stdout.write(line);
-      lastLineCount = 1;
-      spinIdx++;
-    }
-  };
-  drawFrame();
-  const timer = setInterval(drawFrame, 100);
-  try {
-    const result = await fn();
-    return result;
-  } finally {
-    clearInterval(timer);
-    clearPrev();
-  }
-}
-var BUILDINGS, MAX_HEIGHT, TOTAL_FRAMES, GOLD, RESET;
-var init_animation = __esm({
-  "src/animation.ts"() {
-    "use strict";
-    BUILDINGS = [
-      [
-        "  \u250C\u2510  ",
-        "  \u2502\u2502  ",
-        "  \u2502\u2502  ",
-        " \u250C\u2524\u251C\u2510 ",
-        " \u2502\u2502\u2502\u2502\u2502",
-        " \u2502\u2502\u2502\u2502\u2502"
-      ],
-      [
-        " \u2554\u2550\u2550\u2557 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 ",
-        " \u2551\u25AA\u25AA\u2551 "
-      ],
-      [
-        "  /\\  ",
-        " /  \\ ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 "
-      ],
-      [
-        " \u250C\u2500\u2500\u2510 ",
-        " \u2502\u224B\u224B\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 ",
-        " \u2502\u25AA\u25AA\u2502 "
-      ],
-      [
-        "  \u257B   ",
-        "  \u2503   ",
-        " \u250C\u2524\u2510  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  ",
-        " \u2502\u25AA\u2502  "
-      ],
-      [
-        " \u250C\u2510  ",
-        " \u251C\u2524  ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 "
-      ],
-      [
-        " \u2554\u2550\u2550\u2550\u2557",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551",
-        " \u2551\u25AA \u25AA\u2551"
-      ],
-      [
-        " \u252C\u2500\u252C ",
-        " \u2502~\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 ",
-        " \u2502\u25AA\u2502 "
-      ]
-    ];
-    MAX_HEIGHT = Math.max(...BUILDINGS.map((b) => b.length));
-    TOTAL_FRAMES = MAX_HEIGHT + 4;
-    GOLD = "\x1B[38;2;212;160;23m";
-    RESET = "\x1B[0m";
-  }
-});
-
-// src/spinner.ts
-async function withSpinner(_label, fn, json) {
-  if (json) {
-    return fn();
-  }
-  return withAnimation(fn);
-}
-var init_spinner = __esm({
-  "src/spinner.ts"() {
-    "use strict";
-    init_animation();
-  }
-});
-
 // src/config.ts
 import {
   chmodSync,
@@ -717,7 +549,7 @@ var init_config = __esm({
 
 // src/references.ts
 import {
-  shortId as shortId2,
+  shortId,
   slugify,
   describeReferenceRecord,
   getReferenceId,
@@ -727,7 +559,7 @@ import {
 } from "@thecorporation/corp-tools";
 import {
   ReferenceTracker,
-  shortId as shortId3,
+  shortId as shortId2,
   normalize,
   validateReferenceInput,
   describeReferenceRecord as describeReferenceRecord2,
@@ -1010,7 +842,7 @@ var init_references = __esm({
         );
       }
       ambiguousMessage(kind, ref, matches) {
-        const previews = matches.slice(0, 5).map((match) => `${match.label} [${shortId3(match.id)}]`).join(", ");
+        const previews = matches.slice(0, 5).map((match) => `${match.label} [${shortId2(match.id)}]`).join(", ");
         return `Ambiguous ${kindLabel(kind)} reference "${ref}". Matches: ${previews}. Try: corp find ${kind} ${JSON.stringify(ref)}`;
       }
       async listRecords(kind, scope) {
@@ -1391,13 +1223,13 @@ function formatReferenceCell(kind, record) {
   const id = getReferenceId(kind, record);
   if (!id) return "";
   const alias = getReferenceAlias(kind, record);
-  return alias ? `${alias} [${shortId2(id)}]` : shortId2(id);
+  return alias ? `${alias} [${shortId(id)}]` : shortId(id);
 }
 function printReferenceSummary(kind, record, opts = {}) {
   const id = getReferenceId(kind, record);
   if (!id) return;
   const alias = getReferenceAlias(kind, record);
-  const token = alias ? `${alias} [${shortId2(id)}]` : shortId2(id);
+  const token = alias ? `${alias} [${shortId(id)}]` : shortId(id);
   console.log(`  ${chalk.bold(opts.label ?? "Ref:")} ${token}`);
   console.log(`  ${chalk.bold("ID:")} ${id}`);
   if (opts.showReuseHint) {
@@ -1485,17 +1317,17 @@ function printFinanceSummaryPanel(data) {
   console.log(chalk.green("\u2500".repeat(54)));
   console.log(chalk.green.bold("  Finance Summary"));
   console.log(chalk.green("\u2500".repeat(54)));
-  console.log(`  ${chalk.bold("Entity:")} ${s2(data.entity_id) || "N/A"}`);
-  console.log(`  ${chalk.bold("Invoices:")} ${s2(invoices.count)} total, ${s2(invoices.open_count)} open, ${money2(invoices.total_amount_cents)}`);
+  console.log(`  ${chalk.bold("Entity:")} ${s(data.entity_id) || "N/A"}`);
+  console.log(`  ${chalk.bold("Invoices:")} ${s(invoices.count)} total, ${s(invoices.open_count)} open, ${money(invoices.total_amount_cents)}`);
   if (invoices.latest_due_date) {
     console.log(`  ${chalk.bold("Invoice Horizon:")} next due ${date(invoices.latest_due_date)}`);
   }
-  console.log(`  ${chalk.bold("Bank Accounts:")} ${s2(bankAccounts.active_count)}/${s2(bankAccounts.count)} active`);
-  console.log(`  ${chalk.bold("Payments:")} ${s2(payments.count)} total, ${s2(payments.pending_count)} pending, ${money2(payments.total_amount_cents)}`);
-  console.log(`  ${chalk.bold("Payroll Runs:")} ${s2(payrollRuns.count)} total${payrollRuns.latest_period_end ? `, latest ${date(payrollRuns.latest_period_end)}` : ""}`);
-  console.log(`  ${chalk.bold("Distributions:")} ${s2(distributions.count)} total, ${money2(distributions.total_amount_cents)}`);
-  console.log(`  ${chalk.bold("Reconciliations:")} ${s2(reconciliations.balanced_count)}/${s2(reconciliations.count)} balanced`);
-  console.log(`  ${chalk.bold("Contractors:")} ${s2(classifications.count)} classifications, ${s2(classifications.high_risk_count)} high risk`);
+  console.log(`  ${chalk.bold("Bank Accounts:")} ${s(bankAccounts.active_count)}/${s(bankAccounts.count)} active`);
+  console.log(`  ${chalk.bold("Payments:")} ${s(payments.count)} total, ${s(payments.pending_count)} pending, ${money(payments.total_amount_cents)}`);
+  console.log(`  ${chalk.bold("Payroll Runs:")} ${s(payrollRuns.count)} total${payrollRuns.latest_period_end ? `, latest ${date(payrollRuns.latest_period_end)}` : ""}`);
+  console.log(`  ${chalk.bold("Distributions:")} ${s(distributions.count)} total, ${money(distributions.total_amount_cents)}`);
+  console.log(`  ${chalk.bold("Reconciliations:")} ${s(reconciliations.balanced_count)}/${s(reconciliations.count)} balanced`);
+  console.log(`  ${chalk.bold("Contractors:")} ${s(classifications.count)} classifications, ${s(classifications.high_risk_count)} high risk`);
   console.log(chalk.green("\u2500".repeat(54)));
 }
 function printNextSteps(data) {
@@ -1550,12 +1382,12 @@ function makeTable(title, columns) {
 ${chalk.bold(title)}`);
   return new Table({ head: columns.map((c) => chalk.dim(c)) });
 }
-function s2(val, maxLen) {
+function s(val, maxLen) {
   const str = val == null ? "" : String(val);
   if (maxLen && str.length > maxLen) return str.slice(0, maxLen);
   return str;
 }
-function money2(val, cents = true) {
+function money(val, cents = true) {
   if (typeof val === "number") {
     const dollars = cents ? val / 100 : val;
     return `$${dollars.toLocaleString(void 0, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
@@ -1563,7 +1395,7 @@ function money2(val, cents = true) {
   return String(val ?? "");
 }
 function date(val) {
-  const str = s2(val);
+  const str = s(val);
   if (!str) return "";
   const parsed = new Date(str);
   return Number.isNaN(parsed.getTime()) ? str : parsed.toISOString().slice(0, 10);
@@ -1571,23 +1403,23 @@ function date(val) {
 function actorLabel(record, field) {
   const actor = record[`${field}_actor`];
   if (actor && typeof actor === "object" && !Array.isArray(actor)) {
-    const label = s2(actor.label);
-    const actorType = s2(actor.actor_type);
+    const label = s(actor.label);
+    const actorType = s(actor.actor_type);
     if (label) {
       return actorType ? `${label} (${actorType})` : label;
     }
   }
-  return s2(record[field]);
+  return s(record[field]);
 }
 function printEntitiesTable(entities) {
   const table = makeTable("Entities", ["Ref", "Name", "Type", "Jurisdiction", "Status"]);
   for (const e of entities) {
     table.push([
       formatReferenceCell("entity", e),
-      s2(e.legal_name ?? e.name),
-      s2(e.entity_type),
-      s2(e.jurisdiction),
-      s2(e.formation_status ?? e.status)
+      s(e.legal_name ?? e.name),
+      s(e.entity_type),
+      s(e.jurisdiction),
+      s(e.formation_status ?? e.status)
     ]);
   }
   console.log(table.toString());
@@ -1595,9 +1427,9 @@ function printEntitiesTable(entities) {
 function printObligationsTable(obligations) {
   const table = makeTable("Obligations", ["ID", "Type", "Urgency", "Due", "Status"]);
   for (const o of obligations) {
-    const urg = s2(o.urgency) || "upcoming";
+    const urg = s(o.urgency) || "upcoming";
     const colorFn = URGENCY_COLORS[urg] ?? ((x) => x);
-    table.push([s2(o.obligation_id, 12), s2(o.obligation_type), colorFn(urg), s2(o.due_at), s2(o.status)]);
+    table.push([s(o.obligation_id, 12), s(o.obligation_type), colorFn(urg), s(o.due_at), s(o.status)]);
   }
   console.log(table.toString());
 }
@@ -1606,27 +1438,27 @@ function printContactsTable(contacts) {
   for (const c of contacts) {
     table.push([
       formatReferenceCell("contact", c),
-      s2(c.name),
-      s2(c.email),
-      s2(c.category),
-      s2(c.entity_name ?? c.entity_id)
+      s(c.name),
+      s(c.email),
+      s(c.category),
+      s(c.entity_name ?? c.entity_id)
     ]);
   }
   console.log(table.toString());
 }
 function printCapTable(data) {
-  const accessLevel = s2(data.access_level) || "admin";
+  const accessLevel = s(data.access_level) || "admin";
   const instruments = data.instruments ?? [];
   if (instruments.length > 0) {
     const table = makeTable("Cap Table \u2014 Instruments", ["Ref", "Symbol", "Kind", "Authorized", "Issued", "Diluted"]);
     for (const instrument of instruments) {
       table.push([
         formatReferenceCell("instrument", instrument),
-        s2(instrument.symbol),
-        s2(instrument.kind),
-        s2(instrument.authorized_units ?? "unlimited"),
-        s2(instrument.issued_units),
-        s2(instrument.diluted_units)
+        s(instrument.symbol),
+        s(instrument.kind),
+        s(instrument.authorized_units ?? "unlimited"),
+        s(instrument.issued_units),
+        s(instrument.diluted_units)
       ]);
     }
     console.log(table.toString());
@@ -1640,10 +1472,10 @@ function printCapTable(data) {
     for (const holder of holders) {
       const dilutedBps = typeof holder.fully_diluted_bps === "number" ? `${(holder.fully_diluted_bps / 100).toFixed(2)}%` : "";
       table.push([
-        s2(holder.name),
-        s2(holder.outstanding_units),
-        s2(holder.as_converted_units),
-        s2(holder.fully_diluted_units),
+        s(holder.name),
+        s(holder.outstanding_units),
+        s(holder.as_converted_units),
+        s(holder.fully_diluted_units),
         dilutedBps
       ]);
     }
@@ -1657,9 +1489,9 @@ function printCapTable(data) {
     for (const sc of shareClasses) {
       const row = [
         formatReferenceCell("share_class", sc),
-        s2(sc.class_code ?? sc.name),
-        s2(sc.authorized),
-        s2(sc.outstanding)
+        s(sc.class_code ?? sc.name),
+        s(sc.authorized),
+        s(sc.outstanding)
       ];
       if (accessLevel !== "summary") {
         const holders2 = sc.holders ?? [];
@@ -1673,7 +1505,7 @@ function printCapTable(data) {
   if (ownership.length > 0 && accessLevel !== "summary") {
     const table = makeTable("Ownership Breakdown", ["Holder", "Shares", "Percentage", "Class"]);
     for (const o of ownership) {
-      table.push([s2(o.holder_name ?? o.name), s2(o.shares), `${o.percentage ?? ""}%`, s2(o.share_class)]);
+      table.push([s(o.holder_name ?? o.name), s(o.shares), `${o.percentage ?? ""}%`, s(o.share_class)]);
     }
     console.log(table.toString());
   }
@@ -1681,7 +1513,7 @@ function printCapTable(data) {
   if (pools.length > 0) {
     const table = makeTable("Option Pools", ["Name", "Authorized", "Granted", "Available"]);
     for (const p of pools) {
-      table.push([s2(p.name), s2(p.authorized), s2(p.granted), s2(p.available)]);
+      table.push([s(p.name), s(p.authorized), s(p.granted), s(p.available)]);
     }
     console.log(table.toString());
   }
@@ -1692,7 +1524,7 @@ ${chalk.bold("Fully Diluted Shares:")} ${typeof fd === "number" ? fd.toLocaleStr
   }
   if (data.total_units != null) {
     console.log(`
-${chalk.bold("Cap Table Basis:")} ${s2(data.basis) || "outstanding"}`);
+${chalk.bold("Cap Table Basis:")} ${s(data.basis) || "outstanding"}`);
     console.log(`${chalk.bold("Total Units:")} ${typeof data.total_units === "number" ? data.total_units.toLocaleString() : data.total_units}`);
   }
 }
@@ -1701,11 +1533,11 @@ function printSafesTable(safes) {
   for (const s_ of safes) {
     table.push([
       formatReferenceCell("safe_note", s_),
-      s2(s_.investor_name ?? s_.investor),
-      money2(s_.principal_amount_cents ?? s_.investment_amount ?? s_.amount),
-      money2(s_.valuation_cap_cents ?? s_.valuation_cap ?? s_.cap),
-      s2(s_.discount_rate ?? s_.discount),
-      s2(s_.issued_at ?? s_.date ?? s_.created_at)
+      s(s_.investor_name ?? s_.investor),
+      money(s_.principal_amount_cents ?? s_.investment_amount ?? s_.amount),
+      money(s_.valuation_cap_cents ?? s_.valuation_cap ?? s_.cap),
+      s(s_.discount_rate ?? s_.discount),
+      s(s_.issued_at ?? s_.date ?? s_.created_at)
     ]);
   }
   console.log(table.toString());
@@ -1715,11 +1547,11 @@ function printTransfersTable(transfers) {
   for (const t of transfers) {
     table.push([
       formatReferenceCell("share_transfer", t),
-      s2(t.from_holder ?? t.from),
-      s2(t.to_holder ?? t.to),
-      s2(t.shares ?? t.share_count),
-      s2(t.transfer_type),
-      s2(t.status)
+      s(t.from_holder ?? t.from),
+      s(t.to_holder ?? t.to),
+      s(t.shares ?? t.share_count),
+      s(t.transfer_type),
+      s(t.status)
     ]);
   }
   console.log(table.toString());
@@ -1729,11 +1561,11 @@ function printInstrumentsTable(instruments) {
   for (const instrument of instruments) {
     table.push([
       formatReferenceCell("instrument", instrument),
-      s2(instrument.symbol),
-      s2(instrument.kind),
-      s2(instrument.authorized_units ?? "unlimited"),
-      s2(instrument.issued_units),
-      s2(instrument.status)
+      s(instrument.symbol),
+      s(instrument.kind),
+      s(instrument.authorized_units ?? "unlimited"),
+      s(instrument.issued_units),
+      s(instrument.status)
     ]);
   }
   console.log(table.toString());
@@ -1743,9 +1575,9 @@ function printShareClassesTable(shareClasses) {
   for (const shareClass of shareClasses) {
     table.push([
       formatReferenceCell("share_class", shareClass),
-      s2(shareClass.class_code ?? shareClass.name ?? shareClass.share_class),
-      s2(shareClass.authorized),
-      s2(shareClass.outstanding)
+      s(shareClass.class_code ?? shareClass.name ?? shareClass.share_class),
+      s(shareClass.authorized),
+      s(shareClass.outstanding)
     ]);
   }
   console.log(table.toString());
@@ -1755,9 +1587,9 @@ function printRoundsTable(rounds) {
   for (const round of rounds) {
     table.push([
       formatReferenceCell("round", round),
-      s2(round.name),
-      s2(round.status),
-      s2(round.issuer_legal_entity_id),
+      s(round.name),
+      s(round.status),
+      s(round.issuer_legal_entity_id),
       date(round.created_at)
     ]);
   }
@@ -1768,10 +1600,10 @@ function printInvoicesTable(invoices) {
   for (const invoice of invoices) {
     table.push([
       formatReferenceCell("invoice", invoice),
-      s2(invoice.customer_name),
-      money2(invoice.amount_cents),
+      s(invoice.customer_name),
+      money(invoice.amount_cents),
       date(invoice.due_date),
-      s2(invoice.status)
+      s(invoice.status)
     ]);
   }
   console.log(table.toString());
@@ -1781,9 +1613,9 @@ function printBankAccountsTable(accounts) {
   for (const account of accounts) {
     table.push([
       formatReferenceCell("bank_account", account),
-      s2(account.bank_name),
-      s2(account.account_type),
-      s2(account.status),
+      s(account.bank_name),
+      s(account.account_type),
+      s(account.status),
       date(account.created_at)
     ]);
   }
@@ -1794,10 +1626,10 @@ function printPaymentsTable(payments) {
   for (const payment of payments) {
     table.push([
       formatReferenceCell("payment", payment),
-      s2(payment.recipient),
-      money2(payment.amount_cents),
-      s2(payment.payment_method),
-      s2(payment.status)
+      s(payment.recipient),
+      money(payment.amount_cents),
+      s(payment.payment_method),
+      s(payment.status)
     ]);
   }
   console.log(table.toString());
@@ -1809,7 +1641,7 @@ function printPayrollRunsTable(runs) {
       formatReferenceCell("payroll_run", run),
       date(run.pay_period_start),
       date(run.pay_period_end),
-      s2(run.status),
+      s(run.status),
       date(run.created_at)
     ]);
   }
@@ -1820,10 +1652,10 @@ function printDistributionsTable(distributions) {
   for (const distribution of distributions) {
     table.push([
       formatReferenceCell("distribution", distribution),
-      s2(distribution.distribution_type),
-      money2(distribution.total_amount_cents),
-      s2(distribution.status),
-      s2(distribution.description)
+      s(distribution.distribution_type),
+      money(distribution.total_amount_cents),
+      s(distribution.status),
+      s(distribution.description)
     ]);
   }
   console.log(table.toString());
@@ -1834,9 +1666,9 @@ function printReconciliationsTable(reconciliations) {
     table.push([
       formatReferenceCell("reconciliation", reconciliation),
       date(reconciliation.as_of_date),
-      money2(reconciliation.total_debits_cents),
-      money2(reconciliation.total_credits_cents),
-      s2(reconciliation.status)
+      money(reconciliation.total_debits_cents),
+      money(reconciliation.total_credits_cents),
+      s(reconciliation.status)
     ]);
   }
   console.log(table.toString());
@@ -1847,9 +1679,9 @@ function printValuationsTable(valuations) {
     table.push([
       formatReferenceCell("valuation", v),
       date(v.effective_date ?? v.valuation_date ?? v.date),
-      s2(v.valuation_type ?? v.type),
-      money2(v.enterprise_value_cents ?? v.enterprise_value ?? v.valuation),
-      money2(v.fmv_per_share_cents ?? v.price_per_share ?? v.pps ?? v.fmv_per_share)
+      s(v.valuation_type ?? v.type),
+      money(v.enterprise_value_cents ?? v.enterprise_value ?? v.valuation),
+      money(v.fmv_per_share_cents ?? v.price_per_share ?? v.pps ?? v.fmv_per_share)
     ]);
   }
   console.log(table.toString());
@@ -1859,10 +1691,10 @@ function printTaxFilingsTable(filings) {
   for (const filing of filings) {
     table.push([
       formatReferenceCell("tax_filing", filing),
-      s2(filing.document_type),
-      s2(filing.tax_year),
-      s2(filing.status),
-      s2(filing.document_id, 12)
+      s(filing.document_type),
+      s(filing.tax_year),
+      s(filing.status),
+      s(filing.document_id, 12)
     ]);
   }
   console.log(table.toString());
@@ -1872,10 +1704,10 @@ function printDeadlinesTable(deadlines) {
   for (const deadline of deadlines) {
     table.push([
       formatReferenceCell("deadline", deadline),
-      s2(deadline.deadline_type),
+      s(deadline.deadline_type),
       date(deadline.due_date),
-      s2(deadline.status),
-      s2(deadline.description)
+      s(deadline.status),
+      s(deadline.description)
     ]);
   }
   console.log(table.toString());
@@ -1885,10 +1717,10 @@ function printClassificationsTable(classifications) {
   for (const classification of classifications) {
     table.push([
       formatReferenceCell("classification", classification),
-      s2(classification.contractor_name),
-      s2(classification.state),
-      s2(classification.risk_level),
-      s2(classification.classification)
+      s(classification.contractor_name),
+      s(classification.state),
+      s(classification.risk_level),
+      s(classification.classification)
     ]);
   }
   console.log(table.toString());
@@ -1898,10 +1730,10 @@ function printGovernanceTable(bodies) {
   for (const b of bodies) {
     table.push([
       formatReferenceCell("body", b),
-      s2(b.name),
-      s2(b.body_type ?? b.type),
-      s2(b.seat_count ?? b.seats),
-      s2(b.meeting_count ?? b.meetings)
+      s(b.name),
+      s(b.body_type ?? b.type),
+      s(b.seat_count ?? b.seats),
+      s(b.meeting_count ?? b.meetings)
     ]);
   }
   console.log(table.toString());
@@ -1911,9 +1743,9 @@ function printSeatsTable(seats) {
   for (const st of seats) {
     table.push([
       formatReferenceCell("seat", st),
-      s2(st.holder_name ?? st.holder ?? st.holder_id),
-      s2(st.role),
-      s2(st.status)
+      s(st.holder_name ?? st.holder ?? st.holder_id),
+      s(st.role),
+      s(st.status)
     ]);
   }
   console.log(table.toString());
@@ -1923,10 +1755,10 @@ function printMeetingsTable(meetings) {
   for (const m of meetings) {
     table.push([
       formatReferenceCell("meeting", m),
-      s2(m.title ?? m.name),
-      s2(m.scheduled_date ?? m.meeting_date ?? m.date),
-      s2(m.status),
-      s2(m.resolution_count ?? m.resolutions)
+      s(m.title ?? m.name),
+      s(m.scheduled_date ?? m.meeting_date ?? m.date),
+      s(m.status),
+      s(m.resolution_count ?? m.resolutions)
     ]);
   }
   console.log(table.toString());
@@ -1936,11 +1768,11 @@ function printResolutionsTable(resolutions) {
   for (const r of resolutions) {
     table.push([
       formatReferenceCell("resolution", r),
-      s2(r.title),
-      s2(r.resolution_type ?? r.type),
-      s2(r.status),
-      s2(r.votes_for),
-      s2(r.votes_against)
+      s(r.title),
+      s(r.resolution_type ?? r.type),
+      s(r.status),
+      s(r.votes_for),
+      s(r.votes_against)
     ]);
   }
   console.log(table.toString());
@@ -1950,9 +1782,9 @@ function printAgendaItemsTable(items) {
   for (const item of items) {
     table.push([
       formatReferenceCell("agenda_item", item),
-      s2(item.title),
-      s2(item.status),
-      s2(item.item_type ?? item.type)
+      s(item.title),
+      s(item.status),
+      s(item.item_type ?? item.type)
     ]);
   }
   console.log(table.toString());
@@ -1961,13 +1793,13 @@ function printDocumentsTable(docs) {
   const table = makeTable("Documents", ["Ref", "Title", "Type", "Date", "Status", "Signatures"]);
   for (const d of docs) {
     const sigs = d.signatures;
-    const sigStr = Array.isArray(sigs) ? `${sigs.length} signed` : s2(sigs);
+    const sigStr = Array.isArray(sigs) ? `${sigs.length} signed` : s(sigs);
     table.push([
       formatReferenceCell("document", d),
-      s2(d.title ?? d.name),
-      s2(d.document_type ?? d.type),
-      s2(d.date ?? d.created_at),
-      s2(d.status),
+      s(d.title ?? d.name),
+      s(d.document_type ?? d.type),
+      s(d.date ?? d.created_at),
+      s(d.status),
       sigStr
     ]);
   }
@@ -1976,14 +1808,14 @@ function printDocumentsTable(docs) {
 function printWorkItemsTable(items) {
   const table = makeTable("Work Items", ["Ref", "Title", "Category", "Status", "Deadline", "Claimed By"]);
   for (const w of items) {
-    const status = s2(w.effective_status ?? w.status);
+    const status = s(w.effective_status ?? w.status);
     const colored = status === "completed" ? chalk.green(status) : status === "claimed" ? chalk.yellow(status) : status === "cancelled" ? chalk.dim(status) : status;
     table.push([
       formatReferenceCell("work_item", w),
-      s2(w.title),
-      s2(w.category),
+      s(w.title),
+      s(w.category),
       colored,
-      w.asap ? chalk.red.bold("ASAP") : s2(w.deadline ?? ""),
+      w.asap ? chalk.red.bold("ASAP") : s(w.deadline ?? ""),
       actorLabel(w, "claimed_by")
     ]);
   }
@@ -1992,9 +1824,9 @@ function printWorkItemsTable(items) {
 function printAgentsTable(agents) {
   const table = makeTable("Agents", ["Ref", "Name", "Status", "Model"]);
   for (const a of agents) {
-    const status = s2(a.status);
+    const status = s(a.status);
     const colored = status === "active" ? chalk.green(status) : status === "paused" ? chalk.yellow(status) : status;
-    table.push([formatReferenceCell("agent", a), s2(a.name), colored, s2(a.model)]);
+    table.push([formatReferenceCell("agent", a), s(a.name), colored, s(a.model)]);
   }
   console.log(table.toString());
 }
@@ -2002,10 +1834,10 @@ function printServiceCatalogTable(items) {
   const table = makeTable("Service Catalog", ["Slug", "Name", "Price", "Type"]);
   for (const item of items) {
     table.push([
-      s2(item.slug),
-      s2(item.name),
-      money2(item.amount_cents),
-      s2(item.price_type)
+      s(item.slug),
+      s(item.name),
+      money(item.amount_cents),
+      s(item.price_type)
     ]);
   }
   console.log(table.toString());
@@ -2013,12 +1845,12 @@ function printServiceCatalogTable(items) {
 function printServiceRequestsTable(requests) {
   const table = makeTable("Service Requests", ["Ref", "Service", "Amount", "Status", "Created"]);
   for (const r of requests) {
-    const status = s2(r.status);
+    const status = s(r.status);
     const colored = status === "fulfilled" ? chalk.green(status) : status === "paid" ? chalk.cyan(status) : status === "checkout" ? chalk.yellow(status) : status === "failed" ? chalk.dim(status) : status;
     table.push([
       formatReferenceCell("service_request", r),
-      s2(r.service_slug),
-      money2(r.amount_cents),
+      s(r.service_slug),
+      money(r.amount_cents),
       colored,
       date(r.created_at)
     ]);
@@ -2026,10 +1858,10 @@ function printServiceRequestsTable(requests) {
   console.log(table.toString());
 }
 function printBillingPanel(status, plans) {
-  const plan = s2(status.plan ?? status.tier) || "free";
-  const subStatus = s2(status.status) || "active";
-  const periodEnd = s2(status.current_period_end);
-  const explanation = s2(status.status_explanation);
+  const plan = s(status.plan ?? status.tier) || "free";
+  const subStatus = s(status.status) || "active";
+  const periodEnd = s(status.current_period_end);
+  const explanation = s(status.status_explanation);
   console.log(chalk.green("\u2500".repeat(50)));
   console.log(chalk.green.bold("  Billing Status"));
   console.log(chalk.green("\u2500".repeat(50)));
@@ -2044,13 +1876,13 @@ function printBillingPanel(status, plans) {
     const table = makeTable("Available Plans", ["Plan", "Price", "Features"]);
     for (const p of plans) {
       const amount = p.price_cents ?? p.amount ?? 0;
-      const interval = s2(p.interval);
+      const interval = s(p.interval);
       let priceStr = "Free";
       if (amount > 0) {
         priceStr = interval ? `$${Math.round(amount / 100)}/${interval}` : `$${Math.round(amount / 100)}`;
       }
-      const name = s2(p.name ?? p.plan_id ?? p.tier);
-      const features = Array.isArray(p.features) ? p.features.join(", ") : s2(p.description);
+      const name = s(p.name ?? p.plan_id ?? p.tier);
+      const features = Array.isArray(p.features) ? p.features.join(", ") : s(p.description);
       table.push([name, priceStr, features]);
     }
     console.log(table.toString());
@@ -2089,6 +1921,174 @@ var init_output = __esm({
   }
 });
 
+// src/animation.ts
+function renderFrame(frame) {
+  const cols = [];
+  for (let i = 0; i < BUILDINGS.length; i++) {
+    const building = BUILDINGS[i];
+    const h = building.length;
+    const visible = Math.max(0, Math.min(h, frame - i));
+    const width = building[0]?.length ?? 6;
+    const blank = " ".repeat(width);
+    const col = Array(MAX_HEIGHT - visible).fill(blank);
+    col.push(...building.slice(h - visible));
+    cols.push(col);
+  }
+  const lines = [];
+  for (let row = 0; row < MAX_HEIGHT; row++) {
+    lines.push(cols.map((col) => col[row]).join(""));
+  }
+  return lines.join("\n");
+}
+async function withAnimation(fn) {
+  if (!process.stdout.isTTY) {
+    return fn();
+  }
+  let frame = 0;
+  let animDone = false;
+  const spinChars = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  let spinIdx = 0;
+  let lastLineCount = 0;
+  const clearPrev = () => {
+    if (lastLineCount > 0) {
+      process.stdout.write(`\x1B[${lastLineCount}A\x1B[0J`);
+    }
+  };
+  const drawFrame = () => {
+    clearPrev();
+    if (!animDone) {
+      const art = renderFrame(frame);
+      const output = `${GOLD}${art}${RESET}
+`;
+      process.stdout.write(output);
+      lastLineCount = MAX_HEIGHT + 1;
+      frame++;
+      if (frame >= TOTAL_FRAMES) {
+        animDone = true;
+      }
+    } else {
+      const line = `${GOLD}${spinChars[spinIdx % spinChars.length]} Loading...${RESET}
+`;
+      process.stdout.write(line);
+      lastLineCount = 1;
+      spinIdx++;
+    }
+  };
+  drawFrame();
+  const timer = setInterval(drawFrame, 100);
+  try {
+    const result = await fn();
+    return result;
+  } finally {
+    clearInterval(timer);
+    clearPrev();
+  }
+}
+var BUILDINGS, MAX_HEIGHT, TOTAL_FRAMES, GOLD, RESET;
+var init_animation = __esm({
+  "src/animation.ts"() {
+    "use strict";
+    BUILDINGS = [
+      [
+        "  \u250C\u2510  ",
+        "  \u2502\u2502  ",
+        "  \u2502\u2502  ",
+        " \u250C\u2524\u251C\u2510 ",
+        " \u2502\u2502\u2502\u2502\u2502",
+        " \u2502\u2502\u2502\u2502\u2502"
+      ],
+      [
+        " \u2554\u2550\u2550\u2557 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 ",
+        " \u2551\u25AA\u25AA\u2551 "
+      ],
+      [
+        "  /\\  ",
+        " /  \\ ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 "
+      ],
+      [
+        " \u250C\u2500\u2500\u2510 ",
+        " \u2502\u224B\u224B\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 ",
+        " \u2502\u25AA\u25AA\u2502 "
+      ],
+      [
+        "  \u257B   ",
+        "  \u2503   ",
+        " \u250C\u2524\u2510  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  ",
+        " \u2502\u25AA\u2502  "
+      ],
+      [
+        " \u250C\u2510  ",
+        " \u251C\u2524  ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 "
+      ],
+      [
+        " \u2554\u2550\u2550\u2550\u2557",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551",
+        " \u2551\u25AA \u25AA\u2551"
+      ],
+      [
+        " \u252C\u2500\u252C ",
+        " \u2502~\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 ",
+        " \u2502\u25AA\u2502 "
+      ]
+    ];
+    MAX_HEIGHT = Math.max(...BUILDINGS.map((b) => b.length));
+    TOTAL_FRAMES = MAX_HEIGHT + 4;
+    GOLD = "\x1B[38;2;212;160;23m";
+    RESET = "\x1B[0m";
+  }
+});
+
+// src/spinner.ts
+async function withSpinner(_label, fn, json) {
+  if (json) {
+    return fn();
+  }
+  return withAnimation(fn);
+}
+var init_spinner = __esm({
+  "src/spinner.ts"() {
+    "use strict";
+    init_animation();
+  }
+});
+
 // src/api-client.ts
 import { CorpAPIClient, SessionExpiredError, provisionWorkspace } from "@thecorporation/corp-tools";
 var init_api_client = __esm({
@@ -2182,8 +2182,7 @@ var init_workspace = __esm({
               printStatusPanel(data);
             }
           } catch (err) {
-            ctx.writer.error(`Failed to fetch status: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to fetch status: ${err}`);
           }
         },
         examples: ["corp status"]
@@ -2255,8 +2254,7 @@ var init_workspace = __esm({
             }
             console.log(chalk3.blue("\u2500".repeat(50)));
           } catch (err) {
-            ctx.writer.error(`Failed to fetch context: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to fetch context: ${err}`);
           }
         },
         examples: ["corp context", "corp context --json"]
@@ -2278,8 +2276,7 @@ var init_workspace = __esm({
             const alias = getReferenceAlias("entity", { entity_id: entityId }) ?? entityId;
             ctx.writer.success(`Active entity set to ${alias} (${entityId})`);
           } catch (err) {
-            ctx.writer.error(`Failed to resolve entity: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to resolve entity: ${err}`);
           }
         },
         examples: ["corp use", "corp use --json"]
@@ -2301,8 +2298,7 @@ var init_workspace = __esm({
         handler: async (ctx) => {
           const opts = ctx.opts;
           if (opts.entityId && opts.workspace) {
-            ctx.writer.error("--entity-id and --workspace are mutually exclusive");
-            process.exit(1);
+            throw new Error("--entity-id and --workspace are mutually exclusive");
           }
           const localItems = localChecks();
           const hasCriticalLocal = localItems.some((i) => i.urgency === "critical");
@@ -2372,8 +2368,7 @@ var init_workspace = __esm({
                 console.log("  corp form finalize @last");
               }
             } else {
-              ctx.writer.error(`Failed to fetch next steps: ${err}`);
-              process.exit(1);
+              throw new Error(`Failed to fetch next steps: ${err}`);
             }
           }
         }
@@ -2441,8 +2436,7 @@ var init_workspace = __esm({
               }
             }
           } catch (err) {
-            ctx.writer.error(`Failed: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed: ${err}`);
           }
         },
         examples: ["corp digest"]
@@ -2465,8 +2459,7 @@ var init_workspace = __esm({
               printBillingPanel(enrichedStatus, plans);
             }
           } catch (err) {
-            ctx.writer.error(`Failed to fetch billing info: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to fetch billing info: ${err}`);
           }
         },
         examples: ["corp billing"]
@@ -2481,14 +2474,12 @@ var init_workspace = __esm({
             const result = await ctx.client.createBillingPortal();
             const url = result.portal_url;
             if (!url) {
-              ctx.writer.error("No portal URL returned. Ensure you have an active subscription.");
-              process.exit(1);
+              throw new Error("No portal URL returned. Ensure you have an active subscription.");
             }
             ctx.writer.success("Stripe Customer Portal URL:");
             ctx.writer.writeln(url);
           } catch (err) {
-            ctx.writer.error(`Failed to create portal session: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to create portal session: ${err}`);
           }
         },
         examples: ["corp billing portal"]
@@ -2512,14 +2503,12 @@ var init_workspace = __esm({
             const result = await ctx.client.createBillingCheckout(opts.plan);
             const url = result.checkout_url;
             if (!url) {
-              ctx.writer.error("No checkout URL returned.");
-              process.exit(1);
+              throw new Error("No checkout URL returned.");
             }
             ctx.writer.success(`Stripe Checkout URL for ${opts.plan}:`);
             ctx.writer.writeln(url);
           } catch (err) {
-            ctx.writer.error(`Failed to create checkout session: ${err}`);
-            process.exit(1);
+            throw new Error(`Failed to create checkout session: ${err}`);
           }
         },
         examples: ["corp billing upgrade"]
@@ -2560,8 +2549,7 @@ async function entitiesHandler(ctx) {
       printEntitiesTable(entities);
     }
   } catch (err) {
-    printError(`Failed to fetch entities: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to fetch entities: ${err}`);
   }
 }
 async function entitiesShowHandler(ctx) {
@@ -2573,8 +2561,7 @@ async function entitiesShowHandler(ctx) {
     const entities = await ctx.client.listEntities();
     const entity = entities.find((e) => e.entity_id === resolvedEntityId);
     if (!entity) {
-      printError(`Entity not found: ${entityRef}`);
-      process.exit(1);
+      throw new Error(`Entity not found: ${entityRef}`);
     }
     await ctx.resolver.stabilizeRecord("entity", entity);
     if (quiet) {
@@ -2598,8 +2585,7 @@ async function entitiesShowHandler(ctx) {
       console.log(chalk4.blue("\u2500".repeat(40)));
     }
   } catch (err) {
-    printError(`Failed to fetch entities: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to fetch entities: ${err}`);
   }
 }
 async function entitiesConvertHandler(ctx) {
@@ -2612,8 +2598,7 @@ async function entitiesConvertHandler(ctx) {
     printSuccess(`Entity conversion initiated: ${result.conversion_id ?? "OK"}`);
     printJson(result);
   } catch (err) {
-    printError(`Failed to convert entity: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to convert entity: ${err}`);
   }
 }
 async function entitiesDissolveHandler(ctx) {
@@ -2638,11 +2623,10 @@ async function entitiesDissolveHandler(ctx) {
   } catch (err) {
     const msg = String(err);
     if (msg.includes("InvalidTransition") || msg.includes("422")) {
-      printError(`Cannot dissolve entity: only entities with 'active' status can be dissolved. Check the entity's current status with: corp entities show ${entityRef}`);
+      throw new Error(`Cannot dissolve entity: only entities with 'active' status can be dissolved. Check the entity's current status with: corp entities show ${entityRef}`);
     } else {
-      printError(`Failed to dissolve entity: ${err}`);
+      throw new Error(`Failed to dissolve entity: ${err}`);
     }
-    process.exit(1);
   }
 }
 async function contactsHandler(ctx) {
@@ -2655,8 +2639,7 @@ async function contactsHandler(ctx) {
     else if (contacts.length === 0) console.log("No contacts found.");
     else printContactsTable(contacts);
   } catch (err) {
-    printError(`Failed to fetch contacts: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to fetch contacts: ${err}`);
   }
 }
 async function contactsShowHandler(ctx) {
@@ -2691,8 +2674,7 @@ async function contactsShowHandler(ctx) {
       console.log(chalk4.cyan("\u2500".repeat(40)));
     }
   } catch (err) {
-    printError(`Failed to fetch contact: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to fetch contact: ${err}`);
   }
 }
 async function contactsAddHandler(ctx) {
@@ -2719,8 +2701,7 @@ async function contactsAddHandler(ctx) {
       { jsonOnly: jsonOutput, referenceKind: "contact", showReuseHint: true }
     );
   } catch (err) {
-    printError(`Failed to create contact: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to create contact: ${err}`);
   }
 }
 async function contactsEditHandler(ctx) {
@@ -2767,8 +2748,7 @@ async function contactsEditHandler(ctx) {
     ctx.resolver.remember("contact", resolvedContactId, eid);
     printWriteResult(result, "Contact updated.", jsonOutput);
   } catch (err) {
-    printError(`Failed to update contact: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to update contact: ${err}`);
   }
 }
 var entityCommands;
@@ -2812,7 +2792,7 @@ var init_entities = __esm({
         options: [
           { flags: "--reason <reason>", description: "Dissolution reason", required: true },
           { flags: "--effective-date <date>", description: "Effective date (ISO 8601)" },
-          { flags: "--yes, -y", description: "Skip confirmation prompt" }
+          { flags: "--yes -y", description: "Skip confirmation prompt" }
         ],
         handler: entitiesDissolveHandler,
         examples: ["corp entities dissolve <entity-ref> --reason 'reason'", "corp entities dissolve --json"]
@@ -2899,7 +2879,7 @@ var init_entities = __esm({
           { flags: "--sms-enabled <sms-enabled>", description: "Sms Enabled" },
           { flags: "--webhook-enabled <webhook-enabled>", description: "Webhook Enabled" }
         ],
-        examples: ["corp contacts notification-prefs <contact-id>", "corp contacts notification-prefs --json"],
+        examples: ["corp contacts update-notification-prefs <contact-id>", "corp contacts update-notification-prefs --json"],
         successTemplate: "Notification Prefs updated"
       }
     ];
@@ -3953,28 +3933,23 @@ async function resolveEntityRefForFormCommand2(resolver, entityRef, dryRun) {
 async function formCreateHandler(ctx) {
   const opts = ctx.opts;
   if (opts.shares || opts.authorizedShares) {
-    ctx.writer.error(
+    throw new Error(
       "--shares / --authorized-shares is not accepted on form create.\n  Set authorized shares during finalize:\n    corp form finalize @last:entity --authorized-shares 10000000"
     );
-    process.exit(1);
   }
   const resolvedType = opts.type;
   const resolvedName = opts.name;
   if (!resolvedType) {
-    ctx.writer.error("required option '--type <type>' not specified");
-    process.exit(1);
+    throw new Error("required option '--type <type>' not specified");
   }
   if (!SUPPORTED_ENTITY_TYPES2.includes(resolvedType)) {
-    ctx.writer.error(`unsupported entity type '${resolvedType}'. Supported types: ${SUPPORTED_ENTITY_TYPES2.join(", ")}`);
-    process.exit(1);
+    throw new Error(`unsupported entity type '${resolvedType}'. Supported types: ${SUPPORTED_ENTITY_TYPES2.join(", ")}`);
   }
   if (!resolvedName) {
-    ctx.writer.error("required option '--name <name>' not specified");
-    process.exit(1);
+    throw new Error("required option '--name <name>' not specified");
   }
   if (!resolvedName.trim()) {
-    ctx.writer.error("--name cannot be empty or whitespace");
-    process.exit(1);
+    throw new Error("--name cannot be empty or whitespace");
   }
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   try {
@@ -4026,8 +4001,7 @@ async function formCreateHandler(ctx) {
     console.log(chalk6.yellow(`
   Next: corp form add-founder @last:entity --name "..." --email "..." --role member --pct 50`));
   } catch (err) {
-    printError(`Failed to create pending entity: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to create pending entity: ${err}`);
   }
 }
 async function formAddFounderHandler(ctx) {
@@ -4037,13 +4011,11 @@ async function formAddFounderHandler(ctx) {
     const resolvedEntityId = await resolveEntityRefForFormCommand2(ctx.resolver, entityRef, ctx.dryRun);
     const rawPct = opts.ownershipPct ?? opts.pct;
     if (!rawPct) {
-      ctx.writer.error("required option '--ownership-pct <percent>' not specified");
-      process.exit(1);
+      throw new Error("required option '--ownership-pct <percent>' not specified");
     }
     const pctValue = parseFloat(rawPct);
     if (isNaN(pctValue) || pctValue <= 0 || pctValue > 100) {
-      ctx.writer.error(`--ownership-pct must be between 0 and 100 (e.g. 60 for 60%), got: ${rawPct}`);
-      process.exit(1);
+      throw new Error(`--ownership-pct must be between 0 and 100 (e.g. 60 for 60%), got: ${rawPct}`);
     }
     const payload = {
       name: opts.name,
@@ -4073,8 +4045,7 @@ async function formAddFounderHandler(ctx) {
     console.log(chalk6.yellow(`
   Next: add more founders or run: corp form finalize @last:entity`));
   } catch (err) {
-    printError(`Failed to add founder: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to add founder: ${err}`);
   }
 }
 async function formFinalizeHandler(ctx) {
@@ -4165,7 +4136,7 @@ async function formFinalizeHandler(ctx) {
       hints.push('--incorporator-name "Incorporator Name"');
     }
     if (hints.length > 0) {
-      printError(
+      throw new Error(
         `Finalization failed: ${msg}
 
   To fix, re-run finalize with the missing fields:
@@ -4175,9 +4146,8 @@ async function formFinalizeHandler(ctx) {
     corp form finalize @last ${hints.filter((h) => h.startsWith("--")).join(" ")}`
       );
     } else {
-      printError(`Failed to finalize formation: ${err}`);
+      throw new Error(`Failed to finalize formation: ${err}`);
     }
-    process.exit(1);
   }
 }
 async function formActivateHandler(ctx) {
@@ -4228,8 +4198,7 @@ async function formActivateHandler(ctx) {
       console.log(chalk6.yellow("    corp next                   See all recommended actions"));
     }
   } catch (err) {
-    printError(`Failed to activate formation: ${err}`);
-    process.exit(1);
+    throw new Error(`Failed to activate formation: ${err}`);
   }
 }
 var SUPPORTED_ENTITY_TYPES2, formationCommands;
@@ -4346,7 +4315,11 @@ var init_formation = __esm({
           { flags: "--incorporator-address <address>", description: "Incorporator mailing address (overrides founder)" }
         ],
         handler: formFinalizeHandler,
-        examples: ["corp form finalize"]
+        examples: [
+          "corp form finalize @last:entity",
+          "corp form finalize @last:entity --authorized-shares 10000000 --par-value 0.0001",
+          'corp form finalize @last:entity --company-address "123 Main St,Wilmington,DE,19801" --incorporator-name "Alice Smith"'
+        ]
       },
       {
         name: "form activate",
@@ -4361,7 +4334,11 @@ var init_formation = __esm({
           { flags: "--ein <ein>", description: "EIN to confirm (defaults to a deterministic simulated EIN)" }
         ],
         handler: formActivateHandler,
-        examples: ["corp form activate"]
+        examples: [
+          "corp form activate @last:entity",
+          "corp form activate @last:entity --ein 84-1234567",
+          "corp form activate @last:entity --filing-id DE-2026-0042 --receipt-reference RECEIPT-001"
+        ]
       },
       // ── Auto-generated from OpenAPI ──────────────────────────────
       {
@@ -4462,7 +4439,7 @@ var init_formation = __esm({
       },
       {
         name: "formations pending",
-        description: "List entities with pending formations",
+        description: "Create a pending formation",
         route: { method: "POST", path: "/v1/formations/pending" },
         options: [
           { flags: "--company-address <company-address>", description: "Company mailing address" },
@@ -4478,7 +4455,7 @@ var init_formation = __esm({
           { flags: "--transfer-restrictions <transfer-restrictions>", description: "Transfer Restrictions" }
         ],
         examples: ["corp formations pending --entity-type c_corp --legal-name 'legal-name'", "corp formations pending --json"],
-        successTemplate: "Pending created"
+        successTemplate: "Pending formation created"
       },
       {
         name: "formations with-cap-table",
@@ -4723,8 +4700,7 @@ var init_cap_table = __esm({
             return;
           }
           if (data.access_level === "none") {
-            ctx.writer.error("You do not have access to this entity's cap table.");
-            process.exit(1);
+            throw new Error("You do not have access to this entity's cap table.");
           }
           printCapTable(data);
           try {
@@ -4944,10 +4920,10 @@ var init_cap_table = __esm({
                   "No 409A valuation found for this entity. Create one with:\n  corp cap-table create-valuation --type four_oh_nine_a --date YYYY-MM-DD --methodology <method>"
                 );
               }
+              return;
             } else {
-              ctx.writer.error(`Failed to fetch 409A valuation: ${err}`);
+              throw new Error(`Failed to fetch 409A valuation: ${err}`);
             }
-            process.exit(1);
           }
         },
         examples: ["corp cap-table 409a", "corp cap-table 409a --json"]
@@ -5520,7 +5496,7 @@ var init_cap_table = __esm({
           if (resolutionId) body.resolution_id = resolutionId;
           const result = await ctx.client.issueRound(roundId, body);
           ctx.resolver.remember("round", roundId, eid);
-          const roundMatch = (await ctx.resolver.find("round", shortId2(roundId), { entityId: eid })).find((match) => match.id === roundId);
+          const roundMatch = (await ctx.resolver.find("round", shortId(roundId), { entityId: eid })).find((match) => match.id === roundId);
           if (ctx.opts.json) {
             ctx.writer.json(result);
             return;
@@ -5623,7 +5599,7 @@ var init_cap_table = __esm({
             ctx.writer.success(`Valuation submitted for approval: ${result.valuation_id ?? valuationId ?? "OK"}`);
             printReferenceSummary("valuation", result, { showReuseHint: true });
             if (result.meeting_id) {
-              const meetingMatch = (await ctx.resolver.find("meeting", shortId2(String(result.meeting_id)), { entityId: eid })).find((match) => match.id === String(result.meeting_id));
+              const meetingMatch = (await ctx.resolver.find("meeting", shortId(String(result.meeting_id)), { entityId: eid })).find((match) => match.id === String(result.meeting_id));
               if (meetingMatch) {
                 printReferenceSummary("meeting", meetingMatch.raw, { label: "Meeting Ref:" });
               } else {
@@ -5631,7 +5607,7 @@ var init_cap_table = __esm({
               }
             }
             if (result.agenda_item_id) {
-              const agendaMatch = (await ctx.resolver.find("agenda_item", shortId2(String(result.agenda_item_id)), {
+              const agendaMatch = (await ctx.resolver.find("agenda_item", shortId(String(result.agenda_item_id)), {
                 entityId: eid,
                 meetingId: result.meeting_id ? String(result.meeting_id) : void 0
               })).find((match) => match.id === String(result.agenda_item_id));
@@ -5644,11 +5620,10 @@ var init_cap_table = __esm({
           } catch (err) {
             const msg = String(err);
             if (msg.includes("404") || msg.includes("Not found") || msg.includes("not found")) {
-              ctx.writer.error(`Valuation not found. List valuations with: corp cap-table valuations`);
+              throw new Error(`Valuation not found. List valuations with: corp cap-table valuations`);
             } else {
-              ctx.writer.error(`Failed to submit valuation: ${err}`);
+              throw new Error(`Failed to submit valuation: ${err}`);
             }
-            process.exit(1);
           }
         },
         examples: ["corp cap-table submit-valuation <valuation-ref>"]
@@ -5689,11 +5664,10 @@ var init_cap_table = __esm({
           } catch (err) {
             const msg = String(err);
             if (msg.includes("400")) {
-              ctx.writer.error(`Bad request \u2014 a --resolution-id from a board vote may be required. Submit for approval first: corp cap-table submit-valuation <valuation-ref>`);
+              throw new Error(`Bad request \u2014 a --resolution-id from a board vote may be required. Submit for approval first: corp cap-table submit-valuation <valuation-ref>`);
             } else {
-              ctx.writer.error(`Failed to approve valuation: ${err}`);
+              throw new Error(`Failed to approve valuation: ${err}`);
             }
-            process.exit(1);
           }
         },
         examples: ["corp cap-table approve-valuation <valuation-ref>", "corp cap-table approve-valuation --json"]
@@ -6537,13 +6511,11 @@ var init_finance = __esm({
         handler: async (ctx) => {
           const eid = await ctx.resolver.resolveEntity(ctx.opts.entityId);
           if (ctx.opts.amountCents != null && ctx.opts.amountDollars != null) {
-            printError("--amount-cents and --amount-dollars are mutually exclusive. Use one or the other.");
-            process.exit(1);
+            throw new Error("--amount-cents and --amount-dollars are mutually exclusive. Use one or the other.");
           }
           const amountCents = ctx.opts.amountCents ?? (ctx.opts.amountDollars != null ? ctx.opts.amountDollars * 100 : void 0);
           if (amountCents == null) {
-            printError("required: --amount-cents <n> or --amount-dollars <n>");
-            process.exit(1);
+            throw new Error("required: --amount-cents <n> or --amount-dollars <n>");
           }
           const result = await ctx.client.createInvoice({
             entity_id: eid,
@@ -6605,13 +6577,11 @@ var init_finance = __esm({
         handler: async (ctx) => {
           const eid = await ctx.resolver.resolveEntity(ctx.opts.entityId);
           if (ctx.opts.amountCents != null && ctx.opts.amountDollars != null) {
-            printError("--amount-cents and --amount-dollars are mutually exclusive. Use one or the other.");
-            process.exit(1);
+            throw new Error("--amount-cents and --amount-dollars are mutually exclusive. Use one or the other.");
           }
           const amountCents = ctx.opts.amountCents ?? (ctx.opts.amountDollars != null ? ctx.opts.amountDollars * 100 : void 0);
           if (amountCents == null) {
-            printError("required: --amount-cents <n> or --amount-dollars <n>");
-            process.exit(1);
+            throw new Error("required: --amount-cents <n> or --amount-dollars <n>");
           }
           const method = ctx.opts.method;
           const result = await ctx.client.submitPayment({
@@ -6923,7 +6893,17 @@ var init_finance = __esm({
             ctx.writer.json(result);
             return;
           }
-          printJson(result);
+          if (result && typeof result === "object" && !Array.isArray(result)) {
+            const rec = result;
+            const lines = Object.entries(rec).map(([key, val]) => {
+              const label = key.replace(/_/g, " ").replace(/\b\w/g, (ch) => ch.toUpperCase());
+              const formatted = typeof val === "object" ? JSON.stringify(val) : String(val ?? "");
+              return `${label}: ${formatted}`;
+            });
+            ctx.writer.panel("Financial Statements", "green", lines);
+          } else {
+            ctx.writer.json(result);
+          }
         },
         examples: ["corp finance statements", "corp finance statements --json"]
       }
@@ -7427,7 +7407,7 @@ var init_governance = __esm({
             }
           }
         },
-        examples: ["corp governance vote <meeting-ref> <item-ref> --voter for --vote for"]
+        examples: ["corp governance vote <meeting-ref> <item-ref> --voter <contact-ref> --vote for"]
       },
       // --- governance notice <meeting-ref> ---
       {
@@ -7513,7 +7493,7 @@ var init_governance = __esm({
         dryRun: true,
         args: [{ name: "meeting-ref", required: true, description: "Meeting reference" }],
         options: [
-          { flags: "--yes, -y", description: "Skip confirmation prompt" }
+          { flags: "--yes -y", description: "Skip confirmation prompt" }
         ],
         handler: async (ctx) => {
           const meetingRef = ctx.positional[0];
@@ -7886,7 +7866,7 @@ var init_governance = __esm({
       },
       {
         name: "governance-bodies create",
-        description: "List all governance bodies",
+        description: "Create a governance body",
         route: { method: "POST", path: "/v1/governance-bodies" },
         options: [
           { flags: "--body-type <body-type>", description: "The type of governance body.", required: true, choices: ["board_of_directors", "llc_member_vote"] },
@@ -7895,7 +7875,7 @@ var init_governance = __esm({
           { flags: "--voting-method <voting-method>", description: "How votes are counted.", required: true, choices: ["per_capita", "per_unit"] }
         ],
         examples: ["corp governance-bodies --body-type board_of_directors --name majority --quorum-rule majority --voting-method per_capita"],
-        successTemplate: "Governance Bodies created"
+        successTemplate: "Governance body created"
       },
       {
         name: "governance-seats scan-expired",
@@ -7903,7 +7883,7 @@ var init_governance = __esm({
         route: { method: "POST", path: "/v1/governance-seats/scan-expired" },
         entity: true,
         examples: ["corp governance-seats scan-expired"],
-        successTemplate: "Scan Expired created"
+        successTemplate: "Expired seats scanned"
       },
       {
         name: "governance-seats resign",
@@ -7912,7 +7892,7 @@ var init_governance = __esm({
         entity: true,
         args: [{ name: "seat-id", required: true, description: "Governance seat ID" }],
         examples: ["corp governance-seats resign <seat-id>"],
-        successTemplate: "Resign created"
+        successTemplate: "Seat resigned"
       },
       {
         name: "governance audit-checkpoints",
@@ -8003,7 +7983,7 @@ var init_governance = __esm({
           { flags: "--metadata <metadata>", description: "Additional metadata (JSON)" }
         ],
         examples: ["corp governance evaluate --intent-type 'intent-type'", "corp governance evaluate --json"],
-        successTemplate: "Evaluate created"
+        successTemplate: "Governance evaluated"
       },
       {
         name: "governance report-incident",
@@ -8155,12 +8135,10 @@ var init_documents = __esm({
           try {
             resolvedDocumentId = await ctx.resolver.resolveDocument(eid, docRef);
           } catch {
-            printError(
+            throw new Error(
               `Could not resolve '${docRef}' as a document. If you just generated a contract, use the document_id from the generate output, not @last (which may reference the contract_id).
   List documents with: corp documents`
             );
-            process.exit(1);
-            return;
           }
           const result = await ctx.client.getSigningLink(resolvedDocumentId, eid);
           const shareUrl = formatSigningLink(resolvedDocumentId, result);
@@ -8307,7 +8285,7 @@ var init_documents = __esm({
           } catch (err) {
             const msg = String(err);
             if (template === "employment_offer" && (msg.includes("base_salary") || msg.includes("required"))) {
-              printError(
+              throw new Error(
                 `Failed to generate employment_offer: ${msg}
   Hint: employment_offer requires base_salary. Use:
     --base-salary 150000
@@ -8316,16 +8294,15 @@ var init_documents = __esm({
     bonus_terms, equity_terms, benefits_summary, governing_law`
               );
             } else if (template === "safe_agreement" && (msg.includes("purchase_amount") || msg.includes("investment_amount") || msg.includes("valuation_cap") || msg.includes("investor_notice") || msg.includes("required"))) {
-              printError(
+              throw new Error(
                 `Failed to generate safe_agreement: ${msg}
   Hint: safe_agreement requires purchase_amount, valuation_cap, and investor_notice_address. Use:
     --param purchase_amount=50000000 --param valuation_cap=10000000
     --param investor_notice_address="123 Main St, City, ST 12345"`
               );
             } else {
-              printError(`Failed to generate contract: ${err}`);
+              throw new Error(`Failed to generate contract: ${err}`);
             }
-            process.exit(1);
           }
         },
         produces: { kind: "document" },
@@ -8345,8 +8322,7 @@ var init_documents = __esm({
         handler: async (ctx) => {
           const documentId = ctx.opts.definitionId ?? ctx.opts.documentId;
           if (!documentId || documentId.trim().length === 0) {
-            printError("preview-pdf requires --definition-id (or deprecated alias --document-id)");
-            process.exit(1);
+            throw new Error("preview-pdf requires --definition-id (or deprecated alias --document-id)");
           }
           const eid = await ctx.resolver.resolveEntity(ctx.opts.entityId);
           await ctx.client.validatePreviewPdf(eid, documentId);
@@ -8426,7 +8402,7 @@ var init_compliance = __esm({
       // --- tax filings ---
       {
         name: "tax filings",
-        description: "Create a tax filing record",
+        description: "List tax filing records",
         route: { method: "GET", path: "/v1/entities/{eid}/tax-filings" },
         entity: true,
         display: {
@@ -8487,7 +8463,10 @@ var init_compliance = __esm({
         },
         produces: { kind: "tax_filing" },
         successTemplate: "Tax filing created",
-        examples: ["corp tax file --year 'year'"]
+        examples: [
+          "corp tax file --type 1120 --year 2025",
+          "corp tax file --type 83b --year 2025 --filer-contact-id @last:contact"
+        ]
       },
       // --- tax deadlines ---
       {
@@ -8551,15 +8530,21 @@ var init_compliance = __esm({
         },
         produces: { kind: "deadline" },
         successTemplate: "Deadline tracked",
-        examples: ["corp tax deadline --type 'type' --due-date 'date' --description 'desc'", "corp tax deadline --json"]
+        examples: [
+          'corp tax deadline --type annual_report --due-date 2026-03-31 --description "Delaware annual report due"',
+          'corp tax deadline --type annual_report --due-date 2026-03-31 --description "Delaware annual report" --recurrence annual'
+        ]
       },
       // ── Auto-generated from OpenAPI ──────────────────────────────
       {
         name: "compliance escalations-scan",
         description: "Scan for compliance issues and create escalations",
         route: { method: "POST", path: "/v1/compliance/escalations/scan" },
-        examples: ["corp compliance escalations-scan"],
-        successTemplate: "Escalations Scan created"
+        examples: [
+          "corp compliance escalations-scan",
+          "corp compliance escalations-scan --json"
+        ],
+        successTemplate: "Escalation scan complete"
       },
       {
         name: "compliance escalations-resolve-with-evidence",
@@ -8574,7 +8559,10 @@ var init_compliance = __esm({
           { flags: "--resolve-incident", description: "Resolve Incident" },
           { flags: "--resolve-obligation", description: "Resolve Obligation" }
         ],
-        examples: ["corp compliance escalations-resolve-with-evidence <escalation-id>", "corp compliance escalations-resolve-with-evidence --json"],
+        examples: [
+          "corp compliance escalations-resolve-with-evidence esc_01hx9k3n2p4q7r8s9t0uvwxyz --evidence-type filing --filing-reference DE-2026-0042",
+          'corp compliance escalations-resolve-with-evidence esc_01hx9k3n2p4q7r8s9t0uvwxyz --resolve-incident --notes "Filed on time"'
+        ],
         successTemplate: "Escalations Resolve With Evidence created"
       },
       {
@@ -8591,7 +8579,10 @@ var init_compliance = __esm({
           { flags: "--provides-tools <provides-tools>", description: "Provides Tools" },
           { flags: "--state <state>", description: "State" }
         ],
-        examples: ["corp contractors classify --contractor-name 'contractor-name'", "corp contractors classify --json"],
+        examples: [
+          'corp contractors classify --contractor-name "Jane Doe" --state CA --hours-per-week 20',
+          'corp contractors classify --contractor-name "Acme Services LLC" --duration-months 6 --exclusive-client false'
+        ],
         successTemplate: "Classify created"
       },
       {
@@ -8605,7 +8596,10 @@ var init_compliance = __esm({
           { flags: "--recurrence <recurrence>", description: "Recurrence pattern for a deadline.", choices: ["one_time", "monthly", "quarterly", "annual"] },
           { flags: "--severity <severity>", description: "Risk severity of missing a deadline.", choices: ["low", "medium", "high", "critical"] }
         ],
-        examples: ["corp deadlines --deadline-type 'deadline-type' --description 'description' --due-date one_time", "corp deadlines --json"],
+        examples: [
+          'corp deadlines --deadline-type annual_report --description "Delaware annual report" --due-date 2026-03-31 --recurrence annual',
+          'corp deadlines --deadline-type tax_filing --description "Q1 estimated taxes" --due-date 2026-04-15 --severity high'
+        ],
         successTemplate: "Deadlines created"
       },
       {
@@ -8625,7 +8619,10 @@ var init_compliance = __esm({
           { flags: "--document-type <document-type>", description: "Type of document required", required: true },
           { flags: "--tax-year <tax-year>", description: "Tax Year", required: true, type: "int" }
         ],
-        examples: ["corp tax filings --document-type 'document-type' --tax-year 'tax-year'"],
+        examples: [
+          "corp tax create-filing --document-type 1120 --tax-year 2025",
+          "corp tax create-filing --document-type 1065 --tax-year 2025 --json"
+        ],
         successTemplate: "Filings created"
       }
     ];
@@ -8729,7 +8726,10 @@ var init_agents = __esm({
           }
           console.log(chalk9.magenta("\u2500".repeat(40)));
         },
-        examples: ["corp agents show"]
+        examples: [
+          "corp agents show @last:agent",
+          "corp agents show agt_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ]
       },
       // --- agents create ---
       {
@@ -8759,19 +8759,21 @@ var init_agents = __esm({
           } catch (err) {
             const msg = String(err);
             if (msg.includes("409") || msg.includes("conflict") || msg.includes("already exists")) {
-              printError(
+              throw new Error(
                 `Agent name '${ctx.opts.name}' is already in use (deleted agents still reserve their name).
   Choose a different name, e.g.: corp agents create --name '...-v2' --prompt '...'`
               );
             } else {
-              printError(`Failed to create agent: ${err}`);
+              throw new Error(`Failed to create agent: ${err}`);
             }
-            process.exit(1);
           }
         },
         produces: { kind: "agent" },
         successTemplate: "Agent created: {name}",
-        examples: ["corp agents create --name 'name' --prompt 'prompt'", "corp agents create --json"]
+        examples: [
+          'corp agents create --name "bookkeeper" --prompt "You manage accounts payable for the company"',
+          'corp agents create --name "compliance-monitor" --prompt "You monitor regulatory deadlines" --model gpt-4o'
+        ]
       },
       // --- agents pause <agent-ref> ---
       {
@@ -8785,7 +8787,10 @@ var init_agents = __esm({
           const result = await ctx.client.updateAgent(resolvedAgentId, { status: "paused" });
           ctx.writer.writeResult(result, `Agent ${resolvedAgentId} paused.`, { jsonOnly: ctx.opts.json });
         },
-        examples: ["corp agents pause <agent-ref>"]
+        examples: [
+          "corp agents pause @last:agent",
+          "corp agents pause agt_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ]
       },
       // --- agents resume <agent-ref> ---
       {
@@ -8802,18 +8807,20 @@ var init_agents = __esm({
           } catch (err) {
             const msg = String(err);
             if (msg.includes("409") || msg.includes("disabled") || msg.includes("deleted")) {
-              printError(
+              throw new Error(
                 `Cannot resume agent ${agentRef}: the agent may be disabled or deleted.
   Disabled/deleted agents cannot be resumed. Create a new agent instead:
     corp agents create --name '...' --prompt '...'`
               );
             } else {
-              printError(`Failed to resume agent: ${err}`);
+              throw new Error(`Failed to resume agent: ${err}`);
             }
-            process.exit(1);
           }
         },
-        examples: ["corp agents resume <agent-ref>"]
+        examples: [
+          "corp agents resume @last:agent",
+          "corp agents resume agt_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ]
       },
       // --- agents delete <agent-ref> ---
       {
@@ -8822,7 +8829,7 @@ var init_agents = __esm({
         route: { method: "DELETE", path: "/v1/agents/{pos}" },
         args: [{ name: "agent-ref", required: true, description: "Agent reference" }],
         options: [
-          { flags: "--yes, -y", description: "Skip confirmation prompt" }
+          { flags: "--yes -y", description: "Skip confirmation prompt" }
         ],
         handler: async (ctx) => {
           const agentRef = ctx.positional[0];
@@ -8840,7 +8847,10 @@ var init_agents = __esm({
           const result = await ctx.client.deleteAgent(resolvedAgentId);
           ctx.writer.writeResult(result, `Agent ${resolvedAgentId} deleted.`, { jsonOnly: ctx.opts.json });
         },
-        examples: ["corp agents delete <agent-ref>", "corp agents delete --json"]
+        examples: [
+          "corp agents delete @last:agent",
+          "corp agents delete agt_01hx9k3n2p4q7r8s9t0uvwxyz --yes"
+        ]
       },
       // --- agents message <agent-ref> ---
       {
@@ -8862,17 +8872,19 @@ var init_agents = __esm({
           } catch (err) {
             const msg = String(err);
             if (msg.includes("409")) {
-              printError(
+              throw new Error(
                 `Cannot message agent: the agent must be active or paused (not disabled/deleted).
   Check agent status: corp agents show ` + agentRef + "\n  Resume a paused agent: corp agents resume " + agentRef
               );
             } else {
-              printError(`Failed to send message: ${err}`);
+              throw new Error(`Failed to send message: ${err}`);
             }
-            process.exit(1);
           }
         },
-        examples: ["corp agents message <agent-ref>", "corp agents message --json"]
+        examples: [
+          `corp agents message @last:agent --body "Process this month's invoices"`,
+          "corp agents message agt_01hx9k3n2p4q7r8s9t0uvwxyz --body-file ./task.txt"
+        ]
       },
       // --- agents skill <agent-ref> ---
       {
@@ -8901,7 +8913,10 @@ var init_agents = __esm({
           });
           ctx.writer.writeResult(result, `Skill '${ctx.opts.name}' added to agent ${resolvedAgentId}.`, { jsonOnly: ctx.opts.json });
         },
-        examples: ["corp agents skill <agent-ref> --name 'name' --description 'desc'", "corp agents skill --json"]
+        examples: [
+          'corp agents skill @last:agent --name invoice-processing --description "Process AP invoices from email"',
+          'corp agents skill agt_01hx9k3n2p4q7r8s9t0uvwxyz --name bookkeeping --description "Reconcile ledger entries" --instructions-file ./skills/bookkeeping.txt'
+        ]
       },
       // --- agents execution <agent-ref> <execution-id> ---
       {
@@ -8932,7 +8947,10 @@ var init_agents = __esm({
           if (result.completed_at) console.log(`  ${chalk9.bold("Completed:")} ${result.completed_at}`);
           console.log(chalk9.magenta("\u2500".repeat(40)));
         },
-        examples: ["corp agents execution"]
+        examples: [
+          "corp agents execution @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp agents execution agt_01hx9k3n2p4q7r8s9t0uvwxyz exc_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ]
       },
       // --- agents execution-result <agent-ref> <execution-id> ---
       {
@@ -8956,7 +8974,10 @@ var init_agents = __esm({
           ctx.writer.success(`Result for execution ${executionId}:`);
           printJson(result);
         },
-        examples: ["corp agents execution-result"]
+        examples: [
+          "corp agents execution-result @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp agents execution-result @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       },
       // --- agents kill <agent-ref> <execution-id> ---
       {
@@ -8984,7 +9005,10 @@ var init_agents = __esm({
           const result = await ctx.client.killAgentExecution(resolvedAgentId, executionId);
           ctx.writer.writeResult(result, `Execution ${executionId} killed.`, { jsonOnly: ctx.opts.json });
         },
-        examples: ["corp agents kill <agent-ref> <execution-id>", "corp agents kill --json"]
+        examples: [
+          "corp agents kill @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp agents kill @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz --yes"
+        ]
       },
       // ── Auto-generated from OpenAPI ──────────────────────────────
       {
@@ -8993,7 +9017,10 @@ var init_agents = __esm({
         route: { method: "GET", path: "/v1/agents/{pos}/executions/{pos2}/logs" },
         args: [{ name: "agent-id", required: true, description: "Agent ID", posKind: "agent" }, { name: "execution-id", required: true, description: "Agent execution ID" }],
         display: { title: "Execution Logs", cols: ["@timestamp>Time", "level>Level", "message>Message"] },
-        examples: ["corp agents executions-logs"]
+        examples: [
+          "corp agents executions-logs @last:agent exc_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp agents executions-logs agt_01hx9k3n2p4q7r8s9t0uvwxyz exc_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       },
       // ── Auto-generated from OpenAPI ──────────────────────────────
       {
@@ -9002,7 +9029,10 @@ var init_agents = __esm({
         route: { method: "GET", path: "/v1/agents/{pos}/messages/{pos2}" },
         args: [{ name: "agent-id", required: true, description: "Agent ID", posKind: "agent" }, { name: "message-id", required: true, description: "Message Id" }],
         display: { title: "Agent Message" },
-        examples: ["corp agents messages"]
+        examples: [
+          "corp agents messages @last:agent msg_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp agents messages @last:agent msg_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       }
     ];
   }
@@ -9129,8 +9159,7 @@ var init_work_items = __esm({
           const eid = await ctx.resolver.resolveEntity(ctx.opts.entityId);
           const category = ctx.opts.category;
           if (!category) {
-            printError("required option '--category <category>' not specified");
-            process.exit(1);
+            throw new Error("required option '--category <category>' not specified");
           }
           const data = { title: ctx.opts.title, category };
           if (ctx.opts.description) data.description = ctx.opts.description;
@@ -9168,8 +9197,7 @@ var init_work_items = __esm({
           const resolvedWorkItemId = await ctx.resolver.resolveWorkItem(eid, itemRef);
           const claimedBy = ctx.opts.by ?? ctx.opts.claimer;
           if (!claimedBy) {
-            printError("required option '--by <name>' not specified");
-            process.exit(1);
+            throw new Error("required option '--by <name>' not specified");
           }
           const data = {
             claimed_by_actor: await ctx.resolver.resolveWorkItemActor(eid, claimedBy)
@@ -9199,8 +9227,7 @@ var init_work_items = __esm({
           const resolvedWorkItemId = await ctx.resolver.resolveWorkItem(eid, itemRef);
           const completedBy = ctx.opts.by ?? ctx.opts.completedBy;
           if (!completedBy) {
-            printError("required option '--by <name>' not specified");
-            process.exit(1);
+            throw new Error("required option '--by <name>' not specified");
           }
           const data = {
             completed_by_actor: await ctx.resolver.resolveWorkItemActor(eid, completedBy)
@@ -9236,7 +9263,7 @@ var init_work_items = __esm({
         entity: true,
         args: [{ name: "item-ref", required: true, description: "Work item reference" }],
         options: [
-          { flags: "--yes, -y", description: "Skip confirmation prompt" }
+          { flags: "--yes -y", description: "Skip confirmation prompt" }
         ],
         handler: async (ctx) => {
           const itemRef = ctx.positional[0];
@@ -9289,25 +9316,6 @@ var init_services = __esm({
         },
         examples: ["corp services", "corp services --json"]
       },
-      // --- services catalog ---
-      {
-        name: "services catalog",
-        description: "List the service catalog",
-        route: { method: "GET", path: "/v1/services/catalog" },
-        display: {
-          title: "Service Catalog",
-          cols: ["name>Name", "slug>Slug", "$price_cents>Price", "#service_id|id>ID"]
-        },
-        handler: async (ctx) => {
-          const items = await ctx.client.listServiceCatalog();
-          if (ctx.opts.json) {
-            ctx.writer.json(items);
-            return;
-          }
-          printServiceCatalogTable(items);
-        },
-        examples: ["corp services catalog"]
-      },
       // --- services list ---
       {
         name: "services list",
@@ -9470,7 +9478,7 @@ var init_services = __esm({
       },
       {
         name: "services requests",
-        description: "Submit a new service request",
+        description: "View a service request by ID",
         route: { method: "GET", path: "/v1/services/requests/{pos}" },
         entity: true,
         args: [{ name: "request-id", required: true, description: "Document request ID", posKind: "service_request" }],
@@ -9483,7 +9491,7 @@ var init_services = __esm({
         route: { method: "POST", path: "/v1/services/requests/{pos}/cancel" },
         args: [{ name: "request-id", required: true, description: "Document request ID", posKind: "service_request" }],
         examples: ["corp services requests-cancel <request-id>"],
-        successTemplate: "Requests Cancel created"
+        successTemplate: "Request cancelled"
       },
       {
         name: "services requests-checkout",
@@ -9491,7 +9499,7 @@ var init_services = __esm({
         route: { method: "POST", path: "/v1/services/requests/{pos}/checkout" },
         args: [{ name: "request-id", required: true, description: "Document request ID", posKind: "service_request" }],
         examples: ["corp services requests-checkout <request-id>"],
-        successTemplate: "Requests Checkout created"
+        successTemplate: "Checkout started"
       },
       {
         name: "services requests-fulfill",
@@ -9822,7 +9830,7 @@ async function serveCommand(opts) {
     process.exit(1);
   }
   const port = parseInt(opts.port, 10);
-  if (isNaN(port) || port > 65535) {
+  if (isNaN(port) || port < 1 || port > 65535) {
     console.error(`Error: Invalid port "${opts.port}"`);
     process.exit(1);
   }
@@ -10096,7 +10104,7 @@ async function demoCommand(opts) {
       entity_id: entityId,
       template_type: "nda",
       counterparty_name: "Example Counterparty",
-      effective_date: "2026-03-12",
+      effective_date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
       parameters: {}
     });
     await resolver.stabilizeRecord("document", contract, entityId);
@@ -10615,6 +10623,66 @@ var init_feedback = __esm({
   }
 });
 
+// src/resource-kinds.ts
+var KINDS, ENTITY_SCOPED_KINDS;
+var init_resource_kinds = __esm({
+  "src/resource-kinds.ts"() {
+    "use strict";
+    KINDS = /* @__PURE__ */ new Set([
+      "entity",
+      "contact",
+      "share_transfer",
+      "invoice",
+      "bank_account",
+      "payment",
+      "payroll_run",
+      "distribution",
+      "reconciliation",
+      "tax_filing",
+      "deadline",
+      "classification",
+      "body",
+      "meeting",
+      "seat",
+      "agenda_item",
+      "resolution",
+      "document",
+      "work_item",
+      "agent",
+      "valuation",
+      "safe_note",
+      "instrument",
+      "share_class",
+      "round"
+    ]);
+    ENTITY_SCOPED_KINDS = /* @__PURE__ */ new Set([
+      "contact",
+      "share_transfer",
+      "invoice",
+      "bank_account",
+      "payment",
+      "payroll_run",
+      "distribution",
+      "reconciliation",
+      "tax_filing",
+      "deadline",
+      "classification",
+      "body",
+      "meeting",
+      "seat",
+      "agenda_item",
+      "resolution",
+      "document",
+      "work_item",
+      "valuation",
+      "safe_note",
+      "instrument",
+      "share_class",
+      "round"
+    ]);
+  }
+});
+
 // src/commands/resolve.ts
 var resolve_exports = {};
 __export(resolve_exports, {
@@ -10721,7 +10789,7 @@ async function resolveCommand(kind, ref, opts) {
       kind: normalizedKind,
       input: ref,
       resolved_id: resolvedId,
-      short_id: shortId2(resolvedId),
+      short_id: shortId(resolvedId),
       ...entityId ? { entity_id: entityId } : {},
       ...bodyId ? { body_id: bodyId } : {},
       ...meetingId ? { meeting_id: meetingId } : {}
@@ -10743,7 +10811,6 @@ function requiredMeeting(meetingId, kind) {
   }
   return meetingId;
 }
-var KINDS, ENTITY_SCOPED_KINDS;
 var init_resolve = __esm({
   "src/commands/resolve.ts"() {
     "use strict";
@@ -10751,58 +10818,7 @@ var init_resolve = __esm({
     init_api_client();
     init_output();
     init_references();
-    KINDS = /* @__PURE__ */ new Set([
-      "entity",
-      "contact",
-      "share_transfer",
-      "invoice",
-      "bank_account",
-      "payment",
-      "payroll_run",
-      "distribution",
-      "reconciliation",
-      "tax_filing",
-      "deadline",
-      "classification",
-      "body",
-      "meeting",
-      "seat",
-      "agenda_item",
-      "resolution",
-      "document",
-      "work_item",
-      "agent",
-      "valuation",
-      "safe_note",
-      "instrument",
-      "share_class",
-      "round"
-    ]);
-    ENTITY_SCOPED_KINDS = /* @__PURE__ */ new Set([
-      "contact",
-      "share_transfer",
-      "invoice",
-      "bank_account",
-      "payment",
-      "payroll_run",
-      "distribution",
-      "reconciliation",
-      "tax_filing",
-      "deadline",
-      "classification",
-      "body",
-      "meeting",
-      "seat",
-      "agenda_item",
-      "resolution",
-      "document",
-      "work_item",
-      "valuation",
-      "safe_note",
-      "instrument",
-      "share_class",
-      "round"
-    ]);
+    init_resource_kinds();
   }
 });
 
@@ -10815,7 +10831,7 @@ import chalk14 from "chalk";
 import Table5 from "cli-table3";
 async function findCommand(kind, query, opts) {
   const normalizedKind = kind.trim().toLowerCase();
-  if (!KINDS2.has(normalizedKind)) {
+  if (!KINDS.has(normalizedKind)) {
     printError(`Unsupported find kind: ${kind}`);
     process.exit(1);
   }
@@ -10823,7 +10839,7 @@ async function findCommand(kind, query, opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   const resolver = new ReferenceResolver(client, cfg);
   try {
-    const entityId = ENTITY_SCOPED_KINDS2.has(normalizedKind) || opts.entityId || opts.bodyId || opts.meetingId ? await resolver.resolveEntity(opts.entityId) : void 0;
+    const entityId = ENTITY_SCOPED_KINDS.has(normalizedKind) || opts.entityId || opts.bodyId || opts.meetingId ? await resolver.resolveEntity(opts.entityId) : void 0;
     const bodyId = entityId && opts.bodyId ? await resolver.resolveBody(entityId, opts.bodyId) : void 0;
     const meetingId = entityId && opts.meetingId ? await resolver.resolveMeeting(entityId, opts.meetingId, bodyId) : void 0;
     const matches = await resolver.find(normalizedKind, query, { entityId, bodyId, meetingId });
@@ -10870,7 +10886,6 @@ async function findCommand(kind, query, opts) {
     process.exit(1);
   }
 }
-var KINDS2, ENTITY_SCOPED_KINDS2;
 var init_find = __esm({
   "src/commands/find.ts"() {
     "use strict";
@@ -10878,58 +10893,7 @@ var init_find = __esm({
     init_api_client();
     init_output();
     init_references();
-    KINDS2 = /* @__PURE__ */ new Set([
-      "entity",
-      "contact",
-      "share_transfer",
-      "invoice",
-      "bank_account",
-      "payment",
-      "payroll_run",
-      "distribution",
-      "reconciliation",
-      "tax_filing",
-      "deadline",
-      "classification",
-      "body",
-      "meeting",
-      "seat",
-      "agenda_item",
-      "resolution",
-      "document",
-      "work_item",
-      "agent",
-      "valuation",
-      "safe_note",
-      "instrument",
-      "share_class",
-      "round"
-    ]);
-    ENTITY_SCOPED_KINDS2 = /* @__PURE__ */ new Set([
-      "contact",
-      "share_transfer",
-      "invoice",
-      "bank_account",
-      "payment",
-      "payroll_run",
-      "distribution",
-      "reconciliation",
-      "tax_filing",
-      "deadline",
-      "classification",
-      "body",
-      "meeting",
-      "seat",
-      "agenda_item",
-      "resolution",
-      "document",
-      "work_item",
-      "valuation",
-      "safe_note",
-      "instrument",
-      "share_class",
-      "round"
-    ]);
+    init_resource_kinds();
   }
 });
 
@@ -11273,7 +11237,7 @@ var init_admin = __esm({
           process.stderr.write(
             'Approvals are managed through governance meetings and execution intents.\nUse these commands to manage approvals:\n\n  Board approval via meeting vote:\n    corp governance convene --body <body> --type board_meeting --title "Approve X"\n    corp governance vote <meeting> <item> --voter <contact> --vote for\n\n  Written consent (no meeting needed):\n    corp governance written-consent --body <body> --title "Approve X" --description "..."\n\n  View pending items:\n    corp governance meetings <body>        # see scheduled meetings\n    corp governance agenda-items <meeting>  # see items awaiting votes\n    corp cap-table valuations               # see pending valuations\n'
           );
-          process.exit(1);
+          process.exit(0);
         },
         examples: ["corp approvals"]
       },
@@ -11401,7 +11365,7 @@ var init_admin = __esm({
           { flags: "--ttl-seconds <ttl-seconds>", description: "Token TTL in seconds (60-86400)", type: "int" }
         ],
         examples: ["corp auth token-exchange --api-key 'api-key'", "corp auth token-exchange --json"],
-        successTemplate: "Token Exchange created"
+        successTemplate: "Token exchanged"
       },
       {
         name: "ssh-keys",
@@ -11453,7 +11417,7 @@ var init_admin = __esm({
           { flags: "--kind <kind>", description: "Resource kind", required: true, choices: ["entity", "contact", "share_transfer", "invoice", "bank_account", "payment", "payroll_run", "distribution", "reconciliation", "tax_filing", "deadline", "classification", "body", "meeting", "seat", "agenda_item", "resolution", "document", "work_item", "agent", "valuation", "safe_note", "instrument", "share_class", "round"] }
         ],
         examples: ["corp references sync --items 'items' --kind 'kind'"],
-        successTemplate: "Sync created"
+        successTemplate: "References synced"
       },
       // ── Auto-generated from OpenAPI ──────────────────────────────
       {
@@ -11576,7 +11540,10 @@ var init_execution = __esm({
           { flags: "--max-amount-cents <max-amount-cents>", description: "Maximum authorized amount in cents" },
           { flags: "--scope <scope>", description: "Authorization scope", required: true }
         ],
-        examples: ["corp execution approval-artifacts --approver-identity 'approver-identity' --channel 'channel' --intent-type 'intent-type' --scope 'scope'", "corp execution approval-artifacts --json"],
+        examples: [
+          'corp execution approval-artifacts --approver-identity "alice@acme.com" --channel board_vote --intent-type equity_grant --scope entity',
+          'corp execution approval-artifacts --approver-identity "alice@acme.com" --channel written_consent --intent-type equity_grant --scope entity --approved-at 2026-03-01T00:00:00Z'
+        ],
         successTemplate: "Approval Artifacts created"
       },
       {
@@ -11590,7 +11557,10 @@ var init_execution = __esm({
           { flags: "--intent-type <intent-type>", description: "Type of intent", required: true },
           { flags: "--metadata <metadata>", description: "Additional metadata (JSON)" }
         ],
-        examples: ["corp execution intents --description 'description' --intent-type 'intent-type'", "corp execution intents --json"],
+        examples: [
+          'corp execution intents --description "Issue 10,000 options to Alice" --intent-type equity_grant --authority-tier tier_2',
+          'corp execution intents --description "Wire $50,000 to vendor" --intent-type payment --authority-tier tier_1'
+        ],
         successTemplate: "Intents created"
       },
       {
@@ -11606,7 +11576,10 @@ var init_execution = __esm({
           { flags: "--intent-id <intent-id>", description: "Execution intent ID" },
           { flags: "--obligation-type <obligation-type>", description: "Type of obligation", required: true }
         ],
-        examples: ["corp execution obligations --assignee-type internal --description 'description' --obligation-type 'obligation-type'", "corp execution obligations --json"],
+        examples: [
+          'corp execution obligations --assignee-type human --description "Sign equity grant agreement" --obligation-type signature',
+          'corp execution obligations --assignee-type internal --description "File 83(b) election" --obligation-type document --due-date 2026-04-15'
+        ],
         successTemplate: "Obligations created"
       },
       {
@@ -11616,7 +11589,10 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "packet-id", required: true, description: "Document packet ID" }],
         display: { title: "Execution Packets", cols: ["finalized_at>Finalized At", "items>Items", "manifest_hash>Manifest Hash", "required_signers>Required Signers", "@created_at>Created At", "#entity_id>ID"] },
-        examples: ["corp execution packets", "corp execution packets --json"]
+        examples: [
+          "corp execution packets pkt_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp execution packets pkt_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       },
       {
         name: "intents authorize",
@@ -11625,7 +11601,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "intent-id", required: true, description: "Execution intent ID" }],
         examples: ["corp intents authorize <intent-id>"],
-        successTemplate: "Authorize created"
+        successTemplate: "Intent authorized"
       },
       {
         name: "intents bind-approval-artifact",
@@ -11635,7 +11611,9 @@ var init_execution = __esm({
         options: [
           { flags: "--approval-artifact-id <approval-artifact-id>", description: "Approval artifact ID to bind", required: true }
         ],
-        examples: ["corp intents bind-approval-artifact <intent-id> --approval-artifact-id 'approval-artifact-id'"],
+        examples: [
+          "corp intents bind-approval-artifact @last:intent --approval-artifact-id art_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ],
         successTemplate: "Bind Approval Artifact created"
       },
       {
@@ -11646,7 +11624,9 @@ var init_execution = __esm({
         options: [
           { flags: "--request-id <request-id>", description: "Document request ID", required: true }
         ],
-        examples: ["corp intents bind-document-request <intent-id> --request-id 'request-id'"],
+        examples: [
+          "corp intents bind-document-request @last:intent --request-id req_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ],
         successTemplate: "Bind Document Request created"
       },
       {
@@ -11656,7 +11636,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "intent-id", required: true, description: "Execution intent ID" }],
         examples: ["corp intents cancel <intent-id>"],
-        successTemplate: "Cancel created"
+        successTemplate: "Intent cancelled"
       },
       {
         name: "intents evaluate",
@@ -11665,7 +11645,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "intent-id", required: true, description: "Execution intent ID" }],
         examples: ["corp intents evaluate <intent-id>"],
-        successTemplate: "Evaluate created"
+        successTemplate: "Intent evaluated"
       },
       {
         name: "intents execute",
@@ -11674,7 +11654,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "intent-id", required: true, description: "Execution intent ID" }],
         examples: ["corp intents execute <intent-id>"],
-        successTemplate: "Execute created"
+        successTemplate: "Intent executed"
       },
       {
         name: "intents receipts",
@@ -11683,7 +11663,10 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "intent-id", required: true, description: "Execution intent ID" }],
         display: { title: "Intents Receipts", cols: ["executed_at>Executed At", "idempotency_key>Idempotency Key", "request_hash>Request Hash", "response_hash>Response Hash", "@created_at>Created At", "#intent_id>ID"] },
-        examples: ["corp intents receipts", "corp intents receipts --json"]
+        examples: [
+          "corp intents receipts int_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp intents receipts @last:intent --json"
+        ]
       },
       {
         name: "obligations assign",
@@ -11694,21 +11677,26 @@ var init_execution = __esm({
         options: [
           { flags: "--assignee-id <assignee-id>", description: "ID of the party to assign to", required: true }
         ],
-        examples: ["corp obligations assign <obligation-id> --assignee-id 'assignee-id'"],
+        examples: [
+          "corp obligations assign obl_01hx9k3n2p4q7r8s9t0uvwxyz --assignee-id usr_01hx9k3n2p4q7r8s9t0uvwxyz"
+        ],
         successTemplate: "Assign created"
       },
       {
         name: "obligations document-requests",
-        description: "List or create document requests for an obligation",
+        description: "List document requests for an obligation",
         route: { method: "GET", path: "/v1/obligations/{pos}/document-requests" },
         entity: true,
         args: [{ name: "obligation-id", required: true, description: "Obligation ID" }],
         display: { title: "Obligations Document Requests", cols: ["description>Description", "document_type>Document Type", "fulfilled_at>Fulfilled At", "not_applicable_at>Not Applicable At", "@created_at>Created At", "#entity_id>ID"] },
-        examples: ["corp obligations document-requests", "corp obligations document-requests --json"]
+        examples: [
+          "corp obligations document-requests obl_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp obligations document-requests obl_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       },
       {
         name: "obligations create-document-request",
-        description: "List or create document requests for an obligation",
+        description: "Create a document request for an obligation",
         route: { method: "POST", path: "/v1/obligations/{pos}/document-requests" },
         entity: true,
         args: [{ name: "obligation-id", required: true, description: "Obligation ID" }],
@@ -11716,7 +11704,9 @@ var init_execution = __esm({
           { flags: "--description <description>", description: "Description text", required: true },
           { flags: "--document-type <document-type>", description: "Type of document required", required: true }
         ],
-        examples: ["corp obligations document-requests <obligation-id> --description 'description' --document-type 'document-type'"],
+        examples: [
+          'corp obligations create-document-request obl_01hx9k3n2p4q7r8s9t0uvwxyz --description "Signed equity grant agreement" --document-type equity_grant'
+        ],
         successTemplate: "Document Requests created"
       },
       {
@@ -11726,7 +11716,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "obligation-id", required: true, description: "Obligation ID" }],
         examples: ["corp obligations expire <obligation-id>"],
-        successTemplate: "Expire created"
+        successTemplate: "Obligation expired"
       },
       {
         name: "obligations fulfill",
@@ -11735,7 +11725,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "obligation-id", required: true, description: "Obligation ID" }],
         examples: ["corp obligations fulfill <obligation-id>"],
-        successTemplate: "Fulfill created"
+        successTemplate: "Obligation fulfilled"
       },
       {
         name: "obligations waive",
@@ -11744,7 +11734,7 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "obligation-id", required: true, description: "Obligation ID" }],
         examples: ["corp obligations waive <obligation-id>"],
-        successTemplate: "Waive created"
+        successTemplate: "Obligation waived"
       },
       {
         name: "receipts",
@@ -11753,7 +11743,10 @@ var init_execution = __esm({
         entity: true,
         args: [{ name: "receipt-id", required: true, description: "Execution receipt ID" }],
         display: { title: "Receipts", cols: ["executed_at>Executed At", "idempotency_key>Idempotency Key", "request_hash>Request Hash", "response_hash>Response Hash", "@created_at>Created At", "#intent_id>ID"] },
-        examples: ["corp receipts", "corp receipts --json"]
+        examples: [
+          "corp receipts rcp_01hx9k3n2p4q7r8s9t0uvwxyz",
+          "corp receipts rcp_01hx9k3n2p4q7r8s9t0uvwxyz --json"
+        ]
       },
       // ── Human obligations ───────────────────────────────────────────────
       {
@@ -11864,7 +11857,7 @@ var init_treasury = __esm({
         entity: true,
         args: [{ name: "bank-account-id", required: true, description: "Bank account ID", posKind: "bank_account" }],
         examples: ["corp bank-accounts close <bank-account-id>"],
-        successTemplate: "Close created"
+        successTemplate: "Account closed"
       },
       {
         name: "distributions",
@@ -11926,7 +11919,7 @@ var init_treasury = __esm({
       },
       {
         name: "invoices",
-        description: "Create a new invoice",
+        description: "View an invoice by ID",
         route: { method: "GET", path: "/v1/invoices/{pos}" },
         entity: true,
         args: [{ name: "invoice-id", required: true, description: "Invoice ID", posKind: "invoice" }],
@@ -11940,7 +11933,7 @@ var init_treasury = __esm({
         entity: true,
         args: [{ name: "invoice-id", required: true, description: "Invoice ID", posKind: "invoice" }],
         examples: ["corp invoices mark-paid <invoice-id>"],
-        successTemplate: "Mark Paid created"
+        successTemplate: "Invoice marked as paid"
       },
       {
         name: "invoices pay-instructions",
@@ -11958,7 +11951,7 @@ var init_treasury = __esm({
         entity: true,
         args: [{ name: "invoice-id", required: true, description: "Invoice ID", posKind: "invoice" }],
         examples: ["corp invoices send <invoice-id>"],
-        successTemplate: "Send created"
+        successTemplate: "Invoice sent"
       },
       {
         name: "invoices status",
@@ -11976,7 +11969,7 @@ var init_treasury = __esm({
         entity: true,
         args: [{ name: "entry-id", required: true, description: "Journal entry ID" }],
         examples: ["corp journal-entries post <entry-id>"],
-        successTemplate: "Post created"
+        successTemplate: "Journal entry posted"
       },
       {
         name: "journal-entries void",
@@ -11985,7 +11978,7 @@ var init_treasury = __esm({
         entity: true,
         args: [{ name: "entry-id", required: true, description: "Journal entry ID" }],
         examples: ["corp journal-entries void <entry-id>"],
-        successTemplate: "Void created"
+        successTemplate: "Journal entry voided"
       },
       {
         name: "ledger reconcile",
@@ -12026,7 +12019,7 @@ var init_treasury = __esm({
           { flags: "--recipient <recipient>", description: "Recipient", required: true }
         ],
         examples: ["corp payments execute --amount-cents 'amount-cents' --description bank_transfer --recipient 'recipient'", "corp payments execute --json"],
-        successTemplate: "Execute created"
+        successTemplate: "Payment executed"
       },
       {
         name: "payroll runs",
@@ -12038,7 +12031,7 @@ var init_treasury = __esm({
           { flags: "--pay-period-start <pay-period-start>", description: "Pay Period Start", required: true }
         ],
         examples: ["corp payroll runs --pay-period-end 'pay-period-end' --pay-period-start 'pay-period-start'"],
-        successTemplate: "Runs created"
+        successTemplate: "Payroll run created"
       },
       {
         name: "spending-limits",
@@ -12143,7 +12136,7 @@ var init_treasury = __esm({
         route: { method: "POST", path: "/v1/treasury/seed-chart-of-accounts" },
         entity: true,
         options: [
-          { flags: "--template <template>", description: "Template string with {{secret}} placeholders" }
+          { flags: "--template <template>", description: "Chart of accounts template name to seed from" }
         ],
         examples: ["corp treasury seed-chart-of-accounts", "corp treasury seed-chart-of-accounts --json"],
         successTemplate: "Seed Chart Of Accounts created"
@@ -12224,6 +12217,275 @@ var init_branches = __esm({
   }
 });
 
+// src/registry/completions.ts
+function buildTree(commands) {
+  const topLevelMap = /* @__PURE__ */ new Map();
+  const topLevel = [];
+  for (const cmd of commands) {
+    if (cmd.hidden) continue;
+    const parts = cmd.name.split(" ");
+    const opts = ["--json"];
+    if (cmd.entity) opts.push("--entity-id");
+    if (cmd.dryRun) opts.push("--dry-run");
+    for (const o of cmd.options ?? []) {
+      if (o.hidden) continue;
+      const longFlag = o.flags.split(/\s+/).find((f) => f.startsWith("--"));
+      if (longFlag) {
+        opts.push(longFlag.replace(/<[^>]*>|\[[^\]]*\]/, "").trim());
+      }
+    }
+    const node = {
+      name: parts[parts.length - 1],
+      description: cmd.description,
+      options: opts,
+      subcmds: []
+    };
+    if (parts.length === 1) {
+      topLevelMap.set(parts[0], node);
+      topLevel.push(node);
+    } else {
+      const parentName = parts[0];
+      let parent = topLevelMap.get(parentName);
+      if (!parent) {
+        parent = { name: parentName, description: "", options: [], subcmds: [] };
+        topLevelMap.set(parentName, parent);
+        topLevel.push(parent);
+      }
+      parent.subcmds.push(node);
+    }
+  }
+  return topLevel;
+}
+function generateBash(commands) {
+  const tree = buildTree(commands);
+  const lines = [
+    "# corp bash completion",
+    "# Source this file or add to ~/.bash_completion.d/",
+    "#   source <(corp completions --shell bash)",
+    "",
+    "_corp_completions() {",
+    "  local cur prev words cword",
+    "  _init_completion 2>/dev/null || {",
+    "    COMPREPLY=()",
+    '    cur="${COMP_WORDS[COMP_CWORD]}"',
+    '    prev="${COMP_WORDS[COMP_CWORD-1]}"',
+    '    words=("${COMP_WORDS[@]}")',
+    "    cword=$COMP_CWORD",
+    "  }",
+    "",
+    '  local subcommand=""',
+    '  local subsubcommand=""',
+    '  if [[ ${#words[@]} -ge 2 ]]; then subcommand="${words[1]}"; fi',
+    '  if [[ ${#words[@]} -ge 3 ]]; then subsubcommand="${words[2]}"; fi',
+    ""
+  ];
+  const topNames = tree.map((n) => n.name).join(" ");
+  lines.push(`  local top_commands="${topNames}"`);
+  lines.push("");
+  lines.push('  case "$subcommand" in');
+  for (const parent of tree) {
+    if (parent.subcmds.length > 0) {
+      const subNames = parent.subcmds.map((s3) => s3.name).join(" ");
+      lines.push(`    ${parent.name})`);
+      lines.push(`      local ${parent.name}_subcmds="${subNames}"`);
+      lines.push(`      case "$subsubcommand" in`);
+      for (const child of parent.subcmds) {
+        const childFlags = child.options.join(" ");
+        lines.push(`        ${child.name})`);
+        lines.push(`          COMPREPLY=( $(compgen -W "${childFlags}" -- "$cur") )`);
+        lines.push("          return 0 ;;");
+      }
+      const parentFlags = parent.options.join(" ");
+      lines.push("        *)");
+      if (parent.options.length > 0) {
+        lines.push(`          COMPREPLY=( $(compgen -W "${parent.subcmds.map((s3) => s3.name).join(" ")} ${parentFlags}" -- "$cur") )`);
+      } else {
+        lines.push(`          COMPREPLY=( $(compgen -W "$${parent.name}_subcmds" -- "$cur") )`);
+      }
+      lines.push("          return 0 ;;");
+      lines.push("      esac ;;");
+    } else {
+      const flags = parent.options.join(" ");
+      lines.push(`    ${parent.name})`);
+      lines.push(`      COMPREPLY=( $(compgen -W "${flags}" -- "$cur") )`);
+      lines.push("      return 0 ;;");
+    }
+  }
+  lines.push("    *)");
+  lines.push('      COMPREPLY=( $(compgen -W "$top_commands" -- "$cur") )');
+  lines.push("      return 0 ;;");
+  lines.push("  esac");
+  lines.push("}");
+  lines.push("");
+  lines.push("complete -F _corp_completions corp");
+  lines.push("complete -F _corp_completions npx corp");
+  return lines.join("\n");
+}
+function escapeZshDesc(s3) {
+  return s3.replace(/'/g, "'\\''").replace(/:/g, "\\:");
+}
+function generateZsh(commands) {
+  const tree = buildTree(commands);
+  const lines = [
+    "#compdef corp",
+    "# corp zsh completion",
+    "# Add to your fpath and run: compdef _corp corp",
+    '#   eval "$(corp completions --shell zsh)"',
+    "",
+    "_corp() {",
+    "  local state",
+    "  local -a top_commands",
+    ""
+  ];
+  lines.push("  top_commands=(");
+  for (const node of tree) {
+    lines.push(`    '${node.name}:${escapeZshDesc(node.description)}'`);
+  }
+  lines.push("  )");
+  lines.push("");
+  lines.push("  _arguments -C \\");
+  lines.push("    '(-h --help)'{-h,--help}'[Show help]' \\");
+  lines.push("    '(-V --version)'{-V,--version}'[Show version]' \\");
+  lines.push("    '(-q --quiet)'{-q,--quiet}'[Quiet output]' \\");
+  lines.push("    '1: :->cmd' \\");
+  lines.push("    '*: :->args'");
+  lines.push("");
+  lines.push("  case $state in");
+  lines.push("    cmd)");
+  lines.push("      _describe 'command' top_commands ;;");
+  lines.push("    args)");
+  lines.push("      case $words[2] in");
+  for (const parent of tree) {
+    lines.push(`        ${parent.name})`);
+    if (parent.subcmds.length > 0) {
+      lines.push("          local -a subcmds");
+      lines.push("          subcmds=(");
+      for (const child of parent.subcmds) {
+        lines.push(`            '${child.name}:${escapeZshDesc(child.description)}'`);
+      }
+      lines.push("          )");
+      lines.push("          if (( CURRENT == 3 )); then");
+      lines.push("            _describe 'subcommand' subcmds");
+      lines.push("          else");
+      lines.push("            case $words[3] in");
+      for (const child of parent.subcmds) {
+        const argSpec = child.options.map((f) => `'${f}[option]'`).join(" \\\n                ");
+        lines.push(`              ${child.name})`);
+        lines.push(`                _arguments ${argSpec} ;;`);
+      }
+      lines.push("            esac");
+      lines.push("          fi ;;");
+    } else {
+      const argSpec = parent.options.map((f) => `'${f}[option]'`).join(" \\\n            ");
+      if (argSpec) {
+        lines.push(`          _arguments ${argSpec} ;;`);
+      } else {
+        lines.push("          ;; # no options");
+      }
+    }
+  }
+  lines.push("      esac ;;");
+  lines.push("  esac");
+  lines.push("}");
+  lines.push("");
+  lines.push("_corp");
+  return lines.join("\n");
+}
+function generateFish(commands) {
+  const tree = buildTree(commands);
+  const lines = [
+    "# corp fish completion",
+    "# Save to ~/.config/fish/completions/corp.fish",
+    "#   corp completions --shell fish > ~/.config/fish/completions/corp.fish",
+    ""
+  ];
+  lines.push("complete -c corp -f");
+  lines.push("");
+  for (const node of tree) {
+    const desc = node.description.replace(/'/g, "\\'");
+    lines.push(`complete -c corp -n '__fish_use_subcommand' -a '${node.name}' -d '${desc}'`);
+  }
+  lines.push("");
+  for (const parent of tree) {
+    const parentName = parent.name;
+    if (parent.subcmds.length > 0) {
+      for (const child of parent.subcmds) {
+        const desc = child.description.replace(/'/g, "\\'");
+        lines.push(
+          `complete -c corp -n "__fish_seen_subcommand_from ${parentName}; and not __fish_seen_subcommand_from ${parent.subcmds.map((s3) => s3.name).join(" ")}" -a '${child.name}' -d '${desc}'`
+        );
+      }
+      lines.push("");
+      for (const child of parent.subcmds) {
+        for (const flag of child.options) {
+          const long = flag.replace(/^--/, "");
+          lines.push(
+            `complete -c corp -n "__fish_seen_subcommand_from ${parentName}; and __fish_seen_subcommand_from ${child.name}" -l '${long}'`
+          );
+        }
+        if (child.options.length > 0) lines.push("");
+      }
+    } else {
+      for (const flag of parent.options) {
+        const long = flag.replace(/^--/, "");
+        lines.push(
+          `complete -c corp -n "__fish_seen_subcommand_from ${parentName}" -l '${long}'`
+        );
+      }
+      if (parent.options.length > 0) lines.push("");
+    }
+  }
+  return lines.join("\n");
+}
+function makeCompletionsCommand(allCommands) {
+  return {
+    name: "completions",
+    description: "Generate shell completion scripts",
+    local: true,
+    options: [
+      {
+        flags: "--shell <shell>",
+        description: "Shell type (bash, zsh, fish)",
+        choices: ["bash", "zsh", "fish"],
+        required: true
+      }
+    ],
+    examples: [
+      "corp completions --shell bash",
+      "corp completions --shell zsh",
+      "corp completions --shell fish",
+      "source <(corp completions --shell bash)",
+      'eval "$(corp completions --shell zsh)"',
+      "corp completions --shell fish > ~/.config/fish/completions/corp.fish"
+    ],
+    handler: async (ctx) => {
+      const shell = ctx.opts.shell;
+      const cmds = allCommands.filter((c) => c.name !== "completions");
+      let script;
+      switch (shell) {
+        case "bash":
+          script = generateBash(cmds);
+          break;
+        case "zsh":
+          script = generateZsh(cmds);
+          break;
+        case "fish":
+          script = generateFish(cmds);
+          break;
+        default:
+          ctx.writer.error(`Unknown shell: ${shell}. Choose bash, zsh, or fish.`);
+          process.exit(1);
+      }
+      process.stdout.write(script + "\n");
+    }
+  };
+}
+var init_completions = __esm({
+  "src/registry/completions.ts"() {
+    "use strict";
+  }
+});
+
 // src/registry/index.ts
 var registry_exports = {};
 __export(registry_exports, {
@@ -12355,7 +12617,7 @@ function generateSchema(commands, programName, version) {
     commands: topLevel
   };
 }
-var registry;
+var baseRegistry, registry;
 var init_registry = __esm({
   "src/registry/index.ts"() {
     "use strict";
@@ -12375,7 +12637,8 @@ var init_registry = __esm({
     init_secret_proxies();
     init_treasury();
     init_branches();
-    registry = [
+    init_completions();
+    baseRegistry = [
       ...workspaceCommands,
       ...entityCommands,
       ...formationCommands,
@@ -12393,6 +12656,10 @@ var init_registry = __esm({
       ...treasuryCommands,
       ...branchCommands
     ];
+    registry = [
+      ...baseRegistry,
+      makeCompletionsCommand(baseRegistry)
+    ];
   }
 });
 
@@ -12403,28 +12670,9 @@ import { createRequire } from "module";
 import { Command, Option } from "commander";
 
 // src/generic-executor.ts
+init_references();
+init_output();
 init_spinner();
-function s(val, maxLen) {
-  const str = val == null ? "" : String(val);
-  if (maxLen && str.length > maxLen) return str.slice(0, maxLen);
-  return str;
-}
-function money(val) {
-  if (typeof val === "number") {
-    const dollars = val / 100;
-    return `$${dollars.toLocaleString(void 0, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
-  }
-  return s(val);
-}
-function fmtDate(val) {
-  const str = s(val);
-  if (!str) return "";
-  const parsed = new Date(str);
-  return Number.isNaN(parsed.getTime()) ? str : parsed.toISOString().slice(0, 10);
-}
-function shortId(val) {
-  return val.length > 8 ? val.slice(0, 8) + "\u2026" : val;
-}
 function parseCol(spec) {
   let fmt = null;
   let rest = spec;
@@ -12450,7 +12698,7 @@ function getField(obj, keys) {
 function fmtField(val, fmt) {
   if (val == null) return "";
   if (fmt === "money") return money(val);
-  if (fmt === "date") return fmtDate(val);
+  if (fmt === "date") return date(val);
   if (fmt === "id") return shortId(String(val));
   return String(val);
 }
@@ -12505,7 +12753,7 @@ function displayPanel(data, title, ctx) {
     const label = k.replace(/_/g, " ").replace(/\b\w/g, (ch) => ch.toUpperCase());
     let formatted;
     if (k.endsWith("_cents") && typeof v === "number") formatted = money(v);
-    else if ((k.includes("date") || k.endsWith("_at")) && v) formatted = fmtDate(v);
+    else if ((k.includes("date") || k.endsWith("_at")) && v) formatted = date(v);
     else if (k.endsWith("_id")) formatted = shortId(String(v));
     else formatted = String(v);
     return `${label}: ${formatted}`;
@@ -12737,7 +12985,9 @@ init_api_client();
 init_references();
 function buildCLI(commands, version) {
   const program2 = new Command();
-  program2.name("corp").description("corp \u2014 Corporate governance from the terminal").version(version).enablePositionalOptions();
+  program2.name("corp").description(
+    'The Corporation CLI \u2014 form entities, manage cap tables, govern, and operate.\n\nQuick start:\n  corp form --type llc --name "My LLC" --member "Alice,a@co.com,member,100"\n  corp cap-table\n  corp next\n\nDocs: https://docs.thecorporation.ai'
+  ).version(version).enablePositionalOptions();
   program2.option("-q, --quiet", "Only output the resource ID (for scripting)");
   program2.action(() => {
     program2.outputHelp();
@@ -12758,6 +13008,61 @@ function buildCLI(commands, version) {
       children.get(parent).push(def);
     }
   }
+  const commandGroupOrder = {
+    // Core workflow — formation & entity management
+    form: 0,
+    entities: 1,
+    contacts: 2,
+    // Cap table
+    "cap-table": 10,
+    "safe-notes": 11,
+    "share-transfers": 12,
+    valuations: 13,
+    // Governance
+    governance: 20,
+    // Finance
+    finance: 30,
+    // Compliance & tax
+    tax: 40,
+    deadlines: 41,
+    // Status / context / actions
+    status: 50,
+    context: 51,
+    use: 52,
+    next: 53,
+    obligations: 54,
+    "human-obligations": 55,
+    digest: 56,
+    // Services & work items
+    services: 60,
+    "work-items": 61,
+    contracts: 62,
+    // Agents
+    agents: 70,
+    // Admin / config / setup (last)
+    billing: 80,
+    "api-keys": 81,
+    link: 82,
+    claim: 83,
+    feedback: 84,
+    resolve: 85,
+    find: 86,
+    approvals: 87,
+    receipts: 88,
+    config: 90,
+    setup: 91,
+    schema: 92,
+    serve: 93,
+    demo: 94,
+    chat: 95,
+    completions: 96
+  };
+  topLevel.sort((a, b) => {
+    const ga = commandGroupOrder[a.name] ?? 75;
+    const gb = commandGroupOrder[b.name] ?? 75;
+    if (ga !== gb) return ga - gb;
+    return a.name.localeCompare(b.name);
+  });
   const parentCmds = /* @__PURE__ */ new Map();
   for (const def of topLevel) {
     const cmd = wireCommand(program2, def);