@thecorporation/cli 26.3.21 → 26.3.23

package/dist/index.js

@@ -90,9 +90,13 @@ function allowUnsafeApiUrl() {
   return process.env.CORP_UNSAFE_API_URL === "1";
 }
 function validateApiUrl(value) {
+  const trimmed = value.trim();
+  if (trimmed.startsWith("process://")) {
+    return trimmed;
+  }
   let parsed;
   try {
-    parsed = new URL(value.trim());
+    parsed = new URL(trimmed);
   } catch {
     throw new Error("api_url must be a valid absolute URL");
   }
@@ -217,6 +221,7 @@ function normalizeConfig(raw) {
   cfg.workspace_id = normalizeString(raw.workspace_id) ?? cfg.workspace_id;
   cfg.hosting_mode = normalizeString(raw.hosting_mode) ?? cfg.hosting_mode;
   cfg.active_entity_id = normalizeString(raw.active_entity_id) ?? cfg.active_entity_id;
+  cfg.data_dir = normalizeString(raw.data_dir) ?? cfg.data_dir;
   if (isObject(raw.llm)) {
     cfg.llm.provider = normalizeString(raw.llm.provider) ?? cfg.llm.provider;
     cfg.llm.api_key = normalizeString(raw.llm.api_key) ?? cfg.llm.api_key;
@@ -263,7 +268,8 @@ function serializeConfig(cfg) {
       name: normalized.user.name,
       email: normalized.user.email
     },
-    active_entity_id: normalized.active_entity_id
+    active_entity_id: normalized.active_entity_id,
+    ...normalized.data_dir ? { data_dir: normalized.data_dir } : {}
   };
   if (normalized.active_entity_ids && Object.keys(normalized.active_entity_ids).length > 0) {
     serialized.active_entity_ids = normalized.active_entity_ids;
@@ -283,6 +289,20 @@ function serializeAuth(cfg) {
   if (normalized.llm.api_key) {
     serialized.llm = { api_key: normalized.llm.api_key };
   }
+  const existingAuth = readJsonFile(AUTH_FILE);
+  if (isObject(existingAuth) && isObject(existingAuth.server_secrets)) {
+    const ss = existingAuth.server_secrets;
+    if (typeof ss.jwt_secret === "string" && typeof ss.secrets_master_key === "string" && typeof ss.internal_worker_token === "string") {
+      serialized.server_secrets = {
+        jwt_secret: ss.jwt_secret,
+        secrets_master_key: ss.secrets_master_key,
+        internal_worker_token: ss.internal_worker_token
+      };
+    }
+  }
+  if (cfg._server_secrets) {
+    serialized.server_secrets = cfg._server_secrets;
+  }
   return JSON.stringify(serialized, null, 2) + "\n";
 }
 function requireSupportedConfigKey(dotPath) {
@@ -311,6 +331,9 @@ function setKnownConfigValue(cfg, dotPath, value) {
     case "hosting_mode":
       cfg.hosting_mode = value.trim();
       return;
+    case "data_dir":
+      cfg.data_dir = value.trim();
+      return;
     case "llm.provider":
       cfg.llm.provider = value.trim();
       return;
@@ -492,7 +515,8 @@ var init_config = __esm({
       "llm.base_url",
       "user.name",
       "user.email",
-      "active_entity_id"
+      "active_entity_id",
+      "data_dir"
     ]);
     SENSITIVE_CONFIG_KEYS = /* @__PURE__ */ new Set(["api_url", "api_key", "workspace_id"]);
     DEFAULTS = {
@@ -507,7 +531,8 @@ var init_config = __esm({
         base_url: process.env.CORP_LLM_BASE_URL || void 0
       },
       user: { name: "", email: "" },
-      active_entity_id: ""
+      active_entity_id: "",
+      data_dir: ""
     };
   }
 });
@@ -658,7 +683,11 @@ function describeReferenceRecord(kind, record) {
       idFields: ["share_class_id", "id"],
       labelFields: ["class_code", "name", "share_class"]
     },
-    round: { idFields: ["round_id", "equity_round_id", "id"], labelFields: ["name"] }
+    round: { idFields: ["round_id", "equity_round_id", "id"], labelFields: ["name"] },
+    service_request: {
+      idFields: ["request_id", "service_request_id", "id"],
+      labelFields: ["service_slug", "status"]
+    }
   };
   const spec = specs[kind];
   const id = extractId(record, spec.idFields);
@@ -726,7 +755,8 @@ var init_references = __esm({
       "safe_note",
       "instrument",
       "share_class",
-      "round"
+      "round",
+      "service_request"
     ];
     VALID_RESOURCE_KINDS = new Set(RESOURCE_KINDS);
     MAX_REFERENCE_INPUT_LEN = 256;
@@ -755,6 +785,7 @@ var init_references = __esm({
       valuationsCache = /* @__PURE__ */ new Map();
       safeNotesCache = /* @__PURE__ */ new Map();
       roundsCache = /* @__PURE__ */ new Map();
+      serviceRequestsCache = /* @__PURE__ */ new Map();
       capTableCache = /* @__PURE__ */ new Map();
       agentsCache;
       constructor(client, cfg) {
@@ -869,6 +900,9 @@ var init_references = __esm({
       async resolveRound(entityId, ref) {
         return this.resolve("round", ref, { entityId });
       }
+      async resolveServiceRequest(entityId, ref) {
+        return this.resolve("service_request", ref, { entityId });
+      }
       async find(kind, query, scope = {}) {
         const trimmedQuery = validateReferenceInput(query, "query", { allowEmpty: true });
         const records = await this.listRecords(kind, scope);
@@ -1056,6 +1090,8 @@ var init_references = __esm({
               return this.listShareClasses(scope.entityId);
             case "round":
               return this.listRounds(scope.entityId);
+            case "service_request":
+              return this.listServiceRequestRecords(scope.entityId);
           }
         })();
         return this.attachStableHandles(kind, records, scope.entityId);
@@ -1320,6 +1356,14 @@ var init_references = __esm({
         const capTable = await this.getCapTable(entityId);
         return Array.isArray(capTable.share_classes) ? capTable.share_classes : [];
       }
+      async listServiceRequestRecords(entityId) {
+        if (!entityId) throw new Error("An entity context is required to resolve service requests.");
+        const cached = this.serviceRequestsCache.get(entityId);
+        if (cached) return cached;
+        const requests = await this.client.listServiceRequests(entityId);
+        this.serviceRequestsCache.set(entityId, requests);
+        return requests;
+      }
     };
   }
 });
@@ -1327,7 +1371,7 @@ var init_references = __esm({
 // src/output.ts
 import chalk from "chalk";
 import Table from "cli-table3";
-function printError(msg) {
+function printError2(msg) {
   console.error(chalk.red("Error:"), msg);
 }
 function printSuccess(msg) {
@@ -1346,6 +1390,16 @@ function printDryRun(operation, payload) {
     payload
   });
 }
+function printQuietId(record, ...idFields) {
+  if (typeof record !== "object" || record === null) return;
+  const rec = record;
+  for (const field of idFields) {
+    if (typeof rec[field] === "string" && rec[field]) {
+      console.log(rec[field]);
+      return;
+    }
+  }
+}
 function normalizeWriteResultOptions(options) {
   if (typeof options === "boolean") {
     return { jsonOnly: options };
@@ -1375,6 +1429,41 @@ function printWriteResult(result, successMessage, options) {
     printJson(result);
     return;
   }
+  if (normalized.quiet) {
+    const defaultIdFields = [
+      "entity_id",
+      "agent_id",
+      "meeting_id",
+      "body_id",
+      "seat_id",
+      "work_item_id",
+      "document_id",
+      "invoice_id",
+      "payment_id",
+      "safe_note_id",
+      "valuation_id",
+      "round_id",
+      "instrument_id",
+      "transfer_workflow_id",
+      "distribution_id",
+      "deadline_id",
+      "filing_id",
+      "bank_account_id",
+      "classification_id",
+      "resolution_id",
+      "agenda_item_id",
+      "contact_id",
+      "request_id",
+      "service_request_id",
+      "key_id",
+      "formation_id",
+      "execution_id",
+      "incident_id",
+      "id"
+    ];
+    printQuietId(result, ...normalized.idFields ?? defaultIdFields);
+    return;
+  }
   printSuccess(successMessage);
   if (normalized.referenceKind && typeof result === "object" && result !== null && !Array.isArray(result)) {
     printReferenceSummary(normalized.referenceKind, result, {
@@ -1382,7 +1471,6 @@ function printWriteResult(result, successMessage, options) {
       showReuseHint: normalized.showReuseHint
     });
   }
-  printJson(result);
 }
 function printStatusPanel(data) {
   console.log(chalk.blue("\u2500".repeat(50)));
@@ -1882,6 +1970,33 @@ function printAgentsTable(agents) {
   }
   console.log(table.toString());
 }
+function printServiceCatalogTable(items) {
+  const table = makeTable("Service Catalog", ["Slug", "Name", "Price", "Type"]);
+  for (const item of items) {
+    table.push([
+      s(item.slug),
+      s(item.name),
+      money(item.amount_cents),
+      s(item.price_type)
+    ]);
+  }
+  console.log(table.toString());
+}
+function printServiceRequestsTable(requests) {
+  const table = makeTable("Service Requests", ["Ref", "Service", "Amount", "Status", "Created"]);
+  for (const r of requests) {
+    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),
+      s(r.service_slug),
+      money(r.amount_cents),
+      colored,
+      date(r.created_at)
+    ]);
+  }
+  console.log(table.toString());
+}
 function printBillingPanel(status, plans) {
   const plan = s(status.plan ?? status.tier) || "free";
   const subStatus = s(status.status) || "active";
@@ -1935,7 +2050,15 @@ var setup_exports = {};
 __export(setup_exports, {
   setupCommand: () => setupCommand
 });
-import { input, confirm } from "@inquirer/prompts";
+import { input, select } from "@inquirer/prompts";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync } from "fs";
+import {
+  generateSecret,
+  generateFernetKey,
+  processRequest
+} from "@thecorporation/corp-tools";
 async function requestMagicLink(apiUrl, email, tosAccepted) {
   const resp = await fetch(`${apiUrl}/v1/auth/magic-link`, {
     method: "POST",
@@ -1971,9 +2094,6 @@ async function verifyMagicLinkCode(apiUrl, code) {
     workspace_id: data.workspace_id
   };
 }
-function isCloudApi(url) {
-  return url.replace(/\/+$/, "").includes("thecorporation.ai");
-}
 async function magicLinkAuth(apiUrl, email) {
   console.log("\nSending magic link to " + email + "...");
   await requestMagicLink(apiUrl, email, true);
@@ -1989,22 +2109,46 @@ async function magicLinkAuth(apiUrl, email) {
   console.log("Verifying...");
   return verifyMagicLinkCode(apiUrl, trimmed);
 }
+function setupDataDir(dirPath) {
+  if (!existsSync2(dirPath)) {
+    mkdirSync2(dirPath, { recursive: true });
+    return { isNew: true };
+  }
+  try {
+    const entries = readdirSync(dirPath);
+    if (entries.length > 0) {
+      console.log("Found existing data, reusing.");
+      return { isNew: false };
+    }
+  } catch {
+  }
+  return { isNew: true };
+}
+async function localProvision(dataDir, name) {
+  const resp = processRequest(
+    "process://",
+    "POST",
+    "/v1/workspaces/provision",
+    { "Content-Type": "application/json" },
+    JSON.stringify({ name }),
+    { dataDir }
+  );
+  if (!resp.ok) {
+    const detail = await resp.text();
+    throw new Error(`Provision failed: HTTP ${resp.status} \u2014 ${detail}`);
+  }
+  const body = await resp.json();
+  if (!body.api_key || !body.workspace_id) {
+    throw new Error("Provision response missing api_key or workspace_id");
+  }
+  return {
+    api_key: body.api_key,
+    workspace_id: body.workspace_id
+  };
+}
 async function setupCommand() {
   const cfg = loadConfig();
   console.log("Welcome to corp \u2014 corporate governance from the terminal.\n");
-  const customUrl = process.env.CORP_API_URL;
-  if (customUrl) {
-    try {
-      cfg.api_url = validateApiUrl(customUrl);
-    } catch (err) {
-      printError(`Invalid CORP_API_URL: ${err}`);
-      process.exit(1);
-    }
-    console.log(`Using API: ${cfg.api_url}
-`);
-  } else {
-    cfg.api_url = CLOUD_API_URL;
-  }
   console.log("--- User Info ---");
   const user = cfg.user ?? { name: "", email: "" };
   user.name = await input({
@@ -2016,22 +2160,81 @@ async function setupCommand() {
     default: user.email || void 0
   });
   cfg.user = user;
-  const needsAuth = !cfg.api_key || !cfg.workspace_id;
-  const cloud = isCloudApi(cfg.api_url);
-  if (needsAuth) {
-    if (cloud) {
+  console.log("\n--- Hosting Mode ---");
+  const hostingMode = await select({
+    message: "How would you like to run corp?",
+    choices: [
+      { value: "local", name: "Local (your machine)" },
+      { value: "cloud", name: "TheCorporation cloud" },
+      { value: "self-hosted", name: "Self-hosted server (custom URL)" }
+    ],
+    default: cfg.hosting_mode || "local"
+  });
+  cfg.hosting_mode = hostingMode;
+  if (hostingMode === "local") {
+    const dataDir = await input({
+      message: "Data directory",
+      default: cfg.data_dir || DEFAULT_DATA_DIR
+    });
+    cfg.data_dir = dataDir;
+    cfg.api_url = "process://";
+    const { isNew } = setupDataDir(dataDir);
+    const serverSecrets = {
+      jwt_secret: generateSecret(),
+      secrets_master_key: generateFernetKey(),
+      internal_worker_token: generateSecret()
+    };
+    process.env.JWT_SECRET = serverSecrets.jwt_secret;
+    process.env.SECRETS_MASTER_KEY = serverSecrets.secrets_master_key;
+    process.env.INTERNAL_WORKER_TOKEN = serverSecrets.internal_worker_token;
+    cfg._server_secrets = serverSecrets;
+    if (isNew || !cfg.workspace_id) {
+      console.log("\nProvisioning workspace...");
+      try {
+        const result = await localProvision(dataDir, `${user.name}'s workspace`);
+        cfg.api_key = result.api_key;
+        cfg.workspace_id = result.workspace_id;
+        printSuccess(`Local workspace ready: ${result.workspace_id}`);
+      } catch (err) {
+        printError2(`Workspace provisioning failed: ${err}`);
+        console.log("You can retry with 'corp setup'.");
+      }
+    } else {
+      console.log("\nExisting workspace found.");
+    }
+  } else if (hostingMode === "cloud") {
+    cfg.api_url = CLOUD_API_URL;
+    cfg.data_dir = "";
+    const needsAuth = !cfg.api_key || !cfg.workspace_id;
+    if (needsAuth) {
       try {
         const result = await magicLinkAuth(cfg.api_url, user.email);
         cfg.api_key = result.api_key;
         cfg.workspace_id = result.workspace_id;
         printSuccess(`Authenticated. Workspace: ${result.workspace_id}`);
       } catch (err) {
-        printError(`Authentication failed: ${err}`);
+        printError2(`Authentication failed: ${err}`);
         console.log(
           "You can manually set credentials with: corp config set api_key <key>"
         );
       }
     } else {
+      console.log("\nExisting credentials found. Run 'corp status' to verify.");
+    }
+  } else {
+    const url = await input({
+      message: "Server URL",
+      default: cfg.api_url !== CLOUD_API_URL && !cfg.api_url.startsWith("process://") ? cfg.api_url : void 0
+    });
+    try {
+      cfg.api_url = validateApiUrl(url);
+    } catch (err) {
+      printError2(`Invalid URL: ${err}`);
+      process.exit(1);
+    }
+    cfg.data_dir = "";
+    const needsAuth = !cfg.api_key || !cfg.workspace_id;
+    if (needsAuth) {
       console.log("\nProvisioning workspace...");
       try {
         const result = await provisionWorkspace(
@@ -2042,63 +2245,19 @@ async function setupCommand() {
         cfg.workspace_id = result.workspace_id;
         console.log(`Workspace provisioned: ${result.workspace_id}`);
       } catch (err) {
-        printError(`Auto-provision failed: ${err}`);
+        printError2(`Auto-provision failed: ${err}`);
         console.log(
           "You can manually set credentials with: corp config set api_key <key>"
         );
       }
     }
-  } else {
-    console.log("\nVerifying existing credentials...");
-    let keyValid = false;
-    try {
-      const resp = await fetch(
-        `${cfg.api_url.replace(/\/+$/, "")}/v1/workspaces/${cfg.workspace_id}/status`,
-        { headers: { Authorization: `Bearer ${cfg.api_key}` } }
-      );
-      keyValid = resp.status !== 401;
-    } catch {
-    }
-    if (keyValid) {
-      console.log("Credentials OK.");
-    } else {
-      console.log("API key is no longer valid.");
-      const reauth = await confirm({
-        message: cloud ? "Re-authenticate via magic link?" : "Provision a new workspace? (This will replace your current credentials)",
-        default: true
-      });
-      if (reauth) {
-        try {
-          if (cloud) {
-            const result = await magicLinkAuth(cfg.api_url, user.email);
-            cfg.api_key = result.api_key;
-            cfg.workspace_id = result.workspace_id;
-            printSuccess(`Authenticated. Workspace: ${result.workspace_id}`);
-          } else {
-            const result = await provisionWorkspace(
-              cfg.api_url,
-              `${user.name}'s workspace`
-            );
-            cfg.api_key = result.api_key;
-            cfg.workspace_id = result.workspace_id;
-            console.log(`Workspace provisioned: ${result.workspace_id}`);
-          }
-        } catch (err) {
-          printError(`Authentication failed: ${err}`);
-        }
-      } else {
-        console.log(
-          "Keeping existing credentials. You can manually update with: corp config set api_key <key>"
-        );
-      }
-    }
   }
   saveConfig(cfg);
   console.log("\nSettings saved to ~/.corp/config.json");
   console.log("Credentials saved to ~/.corp/auth.json");
   console.log("Run 'corp status' to verify your connection.");
 }
-var CLOUD_API_URL;
+var CLOUD_API_URL, DEFAULT_DATA_DIR;
 var init_setup = __esm({
   "src/commands/setup.ts"() {
     "use strict";
@@ -2106,6 +2265,7 @@ var init_setup = __esm({
     init_api_client();
     init_output();
     CLOUD_API_URL = "https://api.thecorporation.ai";
+    DEFAULT_DATA_DIR = join2(homedir2(), ".corp", "data");
   }
 });
 
@@ -2293,7 +2453,7 @@ async function statusCommand(opts = {}) {
       printStatusPanel(data);
     }
   } catch (err) {
-    printError(`Failed to fetch status: ${err}`);
+    printError2(`Failed to fetch status: ${err}`);
     process.exit(1);
   }
 }
@@ -2376,7 +2536,7 @@ async function contextCommand(opts) {
     }
     console.log(chalk2.blue("\u2500".repeat(50)));
   } catch (err) {
-    printError(`Failed to fetch context: ${err}`);
+    printError2(`Failed to fetch context: ${err}`);
     process.exit(1);
   }
 }
@@ -2390,6 +2550,36 @@ var init_context = __esm({
   }
 });
 
+// src/commands/use.ts
+var use_exports = {};
+__export(use_exports, {
+  useCommand: () => useCommand
+});
+async function useCommand(entityRef) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const entityId = await resolver.resolveEntity(entityRef);
+    setActiveEntityId(cfg, entityId);
+    saveConfig(cfg);
+    const alias = getReferenceAlias("entity", { entity_id: entityId }) ?? entityId;
+    printSuccess(`Active entity set to ${alias} (${entityId})`);
+  } catch (err) {
+    printError2(`Failed to resolve entity: ${err}`);
+    process.exit(1);
+  }
+}
+var init_use = __esm({
+  "src/commands/use.ts"() {
+    "use strict";
+    init_config();
+    init_api_client();
+    init_output();
+    init_references();
+  }
+});
+
 // src/commands/schema.ts
 var schema_exports = {};
 __export(schema_exports, {
@@ -2476,7 +2666,7 @@ async function configSetCommand(key, value, options = {}) {
       });
     });
   } catch (err) {
-    printError(`Failed to update config: ${err}`);
+    printError2(`Failed to update config: ${err}`);
     process.exit(1);
   }
   if (key === "api_key" || key === "llm.api_key") {
@@ -2493,7 +2683,7 @@ function configGetCommand(key) {
   const cfg = loadConfig();
   const val = getValue(cfg, key);
   if (val === void 0) {
-    printError(`Key not found: ${key}`);
+    printError2(`Key not found: ${key}`);
     process.exit(1);
   }
   if (typeof val === "object" && val !== null) {
@@ -2524,7 +2714,7 @@ __export(resolve_exports, {
 async function resolveCommand(kind, ref, opts) {
   const normalizedKind = kind.trim().toLowerCase();
   if (!KINDS.has(normalizedKind)) {
-    printError(`Unsupported resolve kind: ${kind}`);
+    printError2(`Unsupported resolve kind: ${kind}`);
     process.exit(1);
   }
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -2626,7 +2816,7 @@ async function resolveCommand(kind, ref, opts) {
       ...meetingId ? { meeting_id: meetingId } : {}
     });
   } catch (err) {
-    printError(`Failed to resolve reference: ${err}`);
+    printError2(`Failed to resolve reference: ${err}`);
     process.exit(1);
   }
 }
@@ -2715,7 +2905,7 @@ import Table2 from "cli-table3";
 async function findCommand(kind, query, opts) {
   const normalizedKind = kind.trim().toLowerCase();
   if (!KINDS2.has(normalizedKind)) {
-    printError(`Unsupported find kind: ${kind}`);
+    printError2(`Unsupported find kind: ${kind}`);
     process.exit(1);
   }
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -2765,7 +2955,7 @@ async function findCommand(kind, query, opts) {
     }
     console.log(table.toString());
   } catch (err) {
-    printError(`Failed to find references: ${err}`);
+    printError2(`Failed to find references: ${err}`);
     process.exit(1);
   }
 }
@@ -2847,7 +3037,7 @@ async function obligationsCommand(opts) {
     else if (obligations.length === 0) console.log("No obligations found.");
     else printObligationsTable(obligations);
   } catch (err) {
-    printError(`Failed to fetch obligations: ${err}`);
+    printError2(`Failed to fetch obligations: ${err}`);
     process.exit(1);
   }
 }
@@ -2891,7 +3081,7 @@ async function digestCommand(opts) {
       else printJson(digests);
     }
   } catch (err) {
-    printError(`Failed: ${err}`);
+    printError2(`Failed: ${err}`);
     process.exit(1);
   }
 }
@@ -2917,7 +3107,7 @@ async function linkCommand(opts) {
     printSuccess(`Workspace linked to ${opts.provider} (external ID: ${opts.externalId})`);
     if (data.workspace_id) console.log(`  Workspace: ${data.workspace_id}`);
   } catch (err) {
-    printError(`${err}`);
+    printError2(`${err}`);
     process.exit(1);
   }
 }
@@ -2951,7 +3141,7 @@ async function claimCommand(code) {
         detail = body.detail ?? "";
       } catch {
       }
-      printError(detail || `${resp.status} ${resp.statusText}`);
+      printError2(detail || `${resp.status} ${resp.statusText}`);
       process.exit(1);
     }
     const data = await resp.json();
@@ -2962,7 +3152,7 @@ async function claimCommand(code) {
     console.log("Credentials saved to ~/.corp/auth.json");
     console.log("Settings remain in ~/.corp/config.json");
   } catch (err) {
-    printError(`${err}`);
+    printError2(`${err}`);
     process.exit(1);
   }
 }
@@ -3114,11 +3304,11 @@ import {
   isWriteTool as _isWriteTool,
   executeTool as _executeTool
 } from "@thecorporation/corp-tools";
-import { join as join2 } from "path";
-import { homedir as homedir2 } from "os";
+import { join as join3 } from "path";
+import { homedir as homedir3 } from "os";
 async function executeTool(name, args, client) {
   return _executeTool(name, args, client, {
-    dataDir: join2(homedir2(), ".corp"),
+    dataDir: join3(homedir3(), ".corp"),
     onEntityFormed: (entityId) => {
       try {
         updateConfig((cfg) => {
@@ -3159,7 +3349,7 @@ async function chatCommand() {
       try {
         printStatusPanel(await client.getStatus());
       } catch (e) {
-        printError(`Status error: ${e}`);
+        printError2(`Status error: ${e}`);
       }
     },
     "/obligations": async () => {
@@ -3169,7 +3359,7 @@ async function chatCommand() {
         if (obls.length) printObligationsTable(obls);
         else console.log(chalk4.dim("No obligations found."));
       } catch (e) {
-        printError(`Obligations error: ${e}`);
+        printError2(`Obligations error: ${e}`);
       }
     },
     "/digest": async () => {
@@ -3178,7 +3368,7 @@ async function chatCommand() {
         if (digests.length) printJson(digests);
         else console.log(chalk4.dim("No digest history."));
       } catch (e) {
-        printError(`Digest error: ${e}`);
+        printError2(`Digest error: ${e}`);
       }
     },
     "/config": () => printJson(configForDisplay(cfg)),
@@ -3235,7 +3425,7 @@ ${chalk4.bold("Chat Slash Commands")}
           await handler(args);
           continue;
         }
-        printError(`Unknown command: ${cmd}. Type /help for available commands.`);
+        printError2(`Unknown command: ${cmd}. Type /help for available commands.`);
         continue;
       }
       messages.push({ role: "user", content: userInput });
@@ -3252,7 +3442,7 @@ ${chalk4.bold("Chat Slash Commands")}
             llmCfg.base_url
           );
         } catch (err) {
-          printError(`LLM error: ${err}`);
+          printError2(`LLM error: ${err}`);
           break;
         }
         totalTokens += response.usage.total_tokens;
@@ -3310,6 +3500,7 @@ __export(entities_exports, {
   entitiesDissolveCommand: () => entitiesDissolveCommand,
   entitiesShowCommand: () => entitiesShowCommand
 });
+import { confirm as confirm2 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 async function entitiesCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -3327,7 +3518,7 @@ async function entitiesCommand(opts) {
       printEntitiesTable(entities);
     }
   } catch (err) {
-    printError(`Failed to fetch entities: ${err}`);
+    printError2(`Failed to fetch entities: ${err}`);
     process.exit(1);
   }
 }
@@ -3341,7 +3532,7 @@ async function entitiesShowCommand(entityId, opts) {
     const entities = await client.listEntities();
     const entity = entities.find((e) => e.entity_id === resolvedEntityId);
     if (!entity) {
-      printError(`Entity not found: ${entityId}`);
+      printError2(`Entity not found: ${entityId}`);
       process.exit(1);
     }
     await resolver.stabilizeRecord("entity", entity);
@@ -3362,7 +3553,7 @@ async function entitiesShowCommand(entityId, opts) {
       console.log(chalk5.blue("\u2500".repeat(40)));
     }
   } catch (err) {
-    printError(`Failed to fetch entities: ${err}`);
+    printError2(`Failed to fetch entities: ${err}`);
     process.exit(1);
   }
 }
@@ -3378,7 +3569,7 @@ async function entitiesConvertCommand(entityId, opts) {
     printSuccess(`Entity conversion initiated: ${result.conversion_id ?? "OK"}`);
     printJson(result);
   } catch (err) {
-    printError(`Failed to convert entity: ${err}`);
+    printError2(`Failed to convert entity: ${err}`);
     process.exit(1);
   }
 }
@@ -3388,6 +3579,16 @@ async function entitiesDissolveCommand(entityId, opts) {
   const resolver = new ReferenceResolver(client, cfg);
   try {
     const resolvedEntityId = await resolver.resolveEntity(entityId);
+    if (!opts.yes) {
+      const ok = await confirm2({
+        message: `Dissolve entity ${entityId}? This cannot be undone.`,
+        default: false
+      });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
     const data = { reason: opts.reason };
     if (opts.effectiveDate) data.effective_date = opts.effectiveDate;
     const result = await client.dissolveEntity(resolvedEntityId, data);
@@ -3396,9 +3597,9 @@ async function entitiesDissolveCommand(entityId, opts) {
   } 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 ${entityId}`);
+      printError2(`Cannot dissolve entity: only entities with 'active' status can be dissolved. Check the entity's current status with: corp entities show ${entityId}`);
     } else {
-      printError(`Failed to dissolve entity: ${err}`);
+      printError2(`Failed to dissolve entity: ${err}`);
     }
     process.exit(1);
   }
@@ -3435,7 +3636,7 @@ async function contactsListCommand(opts) {
     else if (contacts.length === 0) console.log("No contacts found.");
     else printContactsTable(contacts);
   } catch (err) {
-    printError(`Failed to fetch contacts: ${err}`);
+    printError2(`Failed to fetch contacts: ${err}`);
     process.exit(1);
   }
 }
@@ -3472,7 +3673,7 @@ async function contactsShowCommand(contactId, opts) {
       console.log(chalk6.cyan("\u2500".repeat(40)));
     }
   } catch (err) {
-    printError(`Failed to fetch contact: ${err}`);
+    printError2(`Failed to fetch contact: ${err}`);
     process.exit(1);
   }
 }
@@ -3502,7 +3703,7 @@ async function contactsAddCommand(opts) {
       { jsonOnly: opts.json, referenceKind: "contact", showReuseHint: true }
     );
   } catch (err) {
-    printError(`Failed to create contact: ${err}`);
+    printError2(`Failed to create contact: ${err}`);
     process.exit(1);
   }
 }
@@ -3551,7 +3752,7 @@ async function contactsEditCommand(contactId, opts) {
     resolver.remember("contact", resolvedContactId, eid);
     printWriteResult(result, "Contact updated.", opts.json);
   } catch (err) {
-    printError(`Failed to update contact: ${err}`);
+    printError2(`Failed to update contact: ${err}`);
     process.exit(1);
   }
 }
@@ -3571,14 +3772,18 @@ __export(cap_table_exports, {
   addSecurityCommand: () => addSecurityCommand,
   approveValuationCommand: () => approveValuationCommand,
   capTableCommand: () => capTableCommand,
+  controlMapCommand: () => controlMapCommand,
   createInstrumentCommand: () => createInstrumentCommand,
   createValuationCommand: () => createValuationCommand,
+  dilutionPreviewCommand: () => dilutionPreviewCommand,
   distributeCommand: () => distributeCommand,
+  executeConversionCommand: () => executeConversionCommand,
   fourOhNineACommand: () => fourOhNineACommand,
   instrumentsCommand: () => instrumentsCommand,
   issueEquityCommand: () => issueEquityCommand,
   issueRoundCommand: () => issueRoundCommand,
   issueSafeCommand: () => issueSafeCommand,
+  previewConversionCommand: () => previewConversionCommand,
   roundsCommand: () => roundsCommand,
   safesCommand: () => safesCommand,
   shareClassesCommand: () => shareClassesCommand,
@@ -3707,7 +3912,7 @@ async function capTableCommand(opts) {
       return;
     }
     if (data.access_level === "none") {
-      printError("You do not have access to this entity's cap table.");
+      printError2("You do not have access to this entity's cap table.");
       process.exit(1);
     }
     printCapTable(data);
@@ -3717,7 +3922,7 @@ async function capTableCommand(opts) {
     } catch {
     }
   } catch (err) {
-    printError(`Failed to fetch cap table: ${err}`);
+    printError2(`Failed to fetch cap table: ${err}`);
     process.exit(1);
   }
 }
@@ -3733,7 +3938,7 @@ async function safesCommand(opts) {
     else if (safes.length === 0) console.log("No SAFE notes found.");
     else printSafesTable(safes);
   } catch (err) {
-    printError(`Failed to fetch SAFE notes: ${err}`);
+    printError2(`Failed to fetch SAFE notes: ${err}`);
     process.exit(1);
   }
 }
@@ -3749,7 +3954,7 @@ async function transfersCommand(opts) {
     else if (transfers.length === 0) console.log("No share transfers found.");
     else printTransfersTable(transfers);
   } catch (err) {
-    printError(`Failed to fetch transfers: ${err}`);
+    printError2(`Failed to fetch transfers: ${err}`);
     process.exit(1);
   }
 }
@@ -3766,7 +3971,7 @@ async function instrumentsCommand(opts) {
     else if (instruments.length === 0) console.log("No instruments found.");
     else printInstrumentsTable(instruments);
   } catch (err) {
-    printError(`Failed to fetch instruments: ${err}`);
+    printError2(`Failed to fetch instruments: ${err}`);
     process.exit(1);
   }
 }
@@ -3783,7 +3988,7 @@ async function shareClassesCommand(opts) {
     else if (shareClasses.length === 0) console.log("No share classes found.");
     else printShareClassesTable(shareClasses);
   } catch (err) {
-    printError(`Failed to fetch share classes: ${err}`);
+    printError2(`Failed to fetch share classes: ${err}`);
     process.exit(1);
   }
 }
@@ -3799,7 +4004,7 @@ async function roundsCommand(opts) {
     else if (rounds.length === 0) console.log("No rounds found.");
     else printRoundsTable(rounds);
   } catch (err) {
-    printError(`Failed to fetch rounds: ${err}`);
+    printError2(`Failed to fetch rounds: ${err}`);
     process.exit(1);
   }
 }
@@ -3815,7 +4020,7 @@ async function valuationsCommand(opts) {
     else if (valuations.length === 0) console.log("No valuations found.");
     else printValuationsTable(valuations);
   } catch (err) {
-    printError(`Failed to fetch valuations: ${err}`);
+    printError2(`Failed to fetch valuations: ${err}`);
     process.exit(1);
   }
 }
@@ -3854,7 +4059,7 @@ async function fourOhNineACommand(opts) {
         );
       }
     } else {
-      printError(`Failed to fetch 409A valuation: ${err}`);
+      printError2(`Failed to fetch 409A valuation: ${err}`);
     }
     process.exit(1);
   }
@@ -3881,12 +4086,12 @@ async function issueEquityCommand(opts) {
     const capTable = await client.getCapTable(eid);
     const issuerLegalEntityId = capTable.issuer_legal_entity_id;
     if (!issuerLegalEntityId) {
-      printError("No issuer legal entity found. Has this entity been formed with a cap table?");
+      printError2("No issuer legal entity found. Has this entity been formed with a cap table?");
       process.exit(1);
     }
     const instruments = capTable.instruments ?? [];
     if (!instruments.length) {
-      printError("No instruments found on cap table. Create one with: corp cap-table create-instrument --kind common_equity --symbol COMMON --authorized-units <shares>");
+      printError2("No instruments found on cap table. Create one with: corp cap-table create-instrument --kind common_equity --symbol COMMON --authorized-units <shares>");
       process.exit(1);
     }
     const explicitInstrumentId = opts.instrumentId ? await resolver.resolveInstrument(eid, opts.instrumentId) : void 0;
@@ -3932,9 +4137,8 @@ async function issueEquityCommand(opts) {
     }
     printSuccess(`Equity issued: ${opts.shares} shares (${opts.grantType}) to ${opts.recipient}`);
     printReferenceSummary("round", round, { label: "Round Ref:", showReuseHint: true });
-    printJson(result);
   } catch (err) {
-    printError(`Failed to issue equity: ${err}`);
+    printError2(`Failed to issue equity: ${err}`);
     process.exit(1);
   }
 }
@@ -3948,9 +4152,9 @@ async function issueSafeCommand(opts) {
       printDryRun("cap_table.issue_safe", {
         entity_id: eid,
         investor: opts.investor,
-        amount: opts.amount,
+        amount_cents: opts.amountCents,
         safe_type: opts.safeType,
-        valuation_cap: opts.valuationCap,
+        valuation_cap_cents: opts.valuationCapCents,
         email: opts.email,
         meeting_id: opts.meetingId,
         resolution_id: opts.resolutionId
@@ -3970,8 +4174,8 @@ async function issueSafeCommand(opts) {
     const body = {
       entity_id: eid,
       investor_name: opts.investor,
-      principal_amount_cents: opts.amount,
-      valuation_cap_cents: opts.valuationCap,
+      principal_amount_cents: opts.amountCents,
+      valuation_cap_cents: opts.valuationCapCents,
       safe_type: opts.safeType
     };
     if (opts.email) body.email = opts.email;
@@ -3984,11 +4188,10 @@ async function issueSafeCommand(opts) {
       printJson(result);
       return;
     }
-    printSuccess(`SAFE issued: $${(opts.amount / 100).toLocaleString()} to ${opts.investor}`);
+    printSuccess(`SAFE issued: $${(opts.amountCents / 100).toLocaleString()} to ${opts.investor}`);
     printReferenceSummary("safe_note", result, { showReuseHint: true });
-    printJson(result);
   } catch (err) {
-    printError(`Failed to issue SAFE: ${err}`);
+    printError2(`Failed to issue SAFE: ${err}`);
     process.exit(1);
   }
 }
@@ -4057,7 +4260,7 @@ async function transferSharesCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to create transfer workflow: ${err}`);
+    printError2(`Failed to create transfer workflow: ${err}`);
     process.exit(1);
   }
 }
@@ -4069,7 +4272,7 @@ async function distributeCommand(opts) {
     const eid = await resolver.resolveEntity(opts.entityId);
     const payload = {
       entity_id: eid,
-      total_amount_cents: opts.amount,
+      total_amount_cents: opts.amountCents,
       distribution_type: opts.type,
       description: opts.description
     };
@@ -4086,7 +4289,7 @@ async function distributeCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to calculate distribution: ${err}`);
+    printError2(`Failed to calculate distribution: ${err}`);
     process.exit(1);
   }
 }
@@ -4115,7 +4318,7 @@ async function startRoundCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to start round: ${err}`);
+    printError2(`Failed to start round: ${err}`);
     process.exit(1);
   }
 }
@@ -4157,7 +4360,7 @@ async function createInstrumentCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to create instrument: ${err}`);
+    printError2(`Failed to create instrument: ${err}`);
     process.exit(1);
   }
 }
@@ -4186,7 +4389,7 @@ async function addSecurityCommand(opts) {
     const result = await client.addRoundSecurity(roundId, body);
     printWriteResult(result, `Security added for ${opts.recipientName}`, opts.json);
   } catch (err) {
-    printError(`Failed to add security: ${err}`);
+    printError2(`Failed to add security: ${err}`);
     process.exit(1);
   }
 }
@@ -4227,9 +4430,8 @@ async function issueRoundCommand(opts) {
     if (roundMatch) {
       printReferenceSummary("round", roundMatch.raw, { showReuseHint: true });
     }
-    printJson(result);
   } catch (err) {
-    printError(`Failed to issue round: ${err}`);
+    printError2(`Failed to issue round: ${err}`);
     process.exit(1);
   }
 }
@@ -4260,7 +4462,7 @@ async function createValuationCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to create valuation: ${err}`);
+    printError2(`Failed to create valuation: ${err}`);
     process.exit(1);
   }
 }
@@ -4305,13 +4507,12 @@ async function submitValuationCommand(opts) {
         printReferenceSummary("agenda_item", { agenda_item_id: result.agenda_item_id }, { label: "Agenda Ref:" });
       }
     }
-    printJson(result);
   } catch (err) {
     const msg = String(err);
     if (msg.includes("404")) {
-      printError(`Valuation not found. List valuations with: corp cap-table valuations`);
+      printError2(`Valuation not found. List valuations with: corp cap-table valuations`);
     } else {
-      printError(`Failed to submit valuation: ${err}`);
+      printError2(`Failed to submit valuation: ${err}`);
     }
     process.exit(1);
   }
@@ -4341,10 +4542,98 @@ async function approveValuationCommand(opts) {
   } catch (err) {
     const msg = String(err);
     if (msg.includes("400")) {
-      printError(`Bad request \u2014 a --resolution-id from a board vote may be required. Submit for approval first: corp cap-table submit-valuation <valuation-ref>`);
+      printError2(`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 {
-      printError(`Failed to approve valuation: ${err}`);
+      printError2(`Failed to approve valuation: ${err}`);
+    }
+    process.exit(1);
+  }
+}
+async function previewConversionCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const safeId = await resolver.resolveSafeNote(eid, opts.safeId);
+    const result = await client.previewRoundConversion({
+      entity_id: eid,
+      safe_note_id: safeId,
+      price_per_share_cents: opts.pricePerShareCents
+    });
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess("Conversion Preview:");
+    if (result.shares_issued) console.log(`  Shares to issue: ${result.shares_issued}`);
+    if (result.ownership_pct) console.log(`  Post-conversion ownership: ${result.ownership_pct}%`);
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to preview conversion: ${err}`);
+    process.exit(1);
+  }
+}
+async function executeConversionCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const safeId = await resolver.resolveSafeNote(eid, opts.safeId);
+    const payload = {
+      entity_id: eid,
+      safe_note_id: safeId,
+      price_per_share_cents: opts.pricePerShareCents
+    };
+    if (opts.dryRun) {
+      printDryRun("equity.conversion.execute", payload);
+      return;
+    }
+    const result = await client.executeRoundConversion(
+      payload
+    );
+    printWriteResult(result, `Conversion executed for SAFE ${safeId}`, {
+      jsonOnly: opts.json
+    });
+  } catch (err) {
+    printError2(`Failed to execute conversion: ${err}`);
+    process.exit(1);
+  }
+}
+async function dilutionPreviewCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const roundId = await resolver.resolveRound(eid, opts.roundId);
+    const result = await client.getDilutionPreview(eid, roundId);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to preview dilution: ${err}`);
+    process.exit(1);
+  }
+}
+async function controlMapCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const rootEntityId = opts.rootEntityId ? await resolver.resolveEntity(opts.rootEntityId) : eid;
+    const result = await client.getControlMap(eid, rootEntityId);
+    if (opts.json) {
+      printJson(result);
+      return;
     }
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to fetch control map: ${err}`);
     process.exit(1);
   }
 }
@@ -4373,6 +4662,7 @@ var init_cap_table = __esm({
 // src/commands/finance.ts
 var finance_exports = {};
 __export(finance_exports, {
+  financeActivateAccountCommand: () => financeActivateAccountCommand,
   financeBankAccountsCommand: () => financeBankAccountsCommand,
   financeClassificationsCommand: () => financeClassificationsCommand,
   financeClassifyContractorCommand: () => financeClassifyContractorCommand,
@@ -4386,6 +4676,7 @@ __export(finance_exports, {
   financePayrollRunsCommand: () => financePayrollRunsCommand,
   financeReconcileCommand: () => financeReconcileCommand,
   financeReconciliationsCommand: () => financeReconciliationsCommand,
+  financeStatementsCommand: () => financeStatementsCommand,
   financeSummaryCommand: () => financeSummaryCommand
 });
 function sumAmounts(records, candidates) {
@@ -4487,7 +4778,7 @@ async function financeSummaryCommand(opts) {
     }
     printFinanceSummaryPanel(summary);
   } catch (err) {
-    printError(`Failed to fetch finance summary: ${err}`);
+    printError2(`Failed to fetch finance summary: ${err}`);
     process.exit(1);
   }
 }
@@ -4503,7 +4794,7 @@ async function financeInvoicesCommand(opts) {
     else if (invoices.length === 0) console.log("No invoices found.");
     else printInvoicesTable(invoices);
   } catch (err) {
-    printError(`Failed to fetch invoices: ${err}`);
+    printError2(`Failed to fetch invoices: ${err}`);
     process.exit(1);
   }
 }
@@ -4519,7 +4810,7 @@ async function financeBankAccountsCommand(opts) {
     else if (accounts.length === 0) console.log("No bank accounts found.");
     else printBankAccountsTable(accounts);
   } catch (err) {
-    printError(`Failed to fetch bank accounts: ${err}`);
+    printError2(`Failed to fetch bank accounts: ${err}`);
     process.exit(1);
   }
 }
@@ -4535,7 +4826,7 @@ async function financePaymentsCommand(opts) {
     else if (payments.length === 0) console.log("No payments found.");
     else printPaymentsTable(payments);
   } catch (err) {
-    printError(`Failed to fetch payments: ${err}`);
+    printError2(`Failed to fetch payments: ${err}`);
     process.exit(1);
   }
 }
@@ -4551,7 +4842,7 @@ async function financePayrollRunsCommand(opts) {
     else if (runs.length === 0) console.log("No payroll runs found.");
     else printPayrollRunsTable(runs);
   } catch (err) {
-    printError(`Failed to fetch payroll runs: ${err}`);
+    printError2(`Failed to fetch payroll runs: ${err}`);
     process.exit(1);
   }
 }
@@ -4567,7 +4858,7 @@ async function financeDistributionsCommand(opts) {
     else if (distributions.length === 0) console.log("No distributions found.");
     else printDistributionsTable(distributions);
   } catch (err) {
-    printError(`Failed to fetch distributions: ${err}`);
+    printError2(`Failed to fetch distributions: ${err}`);
     process.exit(1);
   }
 }
@@ -4583,7 +4874,7 @@ async function financeReconciliationsCommand(opts) {
     else if (reconciliations.length === 0) console.log("No reconciliations found.");
     else printReconciliationsTable(reconciliations);
   } catch (err) {
-    printError(`Failed to fetch reconciliations: ${err}`);
+    printError2(`Failed to fetch reconciliations: ${err}`);
     process.exit(1);
   }
 }
@@ -4599,7 +4890,7 @@ async function financeClassificationsCommand(opts) {
     else if (classifications.length === 0) console.log("No contractor classifications found.");
     else printClassificationsTable(classifications);
   } catch (err) {
-    printError(`Failed to fetch contractor classifications: ${err}`);
+    printError2(`Failed to fetch contractor classifications: ${err}`);
     process.exit(1);
   }
 }
@@ -4612,7 +4903,7 @@ async function financeInvoiceCommand(opts) {
     const result = await client.createInvoice({
       entity_id: eid,
       customer_name: opts.customer,
-      amount_cents: opts.amount,
+      amount_cents: opts.amountCents,
       due_date: opts.dueDate,
       description: opts.description
     });
@@ -4624,7 +4915,7 @@ async function financeInvoiceCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to create invoice: ${err}`);
+    printError2(`Failed to create invoice: ${err}`);
     process.exit(1);
   }
 }
@@ -4647,7 +4938,7 @@ async function financePayrollCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to run payroll: ${err}`);
+    printError2(`Failed to run payroll: ${err}`);
     process.exit(1);
   }
 }
@@ -4659,7 +4950,7 @@ async function financePayCommand(opts) {
     const eid = await resolver.resolveEntity(opts.entityId);
     const result = await client.submitPayment({
       entity_id: eid,
-      amount_cents: opts.amount,
+      amount_cents: opts.amountCents,
       recipient: opts.recipient,
       payment_method: opts.method,
       description: `Payment via ${opts.method}`
@@ -4672,7 +4963,7 @@ async function financePayCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to submit payment: ${err}`);
+    printError2(`Failed to submit payment: ${err}`);
     process.exit(1);
   }
 }
@@ -4691,7 +4982,27 @@ async function financeOpenAccountCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to open bank account: ${err}`);
+    printError2(`Failed to open bank account: ${err}`);
+    process.exit(1);
+  }
+}
+async function financeActivateAccountCommand(accountRef, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const resolvedId = await resolver.resolveBankAccount(eid, accountRef);
+    const result = await client.activateBankAccount(resolvedId, eid);
+    await resolver.stabilizeRecord("bank_account", result, eid);
+    resolver.rememberFromRecord("bank_account", result, eid);
+    printWriteResult(result, `Bank account activated: ${resolvedId}`, {
+      jsonOnly: opts.json,
+      referenceKind: "bank_account",
+      showReuseHint: true
+    });
+  } catch (err) {
+    printError2(`Failed to activate bank account: ${err}`);
     process.exit(1);
   }
 }
@@ -4718,7 +5029,26 @@ async function financeClassifyContractorCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to classify contractor: ${err}`);
+    printError2(`Failed to classify contractor: ${err}`);
+    process.exit(1);
+  }
+}
+async function financeStatementsCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const params = {};
+    if (opts.period) params.period = opts.period;
+    const result = await client.getFinancialStatements(eid, params);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to fetch financial statements: ${err}`);
     process.exit(1);
   }
 }
@@ -4741,7 +5071,7 @@ async function financeReconcileCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to reconcile ledger: ${err}`);
+    printError2(`Failed to reconcile ledger: ${err}`);
     process.exit(1);
   }
 }
@@ -4765,9 +5095,13 @@ __export(governance_exports, {
   governanceAddSeatCommand: () => governanceAddSeatCommand,
   governanceConveneCommand: () => governanceConveneCommand,
   governanceCreateBodyCommand: () => governanceCreateBodyCommand,
+  governanceIncidentsCommand: () => governanceIncidentsCommand,
   governanceListCommand: () => governanceListCommand,
   governanceMeetingsCommand: () => governanceMeetingsCommand,
+  governanceModeCommand: () => governanceModeCommand,
   governanceOpenMeetingCommand: () => governanceOpenMeetingCommand,
+  governanceProfileCommand: () => governanceProfileCommand,
+  governanceResignCommand: () => governanceResignCommand,
   governanceResolutionsCommand: () => governanceResolutionsCommand,
   governanceSeatsCommand: () => governanceSeatsCommand,
   governanceVoteCommand: () => governanceVoteCommand,
@@ -4776,6 +5110,7 @@ __export(governance_exports, {
   sendNoticeCommand: () => sendNoticeCommand,
   writtenConsentCommand: () => writtenConsentCommand
 });
+import { confirm as confirm3 } from "@inquirer/prompts";
 import chalk8 from "chalk";
 async function governanceCreateBodyCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -4804,12 +5139,11 @@ async function governanceCreateBodyCommand(opts) {
     }
     printSuccess(`Governance body created: ${bodyId}`);
     printReferenceSummary("body", result, { showReuseHint: true });
-    printJson(result);
     console.log(chalk8.dim("\n  Next steps:"));
     console.log(chalk8.dim(`    corp governance add-seat @last:body --holder <contact-ref>`));
     console.log(chalk8.dim(`    corp governance seats @last:body`));
   } catch (err) {
-    printError(`Failed to create governance body: ${err}`);
+    printError2(`Failed to create governance body: ${err}`);
     process.exit(1);
   }
 }
@@ -4835,9 +5169,8 @@ async function governanceAddSeatCommand(bodyId, opts) {
     }
     printSuccess(`Seat added: ${result.seat_id ?? "OK"}`);
     printReferenceSummary("seat", result, { showReuseHint: true });
-    printJson(result);
   } catch (err) {
-    printError(`Failed to add seat: ${err}`);
+    printError2(`Failed to add seat: ${err}`);
     process.exit(1);
   }
 }
@@ -4853,7 +5186,7 @@ async function governanceListCommand(opts) {
     else if (bodies.length === 0) console.log("No governance bodies found.");
     else printGovernanceTable(bodies);
   } catch (err) {
-    printError(`Failed to fetch governance bodies: ${err}`);
+    printError2(`Failed to fetch governance bodies: ${err}`);
     process.exit(1);
   }
 }
@@ -4870,7 +5203,7 @@ async function governanceSeatsCommand(bodyId, opts) {
     else if (seats.length === 0) console.log("No seats found.");
     else printSeatsTable(seats);
   } catch (err) {
-    printError(`Failed to fetch seats: ${err}`);
+    printError2(`Failed to fetch seats: ${err}`);
     process.exit(1);
   }
 }
@@ -4887,7 +5220,7 @@ async function governanceMeetingsCommand(bodyId, opts) {
     else if (meetings.length === 0) console.log("No meetings found.");
     else printMeetingsTable(meetings);
   } catch (err) {
-    printError(`Failed to fetch meetings: ${err}`);
+    printError2(`Failed to fetch meetings: ${err}`);
     process.exit(1);
   }
 }
@@ -4904,7 +5237,7 @@ async function governanceResolutionsCommand(meetingId, opts) {
     else if (resolutions.length === 0) console.log("No resolutions found.");
     else printResolutionsTable(resolutions);
   } catch (err) {
-    printError(`Failed to fetch resolutions: ${err}`);
+    printError2(`Failed to fetch resolutions: ${err}`);
     process.exit(1);
   }
 }
@@ -4937,13 +5270,12 @@ async function governanceConveneCommand(opts) {
     }
     printSuccess(`Meeting scheduled: ${meetingId}`);
     printReferenceSummary("meeting", result, { showReuseHint: true });
-    printJson(result);
     console.log(chalk8.dim("\n  Next steps:"));
     console.log(chalk8.dim(`    corp governance notice @last:meeting`));
     console.log(chalk8.dim(`    corp governance open @last:meeting --present-seat <seat-ref>`));
     console.log(chalk8.dim(`    corp governance agenda-items @last:meeting`));
   } catch (err) {
-    printError(`Failed to schedule meeting: ${err}`);
+    printError2(`Failed to schedule meeting: ${err}`);
     process.exit(1);
   }
 }
@@ -4968,9 +5300,8 @@ async function governanceOpenMeetingCommand(meetingId, opts) {
       return;
     }
     printSuccess(`Meeting opened: ${resolvedMeetingId}`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to open meeting: ${err}`);
+    printError2(`Failed to open meeting: ${err}`);
     process.exit(1);
   }
 }
@@ -4998,16 +5329,15 @@ async function governanceVoteCommand(meetingId, itemId, opts) {
       return;
     }
     printSuccess(`Vote cast: ${result.vote_id ?? "OK"}`);
-    printJson(result);
   } catch (err) {
     const message = String(err);
     if (message.includes("voting session is not open")) {
-      printError(
+      printError2(
         `Failed to cast vote: ${err}
   Open the meeting first: corp governance open ${meetingId} --present-seat <seat-ref>`
       );
     } else {
-      printError(`Failed to cast vote: ${err}`);
+      printError2(`Failed to cast vote: ${err}`);
     }
     process.exit(1);
   }
@@ -5029,9 +5359,8 @@ async function sendNoticeCommand(meetingId, opts) {
       return;
     }
     printSuccess(`Notice sent for meeting ${resolvedMeetingId}`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to send notice: ${err}`);
+    printError2(`Failed to send notice: ${err}`);
     process.exit(1);
   }
 }
@@ -5052,9 +5381,8 @@ async function adjournMeetingCommand(meetingId, opts) {
       return;
     }
     printSuccess(`Meeting ${resolvedMeetingId} adjourned`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to adjourn meeting: ${err}`);
+    printError2(`Failed to adjourn meeting: ${err}`);
     process.exit(1);
   }
 }
@@ -5069,15 +5397,24 @@ async function cancelMeetingCommand(meetingId, opts) {
       printDryRun("governance.cancel_meeting", { entity_id: eid, meeting_id: resolvedMeetingId });
       return;
     }
+    if (!opts.yes) {
+      const ok = await confirm3({
+        message: `Cancel meeting ${resolvedMeetingId}?`,
+        default: false
+      });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
     const result = await client.cancelMeeting(resolvedMeetingId, eid);
     if (opts.json) {
       printJson(result);
       return;
     }
     printSuccess(`Meeting ${resolvedMeetingId} cancelled`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to cancel meeting: ${err}`);
+    printError2(`Failed to cancel meeting: ${err}`);
     process.exit(1);
   }
 }
@@ -5098,9 +5435,8 @@ async function reopenMeetingCommand(meetingId, opts) {
       return;
     }
     printSuccess(`Meeting ${resolvedMeetingId} re-opened`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to re-open meeting: ${err}`);
+    printError2(`Failed to re-open meeting: ${err}`);
     process.exit(1);
   }
 }
@@ -5126,9 +5462,8 @@ async function finalizeAgendaItemCommand(meetingId, itemId, opts) {
       return;
     }
     printSuccess(`Agenda item ${resolvedItemId} finalized as ${opts.status}`);
-    printJson(result);
   } catch (err) {
-    printError(`Failed to finalize agenda item: ${err}`);
+    printError2(`Failed to finalize agenda item: ${err}`);
     process.exit(1);
   }
 }
@@ -5161,9 +5496,8 @@ async function computeResolutionCommand(meetingId, itemId, opts) {
     }
     printSuccess(`Resolution computed for agenda item ${itemId}`);
     printReferenceSummary("resolution", result, { showReuseHint: true });
-    printJson(result);
   } catch (err) {
-    printError(`Failed to compute resolution: ${err}`);
+    printError2(`Failed to compute resolution: ${err}`);
     process.exit(1);
   }
 }
@@ -5194,43 +5528,137 @@ async function writtenConsentCommand(opts) {
     }
     printSuccess(`Written consent created: ${meetingId}`);
     printReferenceSummary("meeting", result, { showReuseHint: true });
-    printJson(result);
     console.log(chalk8.dim("\n  Next steps:"));
     console.log(chalk8.dim(`    corp governance agenda-items @last:meeting`));
     console.log(chalk8.dim(`    corp governance vote @last:meeting <item-ref> --voter <contact-ref> --vote for`));
   } catch (err) {
-    printError(`Failed to create written consent: ${err}`);
+    printError2(`Failed to create written consent: ${err}`);
     process.exit(1);
   }
 }
-async function listAgendaItemsCommand(meetingId, opts) {
+async function governanceModeCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   const resolver = new ReferenceResolver(client, cfg);
   try {
     const eid = await resolver.resolveEntity(opts.entityId);
-    const resolvedMeetingId = await resolver.resolveMeeting(eid, meetingId);
-    const items = await client.listAgendaItems(resolvedMeetingId, eid);
-    await resolver.stabilizeRecords("agenda_item", items, eid);
-    if (opts.json) printJson(items);
-    else if (items.length === 0) console.log("No agenda items found.");
-    else printAgendaItemsTable(items);
+    if (opts.set) {
+      const result = await client.setGovernanceMode({ entity_id: eid, mode: opts.set });
+      if (opts.json) {
+        printJson(result);
+        return;
+      }
+      printSuccess(`Governance mode set to: ${opts.set}`);
+    } else {
+      const result = await client.getGovernanceMode(eid);
+      if (opts.json) {
+        printJson(result);
+        return;
+      }
+      console.log(`  ${chalk8.bold("Governance Mode:")} ${result.mode ?? "N/A"}`);
+      if (result.reason) console.log(`  ${chalk8.bold("Reason:")} ${result.reason}`);
+    }
   } catch (err) {
-    printError(`Failed to list agenda items: ${err}`);
+    printError2(`Failed: ${err}`);
     process.exit(1);
   }
 }
-var init_governance = __esm({
-  "src/commands/governance.ts"() {
-    "use strict";
-    init_config();
-    init_api_client();
-    init_output();
-    init_references();
-  }
-});
-
-// src/formation-automation.ts
+async function governanceResignCommand(seatRef, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const seatId = await resolver.resolveSeat(eid, seatRef, opts.bodyId);
+    const result = await client.resignSeat(seatId, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess(`Seat ${seatId} resigned.`);
+  } catch (err) {
+    printError2(`Failed to resign seat: ${err}`);
+    process.exit(1);
+  }
+}
+async function governanceIncidentsCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const incidents = await client.listGovernanceIncidents(eid);
+    if (opts.json) {
+      printJson(incidents);
+      return;
+    }
+    if (incidents.length === 0) {
+      console.log("No governance incidents found.");
+      return;
+    }
+    for (const inc of incidents) {
+      const status = String(inc.status ?? "open");
+      const colored = status === "resolved" ? chalk8.green(status) : chalk8.red(status);
+      console.log(`  [${colored}] ${inc.incident_type ?? "unknown"}: ${inc.description ?? inc.id}`);
+    }
+  } catch (err) {
+    printError2(`Failed to list incidents: ${err}`);
+    process.exit(1);
+  }
+}
+async function governanceProfileCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const profile = await client.getGovernanceProfile(eid);
+    if (opts.json) {
+      printJson(profile);
+      return;
+    }
+    console.log(chalk8.blue("\u2500".repeat(40)));
+    console.log(chalk8.blue.bold("  Governance Profile"));
+    console.log(chalk8.blue("\u2500".repeat(40)));
+    for (const [key, value] of Object.entries(profile)) {
+      if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+        console.log(`  ${chalk8.bold(key.replaceAll("_", " ") + ":")} ${value}`);
+      }
+    }
+    console.log(chalk8.blue("\u2500".repeat(40)));
+  } catch (err) {
+    printError2(`Failed to get governance profile: ${err}`);
+    process.exit(1);
+  }
+}
+async function listAgendaItemsCommand(meetingId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const resolvedMeetingId = await resolver.resolveMeeting(eid, meetingId);
+    const items = await client.listAgendaItems(resolvedMeetingId, eid);
+    await resolver.stabilizeRecords("agenda_item", items, eid);
+    if (opts.json) printJson(items);
+    else if (items.length === 0) console.log("No agenda items found.");
+    else printAgendaItemsTable(items);
+  } catch (err) {
+    printError2(`Failed to list agenda items: ${err}`);
+    process.exit(1);
+  }
+}
+var init_governance = __esm({
+  "src/commands/governance.ts"() {
+    "use strict";
+    init_config();
+    init_api_client();
+    init_output();
+    init_references();
+  }
+});
+
+// src/formation-automation.ts
 function normalizeRole(value) {
   return String(value ?? "").trim().toLowerCase();
 }
@@ -5457,7 +5885,7 @@ async function documentsListCommand(opts) {
     else if (docs.length === 0) console.log("No documents found.");
     else printDocumentsTable(docs);
   } catch (err) {
-    printError(`Failed to fetch documents: ${err}`);
+    printError2(`Failed to fetch documents: ${err}`);
     process.exit(1);
   }
 }
@@ -5477,7 +5905,7 @@ async function documentsSigningLinkCommand(docId, opts) {
     }
     console.log(shareUrl);
   } catch (err) {
-    printError(`Failed to get signing link: ${err}`);
+    printError2(`Failed to get signing link: ${err}`);
     process.exit(1);
   }
 }
@@ -5518,7 +5946,7 @@ async function documentsGenerateCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to generate contract: ${err}`);
+    printError2(`Failed to generate contract: ${err}`);
     process.exit(1);
   }
 }
@@ -5573,7 +6001,7 @@ async function documentsSignCommand(docId, opts) {
     printReferenceSummary("document", result.document, { showReuseHint: true });
     printJson(result.document);
   } catch (err) {
-    printError(`Failed to sign document: ${err}`);
+    printError2(`Failed to sign document: ${err}`);
     process.exit(1);
   }
 }
@@ -5598,13 +6026,13 @@ async function documentsSignAllCommand(opts) {
       signatures: Array.isArray(document.signatures) ? document.signatures.length : document.signatures
     })));
   } catch (err) {
-    printError(`Failed to sign formation documents: ${err}`);
+    printError2(`Failed to sign formation documents: ${err}`);
     process.exit(1);
   }
 }
 async function documentsPreviewPdfCommand(opts) {
   if (!opts.documentId || opts.documentId.trim().length === 0) {
-    printError("preview-pdf requires --definition-id (or deprecated alias --document-id)");
+    printError2("preview-pdf requires --definition-id (or deprecated alias --document-id)");
     process.exit(1);
   }
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -5617,7 +6045,7 @@ async function documentsPreviewPdfCommand(opts) {
     printSuccess(`Preview PDF URL: ${url}`);
     console.log("The document definition was validated successfully. Use your API key to download the PDF.");
   } catch (err) {
-    printError(`Failed to validate preview PDF: ${err}`);
+    printError2(`Failed to validate preview PDF: ${err}`);
     process.exit(1);
   }
 }
@@ -5640,8 +6068,34 @@ __export(tax_exports, {
   taxDeadlineCommand: () => taxDeadlineCommand,
   taxDeadlinesCommand: () => taxDeadlinesCommand,
   taxFileCommand: () => taxFileCommand,
-  taxFilingsCommand: () => taxFilingsCommand
+  taxFilingsCommand: () => taxFilingsCommand,
+  taxSummaryCommand: () => taxSummaryCommand
 });
+async function taxSummaryCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const [filings, deadlines] = await Promise.all([
+      client.listTaxFilings(eid),
+      client.listDeadlines(eid)
+    ]);
+    if (opts.json) {
+      printJson({ filings, deadlines });
+      return;
+    }
+    if (filings.length === 0 && deadlines.length === 0) {
+      console.log("No tax filings or deadlines found.");
+      return;
+    }
+    if (filings.length > 0) printTaxFilingsTable(filings);
+    if (deadlines.length > 0) printDeadlinesTable(deadlines);
+  } catch (err) {
+    printError2(`Failed to fetch tax summary: ${err}`);
+    process.exit(1);
+  }
+}
 function normalizeRecurrence(recurrence) {
   if (!recurrence) return void 0;
   if (recurrence === "yearly") return "annual";
@@ -5659,7 +6113,7 @@ async function taxFilingsCommand(opts) {
     else if (filings.length === 0) console.log("No tax filings found.");
     else printTaxFilingsTable(filings);
   } catch (err) {
-    printError(`Failed to fetch tax filings: ${err}`);
+    printError2(`Failed to fetch tax filings: ${err}`);
     process.exit(1);
   }
 }
@@ -5675,7 +6129,7 @@ async function taxDeadlinesCommand(opts) {
     else if (deadlines.length === 0) console.log("No deadlines found.");
     else printDeadlinesTable(deadlines);
   } catch (err) {
-    printError(`Failed to fetch deadlines: ${err}`);
+    printError2(`Failed to fetch deadlines: ${err}`);
     process.exit(1);
   }
 }
@@ -5684,8 +6138,9 @@ async function taxFileCommand(opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   const resolver = new ReferenceResolver(client, cfg);
   try {
+    const docType = TAX_TYPE_ALIASES[opts.type] ?? opts.type;
     const eid = await resolver.resolveEntity(opts.entityId);
-    const result = await client.fileTaxDocument({ entity_id: eid, document_type: opts.type, tax_year: opts.year });
+    const result = await client.fileTaxDocument({ entity_id: eid, document_type: docType, tax_year: opts.year });
     await resolver.stabilizeRecord("tax_filing", result, eid);
     resolver.rememberFromRecord("tax_filing", result, eid);
     printWriteResult(result, `Tax document filed: ${result.filing_id ?? "OK"}`, {
@@ -5694,7 +6149,7 @@ async function taxFileCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to file tax document: ${err}`);
+    printError2(`Failed to file tax document: ${err}`);
     process.exit(1);
   }
 }
@@ -5721,10 +6176,11 @@ async function taxDeadlineCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to track deadline: ${err}`);
+    printError2(`Failed to track deadline: ${err}`);
     process.exit(1);
   }
 }
+var TAX_TYPE_ALIASES;
 var init_tax = __esm({
   "src/commands/tax.ts"() {
     "use strict";
@@ -5732,6 +6188,15 @@ var init_tax = __esm({
     init_api_client();
     init_output();
     init_references();
+    TAX_TYPE_ALIASES = {
+      form_1120: "1120",
+      form_1120s: "1120s",
+      form_1065: "1065",
+      form_1099_nec: "1099_nec",
+      form_k1: "k1",
+      form_941: "941",
+      form_w2: "w2"
+    };
   }
 });
 
@@ -5740,7 +6205,9 @@ var agents_exports = {};
 __export(agents_exports, {
   agentsCreateCommand: () => agentsCreateCommand,
   agentsDeleteCommand: () => agentsDeleteCommand,
-  agentsExecutionsCommand: () => agentsExecutionsCommand,
+  agentsExecutionCommand: () => agentsExecutionCommand,
+  agentsExecutionResultCommand: () => agentsExecutionResultCommand,
+  agentsKillCommand: () => agentsKillCommand,
   agentsListCommand: () => agentsListCommand,
   agentsMessageCommand: () => agentsMessageCommand,
   agentsPauseCommand: () => agentsPauseCommand,
@@ -5748,6 +6215,7 @@ __export(agents_exports, {
   agentsShowCommand: () => agentsShowCommand,
   agentsSkillCommand: () => agentsSkillCommand
 });
+import { confirm as confirm4 } from "@inquirer/prompts";
 import chalk9 from "chalk";
 import { readFileSync as readFileSync2, realpathSync } from "fs";
 import { relative, resolve } from "path";
@@ -5762,7 +6230,7 @@ async function agentsListCommand(opts) {
     else if (agents.length === 0) console.log("No agents found.");
     else printAgentsTable(agents);
   } catch (err) {
-    printError(`Failed to fetch agents: ${err}`);
+    printError2(`Failed to fetch agents: ${err}`);
     process.exit(1);
   }
 }
@@ -5795,7 +6263,7 @@ async function agentsShowCommand(agentId, opts) {
     }
     console.log(chalk9.magenta("\u2500".repeat(40)));
   } catch (err) {
-    printError(`Failed to fetch agent: ${err}`);
+    printError2(`Failed to fetch agent: ${err}`);
     process.exit(1);
   }
 }
@@ -5815,7 +6283,7 @@ async function agentsCreateCommand(opts) {
       showReuseHint: true
     });
   } catch (err) {
-    printError(`Failed to create agent: ${err}`);
+    printError2(`Failed to create agent: ${err}`);
     process.exit(1);
   }
 }
@@ -5828,7 +6296,7 @@ async function agentsPauseCommand(agentId, opts) {
     const result = await client.updateAgent(resolvedAgentId, { status: "paused" });
     printWriteResult(result, `Agent ${resolvedAgentId} paused.`, opts.json);
   } catch (err) {
-    printError(`Failed to pause agent: ${err}`);
+    printError2(`Failed to pause agent: ${err}`);
     process.exit(1);
   }
 }
@@ -5841,7 +6309,7 @@ async function agentsResumeCommand(agentId, opts) {
     const result = await client.updateAgent(resolvedAgentId, { status: "active" });
     printWriteResult(result, `Agent ${resolvedAgentId} resumed.`, opts.json);
   } catch (err) {
-    printError(`Failed to resume agent: ${err}`);
+    printError2(`Failed to resume agent: ${err}`);
     process.exit(1);
   }
 }
@@ -5851,10 +6319,20 @@ async function agentsDeleteCommand(agentId, opts) {
   const resolver = new ReferenceResolver(client, cfg);
   try {
     const resolvedAgentId = await resolver.resolveAgent(agentId);
+    if (!opts.yes) {
+      const ok = await confirm4({
+        message: `Delete agent ${resolvedAgentId}? This cannot be undone.`,
+        default: false
+      });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
     const result = await client.deleteAgent(resolvedAgentId);
     printWriteResult(result, `Agent ${resolvedAgentId} deleted.`, opts.json);
   } catch (err) {
-    printError(`Failed to delete agent: ${err}`);
+    printError2(`Failed to delete agent: ${err}`);
     process.exit(1);
   }
 }
@@ -5894,21 +6372,72 @@ async function agentsMessageCommand(agentId, opts) {
     const result = await client.sendAgentMessage(resolvedAgentId, body);
     printWriteResult(result, `Message sent. Execution: ${result.execution_id ?? "OK"}`, opts.json);
   } catch (err) {
-    printError(`Failed to send message: ${err}`);
+    printError2(`Failed to send message: ${err}`);
     process.exit(1);
   }
 }
-async function agentsExecutionsCommand(agentId, _opts) {
+async function agentsExecutionCommand(agentId, executionId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   const resolver = new ReferenceResolver(client, cfg);
-  const resolvedAgentId = await resolver.resolveAgent(agentId);
-  printError(
-    `Listing executions is not yet supported.
-  To inspect a specific run, use the execution ID returned by "agents message":
-  GET /v1/agents/${resolvedAgentId}/executions/<execution-id>`
-  );
-  process.exit(1);
+  try {
+    const resolvedAgentId = await resolver.resolveAgent(agentId);
+    const result = await client.getAgentExecution(resolvedAgentId, executionId);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    console.log(chalk9.magenta("\u2500".repeat(40)));
+    console.log(chalk9.magenta.bold("  Execution Status"));
+    console.log(chalk9.magenta("\u2500".repeat(40)));
+    console.log(`  ${chalk9.bold("Execution:")} ${executionId}`);
+    console.log(`  ${chalk9.bold("Agent:")} ${resolvedAgentId}`);
+    console.log(`  ${chalk9.bold("Status:")} ${result.status ?? "N/A"}`);
+    if (result.started_at) console.log(`  ${chalk9.bold("Started:")} ${result.started_at}`);
+    if (result.completed_at) console.log(`  ${chalk9.bold("Completed:")} ${result.completed_at}`);
+    console.log(chalk9.magenta("\u2500".repeat(40)));
+  } catch (err) {
+    printError2(`Failed to get execution: ${err}`);
+    process.exit(1);
+  }
+}
+async function agentsExecutionResultCommand(agentId, executionId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const resolvedAgentId = await resolver.resolveAgent(agentId);
+    const result = await client.getAgentExecutionResult(resolvedAgentId, executionId);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess(`Result for execution ${executionId}:`);
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to get execution result: ${err}`);
+    process.exit(1);
+  }
+}
+async function agentsKillCommand(agentId, executionId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const resolvedAgentId = await resolver.resolveAgent(agentId);
+    if (!opts.yes) {
+      const ok = await confirm4({ message: `Kill execution ${executionId}?`, default: false });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
+    const result = await client.killAgentExecution(resolvedAgentId, executionId);
+    printWriteResult(result, `Execution ${executionId} killed.`, opts.json);
+  } catch (err) {
+    printError2(`Failed to kill execution: ${err}`);
+    process.exit(1);
+  }
 }
 async function agentsSkillCommand(agentId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -5928,7 +6457,7 @@ async function agentsSkillCommand(agentId, opts) {
     });
     printWriteResult(result, `Skill '${opts.name}' added to agent ${resolvedAgentId}.`, opts.json);
   } catch (err) {
-    printError(`Failed to add skill: ${err}`);
+    printError2(`Failed to add skill: ${err}`);
     process.exit(1);
   }
 }
@@ -5953,6 +6482,7 @@ __export(work_items_exports, {
   workItemsReleaseCommand: () => workItemsReleaseCommand,
   workItemsShowCommand: () => workItemsShowCommand
 });
+import { confirm as confirm5 } from "@inquirer/prompts";
 import chalk10 from "chalk";
 function actorLabel2(record, key) {
   const actor = record[`${key}_actor`];
@@ -5981,7 +6511,7 @@ async function workItemsListCommand(opts) {
     else if (items.length === 0) console.log("No work items found.");
     else printWorkItemsTable(items);
   } catch (err) {
-    printError(`Failed to fetch work items: ${err}`);
+    printError2(`Failed to fetch work items: ${err}`);
     process.exit(1);
   }
 }
@@ -6021,7 +6551,7 @@ async function workItemsShowCommand(workItemId, opts) {
     console.log(`  ${chalk10.bold("Created at:")} ${w.created_at ?? "N/A"}`);
     console.log(chalk10.cyan("\u2500".repeat(40)));
   } catch (err) {
-    printError(`Failed to fetch work item: ${err}`);
+    printError2(`Failed to fetch work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6031,10 +6561,6 @@ async function workItemsCreateCommand(opts) {
   const resolver = new ReferenceResolver(client, cfg);
   try {
     const eid = await resolver.resolveEntity(opts.entityId);
-    if (!opts.category) {
-      printError("Missing required option: --category <category>");
-      process.exit(1);
-    }
     const data = { title: opts.title, category: opts.category };
     if (opts.description) data.description = opts.description;
     if (opts.deadline) data.deadline = opts.deadline;
@@ -6049,7 +6575,7 @@ async function workItemsCreateCommand(opts) {
       { jsonOnly: opts.json, referenceKind: "work_item", showReuseHint: true }
     );
   } catch (err) {
-    printError(`Failed to create work item: ${err}`);
+    printError2(`Failed to create work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6067,7 +6593,7 @@ async function workItemsClaimCommand(workItemId, opts) {
     const result = await client.claimWorkItem(eid, resolvedWorkItemId, data);
     printWriteResult(result, `Work item ${resolvedWorkItemId} claimed by ${opts.claimedBy}.`, opts.json);
   } catch (err) {
-    printError(`Failed to claim work item: ${err}`);
+    printError2(`Failed to claim work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6085,7 +6611,7 @@ async function workItemsCompleteCommand(workItemId, opts) {
     const result = await client.completeWorkItem(eid, resolvedWorkItemId, data);
     printWriteResult(result, `Work item ${resolvedWorkItemId} completed.`, opts.json);
   } catch (err) {
-    printError(`Failed to complete work item: ${err}`);
+    printError2(`Failed to complete work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6099,7 +6625,7 @@ async function workItemsReleaseCommand(workItemId, opts) {
     const result = await client.releaseWorkItem(eid, resolvedWorkItemId);
     printWriteResult(result, `Work item ${resolvedWorkItemId} claim released.`, opts.json);
   } catch (err) {
-    printError(`Failed to release work item: ${err}`);
+    printError2(`Failed to release work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6110,10 +6636,20 @@ async function workItemsCancelCommand(workItemId, opts) {
   try {
     const eid = await resolver.resolveEntity(opts.entityId);
     const resolvedWorkItemId = await resolver.resolveWorkItem(eid, workItemId);
+    if (!opts.yes) {
+      const ok = await confirm5({
+        message: `Cancel work item ${resolvedWorkItemId}?`,
+        default: false
+      });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
     const result = await client.cancelWorkItem(eid, resolvedWorkItemId);
     printWriteResult(result, `Work item ${resolvedWorkItemId} cancelled.`, opts.json);
   } catch (err) {
-    printError(`Failed to cancel work item: ${err}`);
+    printError2(`Failed to cancel work item: ${err}`);
     process.exit(1);
   }
 }
@@ -6127,6 +6663,171 @@ var init_work_items = __esm({
   }
 });
 
+// src/commands/services.ts
+var services_exports = {};
+__export(services_exports, {
+  servicesBuyCommand: () => servicesBuyCommand,
+  servicesCancelCommand: () => servicesCancelCommand,
+  servicesCatalogCommand: () => servicesCatalogCommand,
+  servicesFulfillCommand: () => servicesFulfillCommand,
+  servicesListCommand: () => servicesListCommand,
+  servicesShowCommand: () => servicesShowCommand
+});
+import chalk11 from "chalk";
+async function servicesCatalogCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    const items = await client.listServiceCatalog();
+    if (opts.json) {
+      printJson(items);
+      return;
+    }
+    printServiceCatalogTable(items);
+  } catch (err) {
+    printError2(`Failed to list service catalog: ${err}`);
+    process.exit(1);
+  }
+}
+async function servicesBuyCommand(slug, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const payload = { entity_id: eid, service_slug: slug };
+    if (opts.dryRun) {
+      printDryRun("services.create_request", payload);
+      return;
+    }
+    const result = await client.createServiceRequest(payload);
+    await resolver.stabilizeRecord("service_request", result, eid);
+    resolver.rememberFromRecord("service_request", result, eid);
+    const requestId = String(result.request_id ?? result.id ?? "");
+    if (requestId) {
+      const checkout = await client.beginServiceCheckout(requestId, { entity_id: eid });
+      if (opts.json) {
+        printJson(checkout);
+        return;
+      }
+      printSuccess(`Service request created: ${requestId}`);
+      printReferenceSummary("service_request", result, { showReuseHint: true });
+      if (checkout.checkout_url) {
+        console.log(`
+  ${chalk11.bold("Checkout URL:")} ${checkout.checkout_url}`);
+      }
+      console.log(chalk11.dim("\n  Next steps:"));
+      console.log(chalk11.dim("    Complete payment at the checkout URL above"));
+      console.log(chalk11.dim("    corp services list --entity-id <id>"));
+    } else {
+      printWriteResult(result, "Service request created", {
+        referenceKind: "service_request",
+        showReuseHint: true
+      });
+    }
+  } catch (err) {
+    printError2(`Failed to create service request: ${err}`);
+    process.exit(1);
+  }
+}
+async function servicesListCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const requests = await client.listServiceRequests(eid);
+    const stable = await resolver.stabilizeRecords("service_request", requests, eid);
+    if (opts.json) {
+      printJson(stable);
+      return;
+    }
+    printServiceRequestsTable(stable);
+  } catch (err) {
+    printError2(`Failed to list service requests: ${err}`);
+    process.exit(1);
+  }
+}
+async function servicesShowCommand(ref_, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const requestId = await resolver.resolveServiceRequest(eid, ref_);
+    const result = await client.getServiceRequest(requestId, eid);
+    await resolver.stabilizeRecord("service_request", result, eid);
+    resolver.rememberFromRecord("service_request", result, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printReferenceSummary("service_request", result);
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to show service request: ${err}`);
+    process.exit(1);
+  }
+}
+async function servicesFulfillCommand(ref_, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const requestId = await resolver.resolveServiceRequest(eid, ref_);
+    const result = await client.fulfillServiceRequest(requestId, {
+      entity_id: eid,
+      note: opts.note
+    });
+    await resolver.stabilizeRecord("service_request", result, eid);
+    resolver.rememberFromRecord("service_request", result, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess(`Service request fulfilled: ${requestId}`);
+    printReferenceSummary("service_request", result, { showReuseHint: true });
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to fulfill service request: ${err}`);
+    process.exit(1);
+  }
+}
+async function servicesCancelCommand(ref_, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  const resolver = new ReferenceResolver(client, cfg);
+  try {
+    const eid = await resolver.resolveEntity(opts.entityId);
+    const requestId = await resolver.resolveServiceRequest(eid, ref_);
+    const result = await client.cancelServiceRequest(requestId, {
+      entity_id: eid
+    });
+    await resolver.stabilizeRecord("service_request", result, eid);
+    resolver.rememberFromRecord("service_request", result, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess(`Service request cancelled: ${requestId}`);
+    printReferenceSummary("service_request", result, { showReuseHint: true });
+    printJson(result);
+  } catch (err) {
+    printError2(`Failed to cancel service request: ${err}`);
+    process.exit(1);
+  }
+}
+var init_services = __esm({
+  "src/commands/services.ts"() {
+    "use strict";
+    init_config();
+    init_api_client();
+    init_output();
+    init_references();
+  }
+});
+
 // src/commands/billing.ts
 var billing_exports = {};
 __export(billing_exports, {
@@ -6158,7 +6859,7 @@ async function billingCommand(opts) {
     if (opts.json) printJson({ status: enrichedStatus, plans });
     else printBillingPanel(enrichedStatus, plans);
   } catch (err) {
-    printError(`Failed to fetch billing info: ${err}`);
+    printError2(`Failed to fetch billing info: ${err}`);
     process.exit(1);
   }
 }
@@ -6168,13 +6869,13 @@ async function billingPortalCommand() {
     const result = await client.createBillingPortal();
     const url = result.portal_url;
     if (!url) {
-      printError("No portal URL returned. Ensure you have an active subscription.");
+      printError2("No portal URL returned. Ensure you have an active subscription.");
       process.exit(1);
     }
     printSuccess("Stripe Customer Portal URL:");
     console.log(url);
   } catch (err) {
-    printError(`Failed to create portal session: ${err}`);
+    printError2(`Failed to create portal session: ${err}`);
     process.exit(1);
   }
 }
@@ -6184,13 +6885,13 @@ async function billingUpgradeCommand(opts) {
     const result = await client.createBillingCheckout(opts.plan);
     const url = result.checkout_url;
     if (!url) {
-      printError("No checkout URL returned.");
+      printError2("No checkout URL returned.");
       process.exit(1);
     }
     printSuccess(`Stripe Checkout URL for ${opts.plan}:`);
     console.log(url);
   } catch (err) {
-    printError(`Failed to create checkout session: ${err}`);
+    printError2(`Failed to create checkout session: ${err}`);
     process.exit(1);
   }
 }
@@ -6209,11 +6910,24 @@ __export(approvals_exports, {
   approvalsListCommand: () => approvalsListCommand,
   approvalsRespondCommand: () => approvalsRespondCommand
 });
+import chalk12 from "chalk";
 async function approvalsListCommand(_opts) {
-  printError(
-    "Approvals are managed through governance meetings.\n  Use: corp governance convene ... to schedule a board meeting\n  Use: corp governance vote <meeting-ref> <item-ref> ... to cast votes"
-  );
-  process.exit(1);
+  console.log(chalk12.bold("Approvals in TheCorporation"));
+  console.log();
+  console.log("Approvals are handled through governance meetings and execution intents.");
+  console.log("Use these commands to manage approvals:");
+  console.log();
+  console.log(chalk12.dim("  Board approval via meeting vote:"));
+  console.log(`    corp governance convene --body <body> --type board_meeting --title "Approve X"`);
+  console.log(`    corp governance vote <meeting> <item> --voter <contact> --vote for`);
+  console.log();
+  console.log(chalk12.dim("  Written consent (no meeting needed):"));
+  console.log(`    corp governance written-consent --body <body> --title "Approve X" --description "..."`);
+  console.log();
+  console.log(chalk12.dim("  View pending items:"));
+  console.log(`    corp governance meetings <body>        # see scheduled meetings`);
+  console.log(`    corp governance agenda-items <meeting>  # see items awaiting votes`);
+  console.log(`    corp cap-table valuations               # see pending valuations`);
 }
 async function approvalsRespondCommand(_approvalId, _decision, _opts) {
   printError(
@@ -6224,7 +6938,6 @@ async function approvalsRespondCommand(_approvalId, _decision, _opts) {
 var init_approvals = __esm({
   "src/commands/approvals.ts"() {
     "use strict";
-    init_output();
   }
 });
 
@@ -6237,8 +6950,8 @@ __export(form_exports, {
   formCreateCommand: () => formCreateCommand,
   formFinalizeCommand: () => formFinalizeCommand
 });
-import { input as input2, select, confirm as confirm2, number } from "@inquirer/prompts";
-import chalk11 from "chalk";
+import { input as input2, select as select2, confirm as confirm6, number } from "@inquirer/prompts";
+import chalk13 from "chalk";
 import Table3 from "cli-table3";
 import { readFileSync as readFileSync3, realpathSync as realpathSync2 } from "fs";
 import { relative as relative2, resolve as resolve2 } from "path";
@@ -6248,9 +6961,9 @@ function isCorp(entityType) {
 }
 function sectionHeader(title) {
   console.log();
-  console.log(chalk11.blue("\u2500".repeat(50)));
-  console.log(chalk11.blue.bold(`  ${title}`));
-  console.log(chalk11.blue("\u2500".repeat(50)));
+  console.log(chalk13.blue("\u2500".repeat(50)));
+  console.log(chalk13.blue.bold(`  ${title}`));
+  console.log(chalk13.blue("\u2500".repeat(50)));
 }
 function officerTitleLabel(title) {
   switch (title) {
@@ -6306,7 +7019,7 @@ function normalizeFounderInfo(input3) {
     throw new Error("Founder JSON requires non-empty name, email, and role.");
   }
   const founder = { name, email, role };
-  const ownershipPct = input3.ownership_pct ?? input3.pct;
+  const ownershipPct = input3.ownership_pct ?? input3.membership_pct ?? input3.pct;
   if (ownershipPct != null) founder.ownership_pct = Number(ownershipPct);
   const sharesPurchased = input3.shares_purchased ?? input3.shares;
   if (sharesPurchased != null) founder.shares_purchased = Number(sharesPurchased);
@@ -6410,7 +7123,7 @@ async function phaseEntityDetails(opts, serverCfg, scripted) {
     if (scripted) {
       entityType = "llc";
     } else {
-      entityType = await select({
+      entityType = await select2({
         message: "Entity type",
         choices: [
           { value: "llc", name: "LLC" },
@@ -6422,7 +7135,7 @@ async function phaseEntityDetails(opts, serverCfg, scripted) {
   let name = opts.name;
   if (!name) {
     if (scripted) {
-      printError("--name is required in scripted mode");
+      printError2("--name is required in scripted mode");
       process.exit(1);
     }
     name = await input2({ message: "Legal name" });
@@ -6444,7 +7157,7 @@ async function phaseEntityDetails(opts, serverCfg, scripted) {
     }
   }
   if (!companyAddress && !scripted) {
-    const wantAddress = await confirm2({ message: "Add company address?", default: false });
+    const wantAddress = await confirm6({ message: "Add company address?", default: false });
     if (wantAddress) {
       companyAddress = await promptAddress();
     }
@@ -6452,7 +7165,7 @@ async function phaseEntityDetails(opts, serverCfg, scripted) {
   const fiscalYearEnd = opts.fiscalYearEnd ?? "12-31";
   let sCorpElection = opts.sCorp ?? false;
   if (!scripted && isCorp(entityType) && opts.sCorp === void 0) {
-    sCorpElection = await confirm2({ message: "S-Corp election?", default: false });
+    sCorpElection = await confirm6({ message: "S-Corp election?", default: false });
   }
   return { entityType, name, jurisdiction, companyAddress, fiscalYearEnd, sCorpElection };
 }
@@ -6463,19 +7176,19 @@ async function phasePeople(opts, entityType, scripted) {
     try {
       return parseScriptedFounders(opts);
     } catch (err) {
-      printError(String(err));
+      printError2(String(err));
       process.exit(1);
     }
   }
   const founderCount = await number({ message: "Number of founders (1-6)", default: 1 }) ?? 1;
   for (let i = 0; i < founderCount; i++) {
-    console.log(chalk11.dim(`
+    console.log(chalk13.dim(`
   Founder ${i + 1} of ${founderCount}:`));
     const name = await input2({ message: `  Name` });
     const email = await input2({ message: `  Email` });
     let role = "member";
     if (isCorp(entityType)) {
-      role = await select({
+      role = await select2({
         message: "  Role",
         choices: [
           { value: "director", name: "Director" },
@@ -6484,13 +7197,13 @@ async function phasePeople(opts, entityType, scripted) {
         ]
       });
     }
-    const wantAddress = await confirm2({ message: "  Add address?", default: false });
+    const wantAddress = await confirm6({ message: "  Add address?", default: false });
     const address = wantAddress ? await promptAddress() : void 0;
     let officerTitle;
     if (isCorp(entityType)) {
-      const wantOfficer = role === "officer" || await confirm2({ message: "  Assign officer title?", default: i === 0 });
+      const wantOfficer = role === "officer" || await confirm6({ message: "  Assign officer title?", default: i === 0 });
       if (wantOfficer) {
-        officerTitle = await select({
+        officerTitle = await select2({
           message: "  Officer title",
           choices: OfficerTitle.map((t) => ({
             value: t,
@@ -6503,7 +7216,7 @@ async function phasePeople(opts, entityType, scripted) {
     if (isCorp(entityType) && i === 0 && founderCount === 1) {
       isIncorporator = true;
     } else if (isCorp(entityType)) {
-      isIncorporator = await confirm2({ message: "  Designate as sole incorporator?", default: i === 0 });
+      isIncorporator = await confirm6({ message: "  Designate as sole incorporator?", default: i === 0 });
     }
     founders.push({ name, email, role, address, officer_title: officerTitle, is_incorporator: isIncorporator });
   }
@@ -6511,11 +7224,11 @@ async function phasePeople(opts, entityType, scripted) {
 }
 async function phaseStock(opts, entityType, founders, scripted) {
   if (!scripted) sectionHeader("Phase 3: Equity & Finalize");
-  const transferRestrictions = opts.transferRestrictions ?? (!scripted && isCorp(entityType) ? await confirm2({ message: "Transfer restrictions on shares?", default: true }) : isCorp(entityType));
-  const rofr = opts.rofr ?? (!scripted && isCorp(entityType) ? await confirm2({ message: "Right of first refusal?", default: true }) : isCorp(entityType));
+  const transferRestrictions = opts.transferRestrictions ?? (!scripted && isCorp(entityType) ? await confirm6({ message: "Transfer restrictions on shares?", default: true }) : isCorp(entityType));
+  const rofr = opts.rofr ?? (!scripted && isCorp(entityType) ? await confirm6({ message: "Right of first refusal?", default: true }) : isCorp(entityType));
   if (!scripted) {
     for (const f of founders) {
-      console.log(chalk11.dim(`
+      console.log(chalk13.dim(`
   Equity for ${f.name}:`));
       if (isCorp(entityType)) {
         const shares = await number({ message: `  Shares to purchase`, default: 0 });
@@ -6532,11 +7245,11 @@ async function phaseStock(opts, entityType, founders, scripted) {
         f.ownership_pct = pct ?? 0;
       }
       if (isCorp(entityType)) {
-        const wantVesting = await confirm2({ message: "  Add vesting schedule?", default: false });
+        const wantVesting = await confirm6({ message: "  Add vesting schedule?", default: false });
         if (wantVesting) {
           const totalMonths = await number({ message: "  Total vesting months", default: 48 }) ?? 48;
           const cliffMonths = await number({ message: "  Cliff months", default: 12 }) ?? 12;
-          const acceleration = await select({
+          const acceleration = await select2({
             message: "  Acceleration",
             choices: [
               { value: "none", name: "None" },
@@ -6551,7 +7264,7 @@ async function phaseStock(opts, entityType, founders, scripted) {
           };
         }
       }
-      const wantIp = await confirm2({ message: "  Contributing IP?", default: false });
+      const wantIp = await confirm6({ message: "  Contributing IP?", default: false });
       if (wantIp) {
         f.ip_description = await input2({ message: "  Describe IP being contributed" });
       }
@@ -6561,17 +7274,17 @@ async function phaseStock(opts, entityType, founders, scripted) {
 }
 function printSummary(entityType, name, jurisdiction, fiscalYearEnd, sCorpElection, founders, transferRestrictions, rofr) {
   sectionHeader("Formation Summary");
-  console.log(`  ${chalk11.bold("Entity:")} ${name}`);
-  console.log(`  ${chalk11.bold("Type:")} ${entityType}`);
-  console.log(`  ${chalk11.bold("Jurisdiction:")} ${jurisdiction}`);
-  console.log(`  ${chalk11.bold("Fiscal Year End:")} ${fiscalYearEnd}`);
+  console.log(`  ${chalk13.bold("Entity:")} ${name}`);
+  console.log(`  ${chalk13.bold("Type:")} ${entityType}`);
+  console.log(`  ${chalk13.bold("Jurisdiction:")} ${jurisdiction}`);
+  console.log(`  ${chalk13.bold("Fiscal Year End:")} ${fiscalYearEnd}`);
   if (isCorp(entityType)) {
-    console.log(`  ${chalk11.bold("S-Corp Election:")} ${sCorpElection ? "Yes" : "No"}`);
-    console.log(`  ${chalk11.bold("Transfer Restrictions:")} ${transferRestrictions ? "Yes" : "No"}`);
-    console.log(`  ${chalk11.bold("Right of First Refusal:")} ${rofr ? "Yes" : "No"}`);
+    console.log(`  ${chalk13.bold("S-Corp Election:")} ${sCorpElection ? "Yes" : "No"}`);
+    console.log(`  ${chalk13.bold("Transfer Restrictions:")} ${transferRestrictions ? "Yes" : "No"}`);
+    console.log(`  ${chalk13.bold("Right of First Refusal:")} ${rofr ? "Yes" : "No"}`);
   }
   const table = new Table3({
-    head: [chalk11.dim("Name"), chalk11.dim("Email"), chalk11.dim("Role"), chalk11.dim("Equity"), chalk11.dim("Officer")]
+    head: [chalk13.dim("Name"), chalk13.dim("Email"), chalk13.dim("Role"), chalk13.dim("Equity"), chalk13.dim("Officer")]
   });
   for (const f of founders) {
     const equity = f.shares_purchased ? `${f.shares_purchased.toLocaleString()} shares` : f.ownership_pct ? `${f.ownership_pct}%` : "\u2014";
@@ -6596,9 +7309,9 @@ async function formCommand(opts) {
     const founders = await phasePeople(opts, entityType, scripted);
     const { transferRestrictions, rofr } = await phaseStock(opts, entityType, founders, scripted);
     printSummary(entityType, name, jurisdiction, fiscalYearEnd, sCorpElection, founders, transferRestrictions, rofr);
-    const shouldProceed = scripted ? true : await confirm2({ message: "Proceed with formation?", default: true });
+    const shouldProceed = scripted ? true : await confirm6({ message: "Proceed with formation?", default: true });
     if (!shouldProceed) {
-      console.log(chalk11.yellow("Formation cancelled."));
+      console.log(chalk13.yellow("Formation cancelled."));
       return;
     }
     const members = founders.map((f) => {
@@ -6636,6 +7349,11 @@ async function formCommand(opts) {
     const result = await client.createFormationWithCapTable(payload);
     await resolver.stabilizeRecord("entity", result);
     resolver.rememberFromRecord("entity", result);
+    if (result.entity_id) {
+      setActiveEntityId(cfg, String(result.entity_id));
+      saveConfig(cfg);
+      console.log(chalk13.dim(`  Active entity set to ${result.entity_id}`));
+    }
     if (opts.json) {
       printJson(result);
       return;
@@ -6654,22 +7372,22 @@ async function formCommand(opts) {
     if (holders.length > 0) {
       console.log();
       const table = new Table3({
-        head: [chalk11.dim("Holder"), chalk11.dim("Shares"), chalk11.dim("Ownership %")]
+        head: [chalk13.dim("Holder"), chalk13.dim("Shares"), chalk13.dim("Ownership %")]
       });
       for (const h of holders) {
         const pct = typeof h.ownership_pct === "number" ? `${h.ownership_pct.toFixed(1)}%` : "\u2014";
         table.push([String(h.name ?? "?"), String(h.shares ?? 0), pct]);
       }
-      console.log(chalk11.bold("  Cap Table:"));
+      console.log(chalk13.bold("  Cap Table:"));
       console.log(table.toString());
     }
     if (result.next_action) {
-      console.log(chalk11.yellow(`
+      console.log(chalk13.yellow(`
   Next: ${result.next_action}`));
     }
   } catch (err) {
     if (err instanceof Error && err.message.includes("exit")) throw err;
-    printError(`Failed to create formation: ${err}`);
+    printError2(`Failed to create formation: ${err}`);
     process.exit(1);
   }
 }
@@ -6725,6 +7443,10 @@ async function formCreateCommand(opts) {
     const result = await client.createPendingEntity(payload);
     await resolver.stabilizeRecord("entity", result);
     resolver.rememberFromRecord("entity", result);
+    if (result.entity_id) {
+      setActiveEntityId(cfg, String(result.entity_id));
+      saveConfig(cfg);
+    }
     if (opts.json) {
       printJson(result);
       return;
@@ -6735,10 +7457,10 @@ async function formCreateCommand(opts) {
     console.log(`  Type: ${result.entity_type}`);
     console.log(`  Jurisdiction: ${result.jurisdiction}`);
     console.log(`  Status: ${result.formation_status}`);
-    console.log(chalk11.yellow(`
+    console.log(chalk13.yellow(`
   Next: corp form add-founder @last:entity --name "..." --email "..." --role member --pct 50`));
   } catch (err) {
-    printError(`Failed to create pending entity: ${err}`);
+    printError2(`Failed to create pending entity: ${err}`);
     process.exit(1);
   }
 }
@@ -6773,10 +7495,10 @@ async function formAddFounderCommand(entityId, opts) {
       const pct = typeof m.ownership_pct === "number" ? ` (${m.ownership_pct}%)` : "";
       console.log(`  - ${m.name} <${m.email ?? "no email"}> [${m.role ?? "member"}]${pct}`);
     }
-    console.log(chalk11.yellow(`
+    console.log(chalk13.yellow(`
   Next: add more founders or run: corp form finalize @last:entity`));
   } catch (err) {
-    printError(`Failed to add founder: ${err}`);
+    printError2(`Failed to add founder: ${err}`);
     process.exit(1);
   }
 }
@@ -6837,21 +7559,21 @@ async function formFinalizeCommand(entityId, opts) {
     if (holders.length > 0) {
       console.log();
       const table = new Table3({
-        head: [chalk11.dim("Holder"), chalk11.dim("Shares"), chalk11.dim("Ownership %")]
+        head: [chalk13.dim("Holder"), chalk13.dim("Shares"), chalk13.dim("Ownership %")]
       });
       for (const h of holders) {
         const pct = typeof h.ownership_pct === "number" ? `${h.ownership_pct.toFixed(1)}%` : "\u2014";
         table.push([String(h.name ?? "?"), String(h.shares ?? 0), pct]);
       }
-      console.log(chalk11.bold("  Cap Table:"));
+      console.log(chalk13.bold("  Cap Table:"));
       console.log(table.toString());
     }
     if (result.next_action) {
-      console.log(chalk11.yellow(`
+      console.log(chalk13.yellow(`
   Next: ${result.next_action}`));
     }
   } catch (err) {
-    printError(`Failed to finalize formation: ${err}`);
+    printError2(`Failed to finalize formation: ${err}`);
     process.exit(1);
   }
 }
@@ -6898,9 +7620,8 @@ async function formActivateCommand(entityId, opts) {
     }
     console.log(`  Signatures added: ${result.signatures_added}`);
     console.log(`  Documents updated: ${result.documents_signed}`);
-    printJson(formation);
   } catch (err) {
-    printError(`Failed to activate formation: ${err}`);
+    printError2(`Failed to activate formation: ${err}`);
     process.exit(1);
   }
 }
@@ -6918,43 +7639,87 @@ var init_form = __esm({
 // src/commands/api-keys.ts
 var api_keys_exports = {};
 __export(api_keys_exports, {
-  apiKeysCommand: () => apiKeysCommand
+  apiKeysCreateCommand: () => apiKeysCreateCommand,
+  apiKeysListCommand: () => apiKeysListCommand,
+  apiKeysRevokeCommand: () => apiKeysRevokeCommand,
+  apiKeysRotateCommand: () => apiKeysRotateCommand
 });
-import chalk12 from "chalk";
-import Table4 from "cli-table3";
-async function apiKeysCommand(opts) {
+import { confirm as confirm7 } from "@inquirer/prompts";
+async function apiKeysListCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
     const keys = await client.listApiKeys();
     if (opts.json) {
-      printJson(keys.map((k) => ({
-        ...k,
-        ...k.key != null ? { key: maskKey(String(k.key)) } : {},
-        ...k.api_key != null ? { api_key: maskKey(String(k.api_key)) } : {}
-      })));
+      printJson(keys);
       return;
     }
     if (keys.length === 0) {
       console.log("No API keys found.");
       return;
     }
-    console.log(`
-${chalk12.bold("API Keys")}`);
-    const table = new Table4({
-      head: [chalk12.dim("ID"), chalk12.dim("Name"), chalk12.dim("Key"), chalk12.dim("Created")]
-    });
     for (const k of keys) {
-      table.push([
-        String(k.key_id ?? k.id ?? k.api_key_id ?? "").slice(0, 12),
-        String(k.name ?? ""),
-        maskKey(String(k.key ?? k.api_key ?? "")),
-        String(k.created_at ?? "")
-      ]);
+      const name = k.name ?? k.label ?? "unnamed";
+      const id = k.key_id ?? k.id;
+      const scopes = Array.isArray(k.scopes) ? k.scopes.join(", ") : "all";
+      console.log(`  ${name} [${id}] scopes: ${scopes}`);
+    }
+  } catch (err) {
+    printError2(`Failed to list API keys: ${err}`);
+    process.exit(1);
+  }
+}
+async function apiKeysCreateCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    const data = { name: opts.name };
+    if (opts.scopes) data.scopes = opts.scopes.split(",").map((s2) => s2.trim());
+    const result = await client.createApiKey(data);
+    printWriteResult(result, `API key created: ${result.key_id ?? "OK"}`, opts.json);
+    if (!opts.json && result.api_key) {
+      printSuccess(`Key: ${result.api_key}`);
+      console.log("  Save this key \u2014 it will not be shown again.");
     }
-    console.log(table.toString());
   } catch (err) {
-    printError(`Failed to fetch API keys: ${err}`);
+    printError2(`Failed to create API key: ${err}`);
+    process.exit(1);
+  }
+}
+async function apiKeysRevokeCommand(keyId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    if (!opts.yes) {
+      const ok = await confirm7({ message: `Revoke API key ${keyId}? This cannot be undone.`, default: false });
+      if (!ok) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
+    await client.revokeApiKey(keyId);
+    if (opts.json) {
+      printJson({ revoked: true, key_id: keyId });
+      return;
+    }
+    printSuccess(`API key ${keyId} revoked.`);
+  } catch (err) {
+    printError2(`Failed to revoke API key: ${err}`);
+    process.exit(1);
+  }
+}
+async function apiKeysRotateCommand(keyId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    const result = await client.rotateApiKey(keyId);
+    printWriteResult(result, `API key ${keyId} rotated.`, opts.json);
+    if (!opts.json && result.api_key) {
+      printSuccess(`New key: ${result.api_key}`);
+      console.log("  Save this key \u2014 it will not be shown again.");
+    }
+  } catch (err) {
+    printError2(`Failed to rotate API key: ${err}`);
     process.exit(1);
   }
 }
@@ -7203,7 +7968,7 @@ async function demoCommand(opts) {
     printReferenceSummary("bank_account", bankAccount, { showReuseHint: true });
     printJson(result);
   } catch (err) {
-    printError(`Failed to seed demo: ${err}`);
+    printError2(`Failed to seed demo: ${err}`);
     process.exit(1);
   }
 }
@@ -7224,14 +7989,14 @@ var feedback_exports = {};
 __export(feedback_exports, {
   feedbackCommand: () => feedbackCommand
 });
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 async function feedbackCommand(message, opts) {
   if (!message || message.trim().length === 0) {
-    printError("Feedback message cannot be empty");
+    printError2("Feedback message cannot be empty");
     process.exit(1);
   }
   if (message.length > MAX_FEEDBACK_LENGTH) {
-    printError(`Feedback message must be at most ${MAX_FEEDBACK_LENGTH} characters (got ${message.length})`);
+    printError2(`Feedback message must be at most ${MAX_FEEDBACK_LENGTH} characters (got ${message.length})`);
     process.exit(1);
   }
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -7243,16 +8008,16 @@ async function feedbackCommand(message, opts) {
       return;
     }
     console.log(`
-${chalk13.green("\u2713")} Feedback submitted (${chalk13.dim(result.feedback_id)})`);
+${chalk14.green("\u2713")} Feedback submitted (${chalk14.dim(result.feedback_id)})`);
   } catch (err) {
     const detail = String(err);
     if (detail.includes("404")) {
-      printError(
+      printError2(
         `Failed to submit feedback: ${detail}
   This server does not expose /v1/feedback. Local api-rs dev servers currently do not support feedback submission.`
       );
     } else {
-      printError(`Failed to submit feedback: ${detail}`);
+      printError2(`Failed to submit feedback: ${detail}`);
     }
     process.exit(1);
   }
@@ -7273,38 +8038,8 @@ var serve_exports = {};
 __export(serve_exports, {
   serveCommand: () => serveCommand
 });
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "fs";
 import { resolve as resolve3 } from "path";
-import { randomBytes } from "crypto";
-function generateFernetKey() {
-  return randomBytes(32).toString("base64url") + "=";
-}
-function generateSecret(length = 32) {
-  return randomBytes(length).toString("hex");
-}
-function loadEnvFile(path) {
-  if (!existsSync2(path)) return;
-  const content = readFileSync4(path, "utf-8");
-  for (const line of content.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const eqIdx = trimmed.indexOf("=");
-    if (eqIdx === -1) continue;
-    const key = trimmed.slice(0, eqIdx).trim();
-    const value = trimmed.slice(eqIdx + 1).trim().replace(/^["']|["']$/g, "");
-    if (!process.env[key]) {
-      process.env[key] = value;
-    }
-  }
-}
-function ensureEnvFile(envPath) {
-  if (existsSync2(envPath)) return;
-  console.log("No .env file found. Generating one with dev defaults...\n");
-  const content = ENV_TEMPLATE.replace("{{JWT_SECRET}}", generateSecret()).replace("{{SECRETS_MASTER_KEY}}", generateFernetKey()).replace("{{INTERNAL_WORKER_TOKEN}}", generateSecret());
-  writeFileSync2(envPath, content, "utf-8");
-  console.log(`  Created ${envPath}
-`);
-}
+import { ensureEnvFile, loadEnvFile } from "@thecorporation/corp-tools";
 async function serveCommand(opts) {
   let server;
   try {
@@ -7349,40 +8084,9 @@ async function serveCommand(opts) {
     process.exit(code ?? 0);
   });
 }
-var ENV_TEMPLATE;
 var init_serve = __esm({
   "src/commands/serve.ts"() {
     "use strict";
-    ENV_TEMPLATE = `# Corporation API server configuration
-# Generated by: corp serve
-
-# Required \u2014 secret for signing JWTs
-JWT_SECRET={{JWT_SECRET}}
-
-# Required \u2014 Fernet key for encrypting secrets at rest (base64url, 32 bytes)
-SECRETS_MASTER_KEY={{SECRETS_MASTER_KEY}}
-
-# Required \u2014 bearer token for internal worker-to-server auth
-INTERNAL_WORKER_TOKEN={{INTERNAL_WORKER_TOKEN}}
-
-# Server port (default: 8000)
-# PORT=8000
-
-# Data directory for git repos (default: ./data/repos)
-# DATA_DIR=./data/repos
-
-# Redis URL for agent job queue (optional)
-# REDIS_URL=redis://localhost:6379/0
-
-# LLM proxy upstream (default: https://openrouter.ai/api/v1)
-# LLM_UPSTREAM_URL=https://openrouter.ai/api/v1
-
-# PEM-encoded Ed25519 key for signing git commits (optional)
-# COMMIT_SIGNING_KEY=
-
-# Max agent queue depth (default: 1000)
-# MAX_QUEUE_DEPTH=1000
-`;
   }
 });
 
@@ -7398,24 +8102,30 @@ function inheritOption(localValue, parentValue) {
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
-var TAX_DOCUMENT_TYPE_CHOICES = [
+var TAX_DOCUMENT_TYPE_DISPLAY = [
   "1120",
   "1120s",
   "1065",
   "franchise_tax",
   "annual_report",
   "83b",
-  "form_1120",
-  "form_1120s",
-  "form_1065",
   "1099_nec",
-  "form_1099_nec",
   "k1",
-  "form_k1",
   "941",
-  "form_941",
-  "w2",
-  "form_w2"
+  "w2"
+];
+var TAX_DOCUMENT_TYPE_ALIASES = {
+  form_1120: "1120",
+  form_1120s: "1120s",
+  form_1065: "1065",
+  form_1099_nec: "1099_nec",
+  form_k1: "k1",
+  form_941: "941",
+  form_w2: "w2"
+};
+var TAX_DOCUMENT_TYPE_CHOICES = [
+  ...TAX_DOCUMENT_TYPE_DISPLAY,
+  ...Object.keys(TAX_DOCUMENT_TYPE_ALIASES)
 ];
 var FINALIZE_ITEM_STATUS_CHOICES = [
   "discussed",
@@ -7425,6 +8135,7 @@ var FINALIZE_ITEM_STATUS_CHOICES = [
 ];
 var program = new Command();
 program.name("corp").description("corp \u2014 Corporate governance from the terminal").version(pkg.version);
+program.option("-q, --quiet", "Only output the resource ID (for scripting)");
 program.command("setup").description("Interactive setup wizard").action(async () => {
   const { setupCommand: setupCommand2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
   await setupCommand2();
@@ -7437,6 +8148,10 @@ program.command("context").alias("whoami").description("Show the active workspac
   const { contextCommand: contextCommand2 } = await Promise.resolve().then(() => (init_context(), context_exports));
   await contextCommand2(opts);
 });
+program.command("use <entity-ref>").description("Set the active entity by name, short ID, or reference").action(async (entityRef) => {
+  const { useCommand: useCommand2 } = await Promise.resolve().then(() => (init_use(), use_exports));
+  await useCommand2(entityRef);
+});
 program.command("schema").description("Dump the CLI command catalog as JSON").option("--compact", "Emit compact JSON").action(async (opts) => {
   const { schemaCommand: schemaCommand2 } = await Promise.resolve().then(() => (init_schema(), schema_exports));
   schemaCommand2(program, opts);
@@ -7498,7 +8213,7 @@ entitiesCmd.command("convert <entity-ref>").requiredOption("--to <type>", "Targe
   const { entitiesConvertCommand: entitiesConvertCommand2 } = await Promise.resolve().then(() => (init_entities(), entities_exports));
   await entitiesConvertCommand2(entityId, opts);
 });
-entitiesCmd.command("dissolve <entity-ref>").requiredOption("--reason <reason>", "Dissolution reason").option("--effective-date <date>", "Effective date (ISO 8601)").description("Dissolve an entity").action(async (entityId, opts) => {
+entitiesCmd.command("dissolve <entity-ref>").requiredOption("--reason <reason>", "Dissolution reason").option("--effective-date <date>", "Effective date (ISO 8601)").option("--yes, -y", "Skip confirmation prompt").description("Dissolve an entity").action(async (entityId, opts) => {
   const { entitiesDissolveCommand: entitiesDissolveCommand2 } = await Promise.resolve().then(() => (init_entities(), entities_exports));
   await entitiesDissolveCommand2(entityId, opts);
 });
@@ -7537,40 +8252,61 @@ var capTableCmd = program.command("cap-table").description("Cap table, equity gr
   const { capTableCommand: capTableCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
   await capTableCommand2(opts);
 });
-capTableCmd.command("safes").description("SAFE notes").action(async (_opts, cmd) => {
+capTableCmd.command("safes").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("SAFE notes").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { safesCommand: safesCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await safesCommand2(parent);
+  await safesCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("transfers").description("Share transfers").action(async (_opts, cmd) => {
+capTableCmd.command("transfers").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Share transfers").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { transfersCommand: transfersCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await transfersCommand2(parent);
+  await transfersCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("instruments").description("Cap table instruments").action(async (_opts, cmd) => {
+capTableCmd.command("instruments").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Cap table instruments").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { instrumentsCommand: instrumentsCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await instrumentsCommand2(parent);
+  await instrumentsCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("share-classes").description("Share classes").action(async (_opts, cmd) => {
+capTableCmd.command("share-classes").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Share classes").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { shareClassesCommand: shareClassesCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await shareClassesCommand2(parent);
+  await shareClassesCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("rounds").description("Staged equity rounds").action(async (_opts, cmd) => {
+capTableCmd.command("rounds").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Staged equity rounds").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { roundsCommand: roundsCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await roundsCommand2(parent);
+  await roundsCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("valuations").description("Valuations history").action(async (_opts, cmd) => {
+capTableCmd.command("valuations").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Valuations history").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { valuationsCommand: valuationsCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await valuationsCommand2(parent);
+  await valuationsCommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("409a").description("Current 409A valuation").action(async (_opts, cmd) => {
+capTableCmd.command("409a").option("--entity-id <ref>", "Entity reference").option("--json", "Output as JSON").description("Current 409A valuation").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { fourOhNineACommand: fourOhNineACommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await fourOhNineACommand2(parent);
+  await fourOhNineACommand2({
+    entityId: opts.entityId ?? parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 capTableCmd.command("create-instrument").requiredOption("--kind <kind>", "Instrument kind (common_equity, preferred_equity, membership_unit, option_grant, safe)").requiredOption("--symbol <symbol>", "Instrument symbol").option("--issuer-legal-entity-id <ref>", "Issuer legal entity reference (ID, short ID, @last, or unique name)").option("--authorized-units <n>", "Authorized units", parseInt).option("--issue-price-cents <n>", "Issue price in cents", parseInt).option("--terms-json <json>", "JSON object of instrument terms").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the instrument").description("Create a cap table instrument").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
@@ -7590,11 +8326,13 @@ capTableCmd.command("issue-equity").requiredOption("--grant-type <type>", "Grant
     json: inheritOption(opts.json, parent.json)
   });
 });
-capTableCmd.command("issue-safe").requiredOption("--investor <name>", "Investor name").requiredOption("--amount <n>", "Principal amount in cents", parseInt).option("--safe-type <type>", "SAFE type", "post_money").requiredOption("--valuation-cap <n>", "Valuation cap in cents", parseInt).option("--meeting-id <ref>", "Board meeting reference required when issuing under a board-governed entity").option("--resolution-id <ref>", "Board resolution reference required when issuing under a board-governed entity").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the round").description("Issue a SAFE note").action(async (opts, cmd) => {
+capTableCmd.command("issue-safe").requiredOption("--investor <name>", "Investor name").requiredOption("--amount-cents <n>", "Principal amount in cents (e.g. 5000000000 = $50M)", parseInt).option("--amount <n>", "", parseInt).option("--safe-type <type>", "SAFE type", "post_money").requiredOption("--valuation-cap-cents <n>", "Valuation cap in cents (e.g. 1000000000 = $10M)", parseInt).option("--valuation-cap <n>", "", parseInt).option("--meeting-id <ref>", "Board meeting reference required when issuing under a board-governed entity").option("--resolution-id <ref>", "Board resolution reference required when issuing under a board-governed entity").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the round").description("Issue a SAFE note").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { issueSafeCommand: issueSafeCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
   await issueSafeCommand2({
     ...opts,
+    amountCents: opts.amountCents ?? opts.amount,
+    valuationCapCents: opts.valuationCapCents ?? opts.valuationCap,
     entityId: parent.entityId,
     json: inheritOption(opts.json, parent.json)
   });
@@ -7608,11 +8346,12 @@ capTableCmd.command("transfer").requiredOption("--from <ref>", "Source contact r
     json: inheritOption(opts.json, parent.json)
   });
 });
-capTableCmd.command("distribute").requiredOption("--amount <n>", "Total distribution amount in cents", parseInt).option("--type <type>", "Distribution type (dividend, return, liquidation)", "dividend").requiredOption("--description <desc>", "Distribution description").option("--json", "Output as JSON").option("--dry-run", "Show the request without calculating the distribution").description("Calculate a distribution").action(async (opts, cmd) => {
+capTableCmd.command("distribute").requiredOption("--amount-cents <n>", "Total distribution amount in cents (e.g. 100000 = $1,000.00)", parseInt).option("--amount <n>", "", parseInt).option("--type <type>", "Distribution type (dividend, return, liquidation)", "dividend").requiredOption("--description <desc>", "Distribution description").option("--json", "Output as JSON").option("--dry-run", "Show the request without calculating the distribution").description("Calculate a distribution").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { distributeCommand: distributeCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
   await distributeCommand2({
     ...opts,
+    amountCents: opts.amountCents ?? opts.amount,
     entityId: parent.entityId,
     json: inheritOption(opts.json, parent.json)
   });
@@ -7673,6 +8412,50 @@ capTableCmd.command("approve-valuation <valuation-ref>").option("--resolution-id
     json: inheritOption(opts.json, parent.json)
   });
 });
+capTableCmd.command("preview-conversion").requiredOption("--safe-id <ref>", "SAFE note reference to convert").requiredOption("--price-per-share-cents <n>", "Conversion price per share in cents", parseInt).option("--json", "Output as JSON").description("Preview SAFE-to-equity conversion").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { previewConversionCommand: previewConversionCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
+  await previewConversionCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+capTableCmd.command("convert").requiredOption("--safe-id <ref>", "SAFE note reference to convert").requiredOption("--price-per-share-cents <n>", "Conversion price per share in cents", parseInt).option("--json", "Output as JSON").option("--dry-run", "Show the request without executing").description("Execute SAFE-to-equity conversion").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { executeConversionCommand: executeConversionCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
+  await executeConversionCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+capTableCmd.command("dilution").requiredOption("--round-id <ref>", "Round reference to model dilution for").option("--json", "Output as JSON").description("Preview dilution impact of a round").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { dilutionPreviewCommand: dilutionPreviewCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
+  await dilutionPreviewCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+capTableCmd.command("control-map").option("--root-entity-id <ref>", "Root entity for ownership tree (defaults to active entity)").option("--json", "Output as JSON").description("View entity control/ownership map").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { controlMapCommand: controlMapCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
+  await controlMapCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+capTableCmd.addHelpText("after", `
+Examples:
+  $ corp cap-table                                    # view full cap table
+  $ corp cap-table issue-equity --grant-type common --shares 1000000 --recipient "Alice Smith"
+  $ corp cap-table issue-safe --investor "Seed Fund" --amount-cents 50000000 --valuation-cap-cents 1000000000
+  $ corp cap-table create-valuation --type four_oh_nine_a --date 2026-01-01 --methodology market
+  $ corp cap-table transfer --from alice --to bob --shares 1000 --share-class-id COMMON --governing-doc-type bylaws --transferee-rights full_member
+`);
 var financeCmd = program.command("finance").description("Invoicing, payroll, payments, banking").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON").action(async (opts) => {
   const { financeSummaryCommand: financeSummaryCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
   await financeSummaryCommand2(opts);
@@ -7686,11 +8469,12 @@ financeCmd.command("invoices").option("--json", "Output as JSON").description("L
     json: inheritOption(opts.json, parent.json)
   });
 });
-financeCmd.command("invoice").requiredOption("--customer <name>", "Customer name").requiredOption("--amount <n>", "Amount in cents", parseInt).requiredOption("--due-date <date>", "Due date (ISO 8601)").option("--description <desc>", "Description", "Services rendered").option("--json", "Output as JSON").description("Create an invoice").action(async (opts, cmd) => {
+financeCmd.command("invoice").requiredOption("--customer <name>", "Customer name").requiredOption("--amount-cents <n>", "Amount in cents (e.g. 500000 = $5,000.00)", parseInt).option("--amount <n>", "", parseInt).requiredOption("--due-date <date>", "Due date (ISO 8601)").option("--description <desc>", "Description", "Services rendered").option("--json", "Output as JSON").description("Create an invoice").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financeInvoiceCommand: financeInvoiceCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
   await financeInvoiceCommand2({
     ...opts,
+    amountCents: opts.amountCents ?? opts.amount,
     entityId: parent.entityId,
     json: inheritOption(opts.json, parent.json)
   });
@@ -7722,11 +8506,12 @@ financeCmd.command("payments").option("--json", "Output as JSON").description("L
     json: inheritOption(opts.json, parent.json)
   });
 });
-financeCmd.command("pay").requiredOption("--amount <n>", "Amount in cents", parseInt).requiredOption("--recipient <name>", "Recipient name").option("--method <method>", "Payment method", "ach").option("--json", "Output as JSON").description("Submit a payment").action(async (opts, cmd) => {
+financeCmd.command("pay").requiredOption("--amount-cents <n>", "Amount in cents (e.g. 500000 = $5,000.00)", parseInt).option("--amount <n>", "", parseInt).requiredOption("--recipient <name>", "Recipient name").option("--method <method>", "Payment method", "ach").option("--json", "Output as JSON").description("Submit a payment").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financePayCommand: financePayCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
   await financePayCommand2({
     ...opts,
+    amountCents: opts.amountCents ?? opts.amount,
     entityId: parent.entityId,
     json: inheritOption(opts.json, parent.json)
   });
@@ -7749,6 +8534,15 @@ financeCmd.command("open-account").option("--institution <name>", "Banking insti
     json: inheritOption(opts.json, parent.json)
   });
 });
+financeCmd.command("activate-account <account-ref>").option("--json", "Output as JSON").description("Activate a bank account (transitions from pending_review to active)").action(async (accountRef, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { financeActivateAccountCommand: financeActivateAccountCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
+  await financeActivateAccountCommand2(accountRef, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
 financeCmd.command("classifications").option("--json", "Output as JSON").description("List contractor classifications").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financeClassificationsCommand: financeClassificationsCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
@@ -7794,6 +8588,24 @@ financeCmd.command("distributions").option("--json", "Output as JSON").descripti
     json: inheritOption(opts.json, parent.json)
   });
 });
+financeCmd.command("statements").option("--period <period>", "Period (e.g. 2026-Q1, 2025)").option("--json", "Output as JSON").description("View financial statements (P&L, balance sheet)").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { financeStatementsCommand: financeStatementsCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
+  await financeStatementsCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+financeCmd.addHelpText("after", `
+Examples:
+  $ corp finance                                      # financial summary
+  $ corp finance invoice --customer "Client Co" --amount-cents 500000 --due-date 2026-04-01
+  $ corp finance pay --amount-cents 250000 --recipient "Vendor" --method ach
+  $ corp finance payroll --period-start 2026-03-01 --period-end 2026-03-15
+  $ corp finance open-account --institution Mercury
+  $ corp finance statements --period 2026-Q1
+`);
 var governanceCmd = program.command("governance").description("Governance bodies, seats, meetings, resolutions").option("--entity-id <ref>", "Entity reference (overrides active entity)").option("--json", "Output as JSON").action(async (opts) => {
   const { governanceListCommand: governanceListCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   await governanceListCommand2(opts);
@@ -7886,7 +8698,7 @@ governanceCmd.command("reopen <meeting-ref>").option("--json", "Output as JSON")
     json: inheritOption(opts.json, parent.json)
   });
 });
-governanceCmd.command("cancel <meeting-ref>").option("--json", "Output as JSON").option("--dry-run", "Show the request without cancelling the meeting").description("Cancel a meeting").action(async (meetingId, opts, cmd) => {
+governanceCmd.command("cancel <meeting-ref>").option("--json", "Output as JSON").option("--dry-run", "Show the request without cancelling the meeting").option("--yes, -y", "Skip confirmation prompt").description("Cancel a meeting").action(async (meetingId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { cancelMeetingCommand: cancelMeetingCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   await cancelMeetingCommand2(meetingId, {
@@ -7932,6 +8744,56 @@ governanceCmd.command("written-consent").requiredOption("--body <ref>", "Governa
     json: inheritOption(opts.json, parent.json)
   });
 });
+governanceCmd.command("mode").addOption(new Option("--set <mode>", "Set governance mode").choices(["founder", "board", "executive", "normal", "incident_lockdown"])).option("--json", "Output as JSON").description("View or set governance mode").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { governanceModeCommand: governanceModeCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  await governanceModeCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+governanceCmd.command("resign <seat-ref>").option("--body-id <ref>", "Governance body reference").option("--json", "Output as JSON").description("Resign from a governance seat").action(async (seatRef, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { governanceResignCommand: governanceResignCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  await governanceResignCommand2(seatRef, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+governanceCmd.command("incidents").option("--json", "Output as JSON").description("List governance incidents").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { governanceIncidentsCommand: governanceIncidentsCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  await governanceIncidentsCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+governanceCmd.command("profile").option("--json", "Output as JSON").description("View governance profile and configuration").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { governanceProfileCommand: governanceProfileCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  await governanceProfileCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+governanceCmd.addHelpText("after", `
+Examples:
+  $ corp governance create-body --name "Board of Directors" --body-type board_of_directors
+  $ corp governance add-seat @last:body --holder "alice"
+  $ corp governance convene --body board --type board_meeting --title "Q1 Review" --agenda "Approve budget"
+  $ corp governance open @last:meeting --present-seat alice-seat
+  $ corp governance vote @last:meeting <item-ref> --voter alice --vote for
+  $ corp governance written-consent --body board --title "Approve Option Plan" --description "Board approves 2026 option plan"
+  $ corp governance mode
+  $ corp governance mode --set board
+  $ corp governance resign <seat-ref>
+  $ corp governance incidents
+  $ corp governance profile
+`);
 var documentsCmd = program.command("documents").description("Documents and signing").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON").action(async (opts) => {
   const { documentsListCommand: documentsListCommand2 } = await Promise.resolve().then(() => (init_documents(), documents_exports));
   await documentsListCommand2(opts);
@@ -7977,7 +8839,10 @@ documentsCmd.command("preview-pdf").option("--definition-id <id>", "AST document
     entityId: parent.entityId
   });
 });
-var taxCmd = program.command("tax").description("Tax filings and deadline tracking").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON");
+var taxCmd = program.command("tax").description("Tax filings and deadline tracking").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON").action(async (opts) => {
+  const { taxSummaryCommand: taxSummaryCommand2 } = await Promise.resolve().then(() => (init_tax(), tax_exports));
+  await taxSummaryCommand2(opts);
+});
 taxCmd.command("filings").option("--json", "Output as JSON").description("List tax filings").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { taxFilingsCommand: taxFilingsCommand2 } = await Promise.resolve().then(() => (init_tax(), tax_exports));
@@ -7987,7 +8852,9 @@ taxCmd.command("filings").option("--json", "Output as JSON").description("List t
     json: inheritOption(opts.json, parent.json)
   });
 });
-taxCmd.command("file").addOption(new Option("--type <type>", `Document type (${TAX_DOCUMENT_TYPE_CHOICES.join(", ")})`).choices([...TAX_DOCUMENT_TYPE_CHOICES]).makeOptionMandatory()).requiredOption("--year <year>", "Tax year", parseInt).option("--json", "Output as JSON").description("File a tax document").action(async (opts, cmd) => {
+taxCmd.command("file").addOption(
+  new Option("--type <type>", `Document type (${TAX_DOCUMENT_TYPE_DISPLAY.join(", ")})`).choices([...TAX_DOCUMENT_TYPE_CHOICES]).makeOptionMandatory()
+).requiredOption("--year <year>", "Tax year", parseInt).option("--json", "Output as JSON").description("File a tax document").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { taxFileCommand: taxFileCommand2 } = await Promise.resolve().then(() => (init_tax(), tax_exports));
   await taxFileCommand2({
@@ -8048,11 +8915,12 @@ agentsCmd.command("resume <agent-ref>").option("--json", "Output as JSON").descr
     json: inheritOption(opts.json, parent.json)
   });
 });
-agentsCmd.command("delete <agent-ref>").option("--json", "Output as JSON").description("Delete an agent").action(async (agentId, opts, cmd) => {
+agentsCmd.command("delete <agent-ref>").option("--json", "Output as JSON").option("--yes, -y", "Skip confirmation prompt").description("Delete an agent").action(async (agentId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { agentsDeleteCommand: agentsDeleteCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
   await agentsDeleteCommand2(agentId, {
-    json: inheritOption(opts.json, parent.json)
+    json: inheritOption(opts.json, parent.json),
+    yes: opts.yes
   });
 });
 agentsCmd.command("message <agent-ref>").option("--body <text>", "Message text").option("--body-file <path>", "Read the message body from a file").option("--json", "Output as JSON").description("Send a message to an agent").action(async (agentId, opts, cmd) => {
@@ -8071,6 +8939,37 @@ agentsCmd.command("skill <agent-ref>").requiredOption("--name <name>", "Skill na
     json: inheritOption(opts.json, parent.json)
   });
 });
+agentsCmd.command("execution <agent-ref> <execution-id>").option("--json", "Output as JSON").description("Check execution status").action(async (agentId, executionId, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { agentsExecutionCommand: agentsExecutionCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
+  await agentsExecutionCommand2(agentId, executionId, {
+    json: opts.json ?? parent.json
+  });
+});
+agentsCmd.command("execution-result <agent-ref> <execution-id>").option("--json", "Output as JSON").description("Get execution result").action(async (agentId, executionId, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { agentsExecutionResultCommand: agentsExecutionResultCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
+  await agentsExecutionResultCommand2(agentId, executionId, {
+    json: opts.json ?? parent.json
+  });
+});
+agentsCmd.command("kill <agent-ref> <execution-id>").option("--yes", "Skip confirmation").option("--json", "Output as JSON").description("Kill a running execution").action(async (agentId, executionId, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { agentsKillCommand: agentsKillCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
+  await agentsKillCommand2(agentId, executionId, {
+    ...opts,
+    json: opts.json ?? parent.json
+  });
+});
+agentsCmd.addHelpText("after", `
+Examples:
+  $ corp agents                                       # list all agents
+  $ corp agents create --name "bookkeeper" --prompt "You manage accounts payable"
+  $ corp agents message @last:agent --body "Process this month's invoices"
+  $ corp agents skill @last:agent --name invoice-processing --description "Process AP invoices"
+  $ corp agents execution @last:agent <execution-id>  # check execution status
+  $ corp agents kill @last:agent <execution-id>       # kill a running execution
+`);
 var workItemsCmd = program.command("work-items").description("Long-term work item coordination").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON").option("--status <status>", "Filter by status (open, claimed, completed, cancelled)").option("--category <category>", "Filter by category").action(async (opts) => {
   const { workItemsListCommand: workItemsListCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   await workItemsListCommand2(opts);
@@ -8084,7 +8983,7 @@ workItemsCmd.command("show <item-ref>").option("--json", "Output as JSON").descr
     json: inheritOption(opts.json, parent.json)
   });
 });
-workItemsCmd.command("create").requiredOption("--title <title>", "Work item title").option("--category <category>", "Work item category").option("--description <desc>", "Description").option("--deadline <date>", "Deadline (YYYY-MM-DD)").option("--asap", "Mark as ASAP priority").option("--created-by <name>", "Creator identifier").option("--json", "Output as JSON").description("Create a new work item").action(async (opts, cmd) => {
+workItemsCmd.command("create").requiredOption("--title <title>", "Work item title").requiredOption("--category <category>", "Work item category").option("--description <desc>", "Description").option("--deadline <date>", "Deadline (YYYY-MM-DD)").option("--asap", "Mark as ASAP priority").option("--created-by <name>", "Creator identifier").option("--json", "Output as JSON").description("Create a new work item").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { workItemsCreateCommand: workItemsCreateCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   await workItemsCreateCommand2({
@@ -8094,7 +8993,7 @@ workItemsCmd.command("create").requiredOption("--title <title>", "Work item titl
     json: inheritOption(opts.json, parent.json)
   });
 });
-workItemsCmd.command("claim <item-ref>").option("--by <name>", "Agent or user claiming the item").option("--claimer <name>", "Alias for --by").option("--ttl <seconds>", "Auto-release TTL in seconds", parseInt).option("--json", "Output as JSON").description("Claim a work item").action(async (itemId, opts, cmd) => {
+workItemsCmd.command("claim <item-ref>").option("--by <name>", "Agent or user claiming the item (required)").option("--claimer <name>", "Alias for --by").option("--ttl <seconds>", "Auto-release TTL in seconds", parseInt).option("--json", "Output as JSON").description("Claim a work item").action(async (itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { workItemsClaimCommand: workItemsClaimCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   const claimedBy = opts.by ?? opts.claimer;
@@ -8109,7 +9008,7 @@ workItemsCmd.command("claim <item-ref>").option("--by <name>", "Agent or user cl
     json: inheritOption(opts.json, parent.json)
   });
 });
-workItemsCmd.command("complete <item-ref>").option("--by <name>", "Agent or user completing the item").option("--completed-by <name>", "Alias for --by").option("--result <text>", "Completion result or notes").option("--notes <text>", "Alias for --result").option("--json", "Output as JSON").description("Mark a work item as completed").action(async (itemId, opts, cmd) => {
+workItemsCmd.command("complete <item-ref>").option("--by <name>", "Agent or user completing the item (required)").option("--completed-by <name>", "Alias for --by").option("--result <text>", "Completion result or notes").option("--notes <text>", "Alias for --result").option("--json", "Output as JSON").description("Mark a work item as completed").action(async (itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { workItemsCompleteCommand: workItemsCompleteCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   const completedBy = opts.by ?? opts.completedBy;
@@ -8132,10 +9031,74 @@ workItemsCmd.command("release <item-ref>").option("--json", "Output as JSON").de
     json: inheritOption(opts.json, parent.json)
   });
 });
-workItemsCmd.command("cancel <item-ref>").option("--json", "Output as JSON").description("Cancel a work item").action(async (itemId, opts, cmd) => {
+workItemsCmd.command("cancel <item-ref>").option("--json", "Output as JSON").option("--yes, -y", "Skip confirmation prompt").description("Cancel a work item").action(async (itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { workItemsCancelCommand: workItemsCancelCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   await workItemsCancelCommand2(itemId, {
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json),
+    yes: opts.yes
+  });
+});
+workItemsCmd.addHelpText("after", `
+Examples:
+  $ corp work-items                                   # list open work items
+  $ corp work-items create --title "File Q1 taxes" --category compliance --deadline 2026-04-15
+  $ corp work-items claim @last:work_item --by bookkeeper-agent
+  $ corp work-items complete @last:work_item --by bookkeeper-agent --result "Filed 1120 for Q1"
+`);
+var servicesCmd = program.command("services").description("Service catalog and fulfillment").option("--entity-id <ref>", "Entity reference (ID, short ID, @last, or unique name)").option("--json", "Output as JSON").action(async (opts) => {
+  const { servicesCatalogCommand: servicesCatalogCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesCatalogCommand2({ json: opts.json });
+});
+servicesCmd.command("catalog").option("--json", "Output as JSON").description("List the service catalog").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesCatalogCommand: servicesCatalogCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesCatalogCommand2({
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+servicesCmd.command("buy <slug>").option("--json", "Output as JSON").option("--dry-run", "Show the request without executing").description("Purchase a service from the catalog").action(async (slug, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesBuyCommand: servicesBuyCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesBuyCommand2(slug, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+servicesCmd.command("list").option("--json", "Output as JSON").description("List service requests for an entity").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesListCommand: servicesListCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesListCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+servicesCmd.command("show <ref>").option("--json", "Output as JSON").description("Show service request detail").action(async (ref_, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesShowCommand: servicesShowCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesShowCommand2(ref_, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+servicesCmd.command("fulfill <ref>").option("--note <note>", "Fulfillment note").option("--json", "Output as JSON").description("Mark a service request as fulfilled (operator)").action(async (ref_, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesFulfillCommand: servicesFulfillCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesFulfillCommand2(ref_, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+servicesCmd.command("cancel <ref>").option("--json", "Output as JSON").description("Cancel a service request").action(async (ref_, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { servicesCancelCommand: servicesCancelCommand2 } = await Promise.resolve().then(() => (init_services(), services_exports));
+  await servicesCancelCommand2(ref_, {
+    ...opts,
     entityId: parent.entityId,
     json: inheritOption(opts.json, parent.json)
   });
@@ -8156,9 +9119,7 @@ program.command("approvals").description("Approvals are managed through governan
   const { approvalsListCommand: approvalsListCommand2 } = await Promise.resolve().then(() => (init_approvals(), approvals_exports));
   await approvalsListCommand2({});
 });
-var formCmd = program.command("form").description("Form a new entity with founders and cap table").option("--entity-type <type>", "Entity type (llc, c_corp)").option("--legal-name <name>", "Legal name").option("--jurisdiction <jurisdiction>", "Jurisdiction (e.g. US-DE, US-WY)").option("--member <member>", "Founder as 'name,email,role[,pct[,address[,officer_title[,is_incorporator]]]]' with address as street|city|state|zip, or key=value pairs like 'name=...,email=...,role=...,officer_title=cto,is_incorporator=true,address=street|city|state|zip' (repeatable)", (v, a) => [...a, v], []).option("--member-json <json>", "Founder JSON object (repeatable)", (v, a) => [...a, v], []).option("--members-file <path>", 'Path to a JSON array of founders or {"members": [...]}').option("--address <address>", "Company address as 'street,city,state,zip'").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)", "12-31").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the entity").action(async (opts) => {
-  if (opts.entityType && !opts.type) opts.type = opts.entityType;
-  if (opts.legalName && !opts.name) opts.name = opts.legalName;
+var formCmd = program.command("form").description("Form a new entity with founders and cap table").option("--type <type>", "Entity type (llc, c_corp)").option("--name <name>", "Legal name").option("--jurisdiction <jurisdiction>", "Jurisdiction (e.g. US-DE, US-WY)").option("--member <member>", "Founder as 'name,email,role[,pct[,address[,officer_title[,is_incorporator]]]]' with address as street|city|state|zip, or key=value pairs like 'name=...,email=...,role=...,officer_title=cto,is_incorporator=true,address=street|city|state|zip' (repeatable)", (v, a) => [...a, v], []).option("--member-json <json>", "Founder JSON object (repeatable)", (v, a) => [...a, v], []).option("--members-file <path>", 'Path to a JSON array of founders or {"members": [...]}').option("--address <address>", "Company address as 'street,city,state,zip'").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)", "12-31").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the entity").action(async (opts) => {
   const { formCommand: formCommand2 } = await Promise.resolve().then(() => (init_form(), form_exports));
   await formCommand2(opts);
 });
@@ -8168,6 +9129,10 @@ formCmd.command("create").description("Create a pending entity (staged flow step
   await formCreateCommand2({
     ...opts,
     jurisdiction: inheritOption(opts.jurisdiction, parent.jurisdiction),
+    fiscalYearEnd: inheritOption(opts.fiscalYearEnd, parent.fiscalYearEnd),
+    sCorp: inheritOption(opts.sCorp, parent.sCorp),
+    transferRestrictions: inheritOption(opts.transferRestrictions, parent.transferRestrictions),
+    rofr: inheritOption(opts.rofr, parent.rofr),
     json: inheritOption(opts.json, parent.json),
     dryRun: inheritOption(opts.dryRun, parent.dryRun)
   });
@@ -8196,9 +9161,30 @@ formCmd.command("activate <entity-ref>").description("Programmatically sign form
     dryRun: inheritOption(opts.dryRun, cmd.parent.opts().dryRun)
   });
 });
-program.command("api-keys").description("List API keys").option("--json", "Output as JSON").action(async (opts) => {
-  const { apiKeysCommand: apiKeysCommand2 } = await Promise.resolve().then(() => (init_api_keys(), api_keys_exports));
-  await apiKeysCommand2(opts);
+formCmd.addHelpText("after", `
+Examples:
+  $ corp form --type llc --name "My LLC" --member "Alice,alice@co.com,member,100"
+  $ corp form --type c_corp --name "Acme Inc" --jurisdiction US-DE --member-json '{"name":"Bob","email":"bob@acme.com","role":"director","pct":100}'
+  $ corp form create --type llc --name "My LLC"
+  $ corp form add-founder @last:entity --name "Alice" --email "alice@co.com" --role member --pct 100
+  $ corp form finalize @last:entity
+  $ corp form activate @last:entity
+`);
+var apiKeysCmd = program.command("api-keys").description("API key management").option("--json", "Output as JSON").action(async (opts) => {
+  const { apiKeysListCommand: apiKeysListCommand2 } = await Promise.resolve().then(() => (init_api_keys(), api_keys_exports));
+  await apiKeysListCommand2(opts);
+});
+apiKeysCmd.command("create").requiredOption("--name <name>", "Key name/label").option("--scopes <scopes>", "Comma-separated scopes").option("--json", "Output as JSON").description("Create a new API key").action(async (opts) => {
+  const { apiKeysCreateCommand: apiKeysCreateCommand2 } = await Promise.resolve().then(() => (init_api_keys(), api_keys_exports));
+  await apiKeysCreateCommand2(opts);
+});
+apiKeysCmd.command("revoke <key-id>").option("--yes", "Skip confirmation").option("--json", "Output as JSON").description("Revoke an API key").action(async (keyId, opts) => {
+  const { apiKeysRevokeCommand: apiKeysRevokeCommand2 } = await Promise.resolve().then(() => (init_api_keys(), api_keys_exports));
+  await apiKeysRevokeCommand2(keyId, opts);
+});
+apiKeysCmd.command("rotate <key-id>").option("--json", "Output as JSON").description("Rotate an API key (returns new key)").action(async (keyId, opts) => {
+  const { apiKeysRotateCommand: apiKeysRotateCommand2 } = await Promise.resolve().then(() => (init_api_keys(), api_keys_exports));
+  await apiKeysRotateCommand2(keyId, opts);
 });
 program.command("demo").description("Create a usable demo workspace environment").requiredOption("--name <name>", "Corporation name").option("--scenario <scenario>", "Scenario to create (startup, llc, restaurant)", "startup").option("--minimal", "Use the minimal server-side demo seed instead of the full CLI workflow").option("--json", "Output as JSON").action(async (opts) => {
   const { demoCommand: demoCommand2 } = await Promise.resolve().then(() => (init_demo(), demo_exports));