@thecorporation/cli 26.3.14 → 26.3.18

package/dist/index.js

@@ -10,40 +10,239 @@ var __export = (target, all) => {
 };
 
 // src/config.ts
-var config_exports = {};
-__export(config_exports, {
-  configForDisplay: () => configForDisplay,
-  getValue: () => getValue,
-  loadConfig: () => loadConfig,
-  maskKey: () => maskKey,
-  requireConfig: () => requireConfig,
-  resolveEntityId: () => resolveEntityId,
-  saveConfig: () => saveConfig,
-  setValue: () => setValue
-});
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
-import { join } from "path";
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  writeFileSync
+} from "fs";
 import { homedir } from "os";
-function deepMerge(base, override) {
-  for (const [key, value] of Object.entries(override)) {
-    if (key in base && typeof base[key] === "object" && base[key] !== null && !Array.isArray(base[key]) && typeof value === "object" && value !== null && !Array.isArray(value)) {
-      deepMerge(base[key], value);
-    } else {
-      base[key] = value;
+import { join } from "path";
+function sleepSync(ms) {
+  Atomics.wait(CONFIG_WAIT_SIGNAL, 0, 0, ms);
+}
+function withConfigLock(fn) {
+  mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
+  const startedAt = Date.now();
+  while (true) {
+    try {
+      mkdirSync(CONFIG_LOCK_DIR, { mode: 448 });
+      break;
+    } catch (err) {
+      if (err.code !== "EEXIST") {
+        throw err;
+      }
+      if (Date.now() - startedAt >= CONFIG_LOCK_TIMEOUT_MS) {
+        throw new Error("timed out waiting for the corp config lock");
+      }
+      sleepSync(CONFIG_LOCK_RETRY_MS);
     }
   }
+  try {
+    return fn();
+  } finally {
+    rmSync(CONFIG_LOCK_DIR, { recursive: true, force: true });
+  }
 }
-function loadConfig() {
-  const cfg = structuredClone(DEFAULTS);
+function ensureSecurePermissions() {
+  mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
+  try {
+    chmodSync(CONFIG_DIR, 448);
+  } catch {
+  }
   if (existsSync(CONFIG_FILE)) {
-    const saved = JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
-    deepMerge(cfg, saved);
+    try {
+      chmodSync(CONFIG_FILE, 384);
+    } catch {
+    }
+  }
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isLoopbackHost(hostname) {
+  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1";
+}
+function validateApiUrl(value) {
+  let parsed;
+  try {
+    parsed = new URL(value.trim());
+  } catch {
+    throw new Error("api_url must be a valid absolute URL");
+  }
+  if (parsed.username || parsed.password) {
+    throw new Error("api_url must not include embedded credentials");
+  }
+  const protocol = parsed.protocol.toLowerCase();
+  const hostname = parsed.hostname.toLowerCase();
+  if (protocol !== "https:" && !(protocol === "http:" && isLoopbackHost(hostname))) {
+    throw new Error("api_url must use https, or http only for localhost/loopback development");
+  }
+  parsed.hash = "";
+  return parsed.toString().replace(/\/+$/, "");
+}
+function normalizeString(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function normalizeActiveEntityMap(value) {
+  if (!isObject(value)) {
+    return void 0;
+  }
+  const entries = Object.entries(value).filter(
+    ([workspaceId, entityId]) => typeof workspaceId === "string" && typeof entityId === "string" && entityId.length > 0
+  );
+  if (entries.length === 0) {
+    return void 0;
+  }
+  return Object.fromEntries(entries);
+}
+function normalizeConfig(raw) {
+  const cfg = structuredClone(DEFAULTS);
+  if (!isObject(raw)) {
+    return cfg;
+  }
+  const savedApiUrl = normalizeString(raw.api_url);
+  if (savedApiUrl) {
+    try {
+      cfg.api_url = validateApiUrl(savedApiUrl);
+    } catch {
+      cfg.api_url = DEFAULTS.api_url;
+    }
+  }
+  cfg.api_key = normalizeString(raw.api_key) ?? cfg.api_key;
+  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;
+  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;
+    cfg.llm.model = normalizeString(raw.llm.model) ?? cfg.llm.model;
+    const baseUrl = normalizeString(raw.llm.base_url);
+    if (baseUrl && baseUrl.trim()) {
+      cfg.llm.base_url = baseUrl.trim();
+    }
+  }
+  if (isObject(raw.user)) {
+    cfg.user.name = normalizeString(raw.user.name) ?? cfg.user.name;
+    cfg.user.email = normalizeString(raw.user.email) ?? cfg.user.email;
+  }
+  const activeEntityIds = normalizeActiveEntityMap(raw.active_entity_ids);
+  if (activeEntityIds) {
+    cfg.active_entity_ids = activeEntityIds;
+  }
+  if (cfg.workspace_id && cfg.active_entity_id) {
+    cfg.active_entity_ids = {
+      ...cfg.active_entity_ids ?? {},
+      [cfg.workspace_id]: cfg.active_entity_id
+    };
   }
   return cfg;
 }
+function serializeConfig(cfg) {
+  const normalized = normalizeConfig(cfg);
+  const serialized = {
+    api_url: normalized.api_url,
+    api_key: normalized.api_key,
+    workspace_id: normalized.workspace_id,
+    hosting_mode: normalized.hosting_mode,
+    llm: {
+      provider: normalized.llm.provider,
+      api_key: normalized.llm.api_key,
+      model: normalized.llm.model,
+      ...normalized.llm.base_url ? { base_url: normalized.llm.base_url } : {}
+    },
+    user: {
+      name: normalized.user.name,
+      email: normalized.user.email
+    },
+    active_entity_id: normalized.active_entity_id
+  };
+  if (normalized.active_entity_ids && Object.keys(normalized.active_entity_ids).length > 0) {
+    serialized.active_entity_ids = normalized.active_entity_ids;
+  }
+  return JSON.stringify(serialized, null, 2) + "\n";
+}
+function requireSupportedConfigKey(dotPath) {
+  if (!ALLOWED_CONFIG_KEYS.has(dotPath)) {
+    throw new Error(`unsupported config key: ${dotPath}`);
+  }
+}
+function validateSensitiveConfigUpdate(dotPath, forceSensitive = false) {
+  if (SENSITIVE_CONFIG_KEYS.has(dotPath) && !forceSensitive) {
+    throw new Error(`refusing to update security-sensitive key '${dotPath}' without --force`);
+  }
+}
+function setKnownConfigValue(cfg, dotPath, value) {
+  switch (dotPath) {
+    case "api_url":
+      cfg.api_url = validateApiUrl(value);
+      return;
+    case "api_key":
+      cfg.api_key = value.trim();
+      return;
+    case "workspace_id":
+      cfg.workspace_id = value.trim();
+      return;
+    case "hosting_mode":
+      cfg.hosting_mode = value.trim();
+      return;
+    case "llm.provider":
+      cfg.llm.provider = value.trim();
+      return;
+    case "llm.api_key":
+      cfg.llm.api_key = value.trim();
+      return;
+    case "llm.model":
+      cfg.llm.model = value.trim();
+      return;
+    case "llm.base_url":
+      cfg.llm.base_url = value.trim() || void 0;
+      return;
+    case "user.name":
+      cfg.user.name = value.trim();
+      return;
+    case "user.email":
+      cfg.user.email = value.trim();
+      return;
+    case "active_entity_id":
+      setActiveEntityId(cfg, value.trim());
+      return;
+    default:
+      throw new Error(`unsupported config key: ${dotPath}`);
+  }
+}
+function readConfigUnlocked() {
+  ensureSecurePermissions();
+  if (!existsSync(CONFIG_FILE)) {
+    return normalizeConfig(DEFAULTS);
+  }
+  return normalizeConfig(JSON.parse(readFileSync(CONFIG_FILE, "utf-8")));
+}
+function loadConfig() {
+  return readConfigUnlocked();
+}
 function saveConfig(cfg) {
-  mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
-  writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n", { mode: 384 });
+  withConfigLock(() => {
+    ensureSecurePermissions();
+    const tempFile = `${CONFIG_FILE}.${process.pid}.tmp`;
+    writeFileSync(tempFile, serializeConfig(cfg), { mode: 384 });
+    renameSync(tempFile, CONFIG_FILE);
+    ensureSecurePermissions();
+  });
+}
+function updateConfig(mutator) {
+  return withConfigLock(() => {
+    const cfg = readConfigUnlocked();
+    mutator(cfg);
+    const tempFile = `${CONFIG_FILE}.${process.pid}.tmp`;
+    writeFileSync(tempFile, serializeConfig(cfg), { mode: 384 });
+    renameSync(tempFile, CONFIG_FILE);
+    ensureSecurePermissions();
+    return cfg;
+  });
 }
 function getValue(cfg, dotPath) {
   const keys = dotPath.split(".");
@@ -57,16 +256,10 @@ function getValue(cfg, dotPath) {
   }
   return current;
 }
-function setValue(cfg, dotPath, value) {
-  const keys = dotPath.split(".");
-  let current = cfg;
-  for (const key of keys.slice(0, -1)) {
-    if (!(key in current) || typeof current[key] !== "object" || current[key] === null) {
-      current[key] = {};
-    }
-    current = current[key];
-  }
-  current[keys[keys.length - 1]] = value;
+function setValue(cfg, dotPath, value, options = {}) {
+  requireSupportedConfigKey(dotPath);
+  validateSensitiveConfigUpdate(dotPath, options.forceSensitive);
+  setKnownConfigValue(cfg, dotPath, value);
 }
 function requireConfig(...fields) {
   const cfg = loadConfig();
@@ -92,8 +285,24 @@ function configForDisplay(cfg) {
   }
   return display;
 }
+function getActiveEntityId(cfg) {
+  if (cfg.workspace_id && cfg.active_entity_ids?.[cfg.workspace_id]) {
+    return cfg.active_entity_ids[cfg.workspace_id];
+  }
+  return cfg.active_entity_id;
+}
+function setActiveEntityId(cfg, entityId) {
+  cfg.active_entity_id = entityId;
+  if (!cfg.workspace_id) {
+    return;
+  }
+  cfg.active_entity_ids = {
+    ...cfg.active_entity_ids ?? {},
+    [cfg.workspace_id]: entityId
+  };
+}
 function resolveEntityId(cfg, explicitId) {
-  const eid = explicitId || cfg.active_entity_id;
+  const eid = explicitId || getActiveEntityId(cfg);
   if (!eid) {
     console.error(
       "No entity specified. Use --entity-id or set active_entity_id via 'corp config set active_entity_id <id>'."
@@ -102,21 +311,41 @@ function resolveEntityId(cfg, explicitId) {
   }
   return eid;
 }
-var CONFIG_DIR, CONFIG_FILE, DEFAULTS;
+var CONFIG_DIR, CONFIG_FILE, CONFIG_LOCK_DIR, CONFIG_LOCK_TIMEOUT_MS, CONFIG_LOCK_RETRY_MS, CONFIG_WAIT_BUFFER, CONFIG_WAIT_SIGNAL, ALLOWED_CONFIG_KEYS, SENSITIVE_CONFIG_KEYS, DEFAULTS;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     CONFIG_DIR = process.env.CORP_CONFIG_DIR || join(homedir(), ".corp");
     CONFIG_FILE = join(CONFIG_DIR, "config.json");
+    CONFIG_LOCK_DIR = join(CONFIG_DIR, "config.lock");
+    CONFIG_LOCK_TIMEOUT_MS = 5e3;
+    CONFIG_LOCK_RETRY_MS = 25;
+    CONFIG_WAIT_BUFFER = new SharedArrayBuffer(4);
+    CONFIG_WAIT_SIGNAL = new Int32Array(CONFIG_WAIT_BUFFER);
+    ALLOWED_CONFIG_KEYS = /* @__PURE__ */ new Set([
+      "api_url",
+      "api_key",
+      "workspace_id",
+      "hosting_mode",
+      "llm.provider",
+      "llm.api_key",
+      "llm.model",
+      "llm.base_url",
+      "user.name",
+      "user.email",
+      "active_entity_id"
+    ]);
+    SENSITIVE_CONFIG_KEYS = /* @__PURE__ */ new Set(["api_url", "api_key", "workspace_id"]);
     DEFAULTS = {
       api_url: process.env.CORP_API_URL || "https://api.thecorporation.ai",
-      api_key: "",
-      workspace_id: "",
+      api_key: process.env.CORP_API_KEY || "",
+      workspace_id: process.env.CORP_WORKSPACE_ID || "",
       hosting_mode: "",
       llm: {
         provider: "anthropic",
-        api_key: "",
-        model: "claude-sonnet-4-6"
+        api_key: process.env.CORP_LLM_API_KEY || "",
+        model: "claude-sonnet-4-6",
+        base_url: process.env.CORP_LLM_BASE_URL || void 0
       },
       user: { name: "", email: "" },
       active_entity_id: ""
@@ -141,6 +370,7 @@ __export(output_exports, {
   printCapTable: () => printCapTable,
   printContactsTable: () => printContactsTable,
   printDocumentsTable: () => printDocumentsTable,
+  printDryRun: () => printDryRun,
   printEntitiesTable: () => printEntitiesTable,
   printError: () => printError,
   printGovernanceTable: () => printGovernanceTable,
@@ -155,7 +385,8 @@ __export(output_exports, {
   printTransfersTable: () => printTransfersTable,
   printValuationsTable: () => printValuationsTable,
   printWarning: () => printWarning,
-  printWorkItemsTable: () => printWorkItemsTable
+  printWorkItemsTable: () => printWorkItemsTable,
+  printWriteResult: () => printWriteResult
 });
 import chalk from "chalk";
 import Table from "cli-table3";
@@ -171,6 +402,21 @@ function printWarning(msg) {
 function printJson(data) {
   console.log(JSON.stringify(data, null, 2));
 }
+function printDryRun(operation, payload) {
+  printJson({
+    dry_run: true,
+    operation,
+    payload
+  });
+}
+function printWriteResult(result, successMessage, jsonOnly) {
+  if (jsonOnly) {
+    printJson(result);
+    return;
+  }
+  printSuccess(successMessage);
+  printJson(result);
+}
 function printStatusPanel(data) {
   console.log(chalk.blue("\u2500".repeat(50)));
   console.log(chalk.blue.bold("  Corp Status"));
@@ -246,6 +492,38 @@ function printContactsTable(contacts) {
 }
 function printCapTable(data) {
   const accessLevel = s(data.access_level) || "admin";
+  const instruments = data.instruments ?? [];
+  if (instruments.length > 0) {
+    const table = makeTable("Cap Table \u2014 Instruments", ["Symbol", "Kind", "Authorized", "Issued", "Diluted"]);
+    for (const instrument of instruments) {
+      table.push([
+        s(instrument.symbol),
+        s(instrument.kind),
+        s(instrument.authorized_units ?? "unlimited"),
+        s(instrument.issued_units),
+        s(instrument.diluted_units)
+      ]);
+    }
+    console.log(table.toString());
+  }
+  const holders = data.holders ?? [];
+  if (holders.length > 0 && accessLevel !== "summary") {
+    const table = makeTable(
+      "Ownership Breakdown",
+      ["Holder", "Outstanding", "As Converted", "Fully Diluted", "Fully Diluted %"]
+    );
+    for (const holder of holders) {
+      const dilutedBps = typeof holder.fully_diluted_bps === "number" ? `${(holder.fully_diluted_bps / 100).toFixed(2)}%` : "";
+      table.push([
+        s(holder.name),
+        s(holder.outstanding_units),
+        s(holder.as_converted_units),
+        s(holder.fully_diluted_units),
+        dilutedBps
+      ]);
+    }
+    console.log(table.toString());
+  }
   const shareClasses = data.share_classes ?? [];
   if (shareClasses.length > 0) {
     const cols = ["Class", "Authorized", "Outstanding"];
@@ -254,8 +532,8 @@ function printCapTable(data) {
     for (const sc of shareClasses) {
       const row = [s(sc.class_code ?? sc.name), s(sc.authorized), s(sc.outstanding)];
       if (accessLevel !== "summary") {
-        const holders = sc.holders ?? [];
-        row.push(holders.map((h) => `${h.name ?? "?"}(${h.percentage ?? "?"}%)`).join(", "));
+        const holders2 = sc.holders ?? [];
+        row.push(holders2.map((h) => `${h.name ?? "?"}(${h.percentage ?? "?"}%)`).join(", "));
       }
       table.push(row);
     }
@@ -282,17 +560,22 @@ function printCapTable(data) {
     console.log(`
 ${chalk.bold("Fully Diluted Shares:")} ${typeof fd === "number" ? fd.toLocaleString() : fd}`);
   }
+  if (data.total_units != null) {
+    console.log(`
+${chalk.bold("Cap Table Basis:")} ${s(data.basis) || "outstanding"}`);
+    console.log(`${chalk.bold("Total Units:")} ${typeof data.total_units === "number" ? data.total_units.toLocaleString() : data.total_units}`);
+  }
 }
 function printSafesTable(safes) {
   const table = makeTable("SAFE Notes", ["ID", "Investor", "Amount", "Cap", "Discount", "Date"]);
   for (const s_ of safes) {
     table.push([
-      s(s_.safe_id ?? s_.id, 12),
+      s(s_.safe_note_id ?? s_.safe_id ?? s_.id, 12),
       s(s_.investor_name ?? s_.investor),
-      money(s_.investment_amount ?? s_.amount, false),
-      s(s_.valuation_cap ?? s_.cap),
+      money(s_.principal_amount_cents ?? s_.investment_amount ?? s_.amount, false),
+      money(s_.valuation_cap_cents ?? s_.valuation_cap ?? s_.cap, false),
       s(s_.discount_rate ?? s_.discount),
-      s(s_.date ?? s_.created_at)
+      s(s_.issued_at ?? s_.date ?? s_.created_at)
     ]);
   }
   console.log(table.toString());
@@ -819,12 +1102,16 @@ var status_exports = {};
 __export(status_exports, {
   statusCommand: () => statusCommand
 });
-async function statusCommand() {
+async function statusCommand(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 = await withSpinner("Loading", () => client.getStatus());
-    printStatusPanel(data);
+    if (opts.json) {
+      printJson(data);
+    } else {
+      printStatusPanel(data);
+    }
   } catch (err) {
     printError(`Failed to fetch status: ${err}`);
     process.exit(1);
@@ -840,18 +1127,169 @@ var init_status = __esm({
   }
 });
 
+// src/commands/context.ts
+var context_exports = {};
+__export(context_exports, {
+  contextCommand: () => contextCommand
+});
+import chalk2 from "chalk";
+async function contextCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const rawCfg = loadConfig();
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    const [status, entities] = await Promise.all([
+      client.getStatus(),
+      client.listEntities()
+    ]);
+    const activeEntityId = getActiveEntityId(rawCfg);
+    const activeEntity = activeEntityId ? entities.find((entity) => entity.entity_id === activeEntityId) ?? null : null;
+    const [contactsResult, documentsResult, workItemsResult] = activeEntity ? await Promise.allSettled([
+      client.listContacts(String(activeEntity.entity_id)),
+      client.getEntityDocuments(String(activeEntity.entity_id)),
+      client.listWorkItems(String(activeEntity.entity_id))
+    ]) : [null, null, null];
+    const payload = {
+      user: {
+        name: rawCfg.user?.name ?? "",
+        email: rawCfg.user?.email ?? ""
+      },
+      workspace: {
+        workspace_id: rawCfg.workspace_id,
+        api_url: rawCfg.api_url,
+        status
+      },
+      active_entity: activeEntity ? {
+        entity: activeEntity,
+        summary: {
+          contact_count: contactsResult && contactsResult.status === "fulfilled" ? contactsResult.value.length : null,
+          document_count: documentsResult && documentsResult.status === "fulfilled" ? documentsResult.value.length : null,
+          work_item_count: workItemsResult && workItemsResult.status === "fulfilled" ? workItemsResult.value.length : null
+        }
+      } : null,
+      entity_count: entities.length
+    };
+    if (opts.json) {
+      printJson(payload);
+      return;
+    }
+    console.log(chalk2.blue("\u2500".repeat(50)));
+    console.log(chalk2.blue.bold("  Corp Context"));
+    console.log(chalk2.blue("\u2500".repeat(50)));
+    console.log(`  ${chalk2.bold("User:")} ${payload.user.name || "N/A"} <${payload.user.email || "N/A"}>`);
+    console.log(`  ${chalk2.bold("Workspace:")} ${rawCfg.workspace_id}`);
+    console.log(`  ${chalk2.bold("API URL:")} ${rawCfg.api_url}`);
+    console.log(`  ${chalk2.bold("Entities:")} ${entities.length}`);
+    if (payload.active_entity) {
+      console.log(`  ${chalk2.bold("Active Entity:")} ${payload.active_entity.entity.legal_name ?? payload.active_entity.entity.entity_id}`);
+      console.log(`  ${chalk2.bold("Active Entity ID:")} ${payload.active_entity.entity.entity_id}`);
+      console.log(`  ${chalk2.bold("Contacts:")} ${payload.active_entity.summary.contact_count ?? "N/A"}`);
+      console.log(`  ${chalk2.bold("Documents:")} ${payload.active_entity.summary.document_count ?? "N/A"}`);
+      console.log(`  ${chalk2.bold("Work Items:")} ${payload.active_entity.summary.work_item_count ?? "N/A"}`);
+    } else {
+      console.log(`  ${chalk2.bold("Active Entity:")} none`);
+    }
+    if (status.next_deadline) {
+      console.log(`  ${chalk2.bold("Next Deadline:")} ${status.next_deadline}`);
+    }
+    console.log(chalk2.blue("\u2500".repeat(50)));
+  } catch (err) {
+    printError(`Failed to fetch context: ${err}`);
+    process.exit(1);
+  }
+}
+var init_context = __esm({
+  "src/commands/context.ts"() {
+    "use strict";
+    init_config();
+    init_api_client();
+    init_output();
+  }
+});
+
+// src/commands/schema.ts
+var schema_exports = {};
+__export(schema_exports, {
+  schemaCommand: () => schemaCommand
+});
+function readChoices(value) {
+  if (Array.isArray(value) && value.every((entry) => typeof entry === "string")) {
+    return value;
+  }
+  return void 0;
+}
+function commandToSchema(command, parentPath = "") {
+  const cmd = command;
+  const path = parentPath ? `${parentPath} ${command.name()}` : command.name();
+  return {
+    path,
+    name: command.name(),
+    description: command.description(),
+    aliases: command.aliases(),
+    arguments: (cmd.registeredArguments ?? []).map((arg) => ({
+      name: arg.name(),
+      required: Boolean(arg.required),
+      variadic: Boolean(arg.variadic),
+      defaultValue: arg.defaultValue,
+      choices: readChoices(arg.argChoices)
+    })),
+    options: command.options.map((option) => ({
+      flags: option.flags,
+      name: option.attributeName(),
+      description: option.description ?? "",
+      required: option.required,
+      mandatory: option.mandatory,
+      variadic: option.variadic,
+      defaultValue: option.defaultValue,
+      choices: readChoices(option.argChoices)
+    })),
+    subcommands: command.commands.map((child) => commandToSchema(child, path))
+  };
+}
+function schemaCommand(program2, opts) {
+  const manifest = {
+    name: program2.name(),
+    version: program2.version(),
+    description: program2.description(),
+    generated_at: (/* @__PURE__ */ new Date()).toISOString(),
+    commands: program2.commands.map((command) => commandToSchema(command, program2.name()))
+  };
+  if (opts.compact) {
+    console.log(JSON.stringify(manifest));
+    return;
+  }
+  printJson(manifest);
+}
+var init_schema = __esm({
+  "src/commands/schema.ts"() {
+    "use strict";
+    init_output();
+  }
+});
+
 // src/commands/config.ts
-var config_exports2 = {};
-__export(config_exports2, {
+var config_exports = {};
+__export(config_exports, {
   configGetCommand: () => configGetCommand,
   configListCommand: () => configListCommand,
   configSetCommand: () => configSetCommand
 });
-function configSetCommand(key, value) {
-  const cfg = loadConfig();
-  setValue(cfg, key, value);
-  saveConfig(cfg);
-  console.log(`${key} = ${value}`);
+function configSetCommand(key, value, options = {}) {
+  try {
+    updateConfig((cfg) => {
+      setValue(cfg, key, value, {
+        forceSensitive: options.force
+      });
+    });
+  } catch (err) {
+    printError(`Failed to update config: ${err}`);
+    process.exit(1);
+  }
+  if (key === "api_key" || key === "llm.api_key") {
+    console.log(`${key} updated.`);
+    return;
+  }
+  console.log(`${key} updated.`);
 }
 function configGetCommand(key) {
   const cfg = loadConfig();
@@ -921,8 +1359,10 @@ async function digestCommand(opts) {
         const value = result.message;
         return typeof value === "string" && value.trim() ? value : null;
       })();
-      printSuccess(result.digest_count > 0 ? "Digest triggered." : "Digest trigger accepted.");
-      if (message) {
+      if (!opts.json) {
+        printSuccess(result.digest_count > 0 ? "Digest triggered." : "Digest trigger accepted.");
+      }
+      if (message && !opts.json) {
         printWarning(message);
       }
       printJson(result);
@@ -1164,9 +1604,9 @@ async function executeTool(name, args, client) {
     dataDir: join2(homedir2(), ".corp"),
     onEntityFormed: (entityId) => {
       try {
-        const cfg = loadConfig();
-        cfg.active_entity_id = entityId;
-        saveConfig(cfg);
+        updateConfig((cfg) => {
+          setActiveEntityId(cfg, entityId);
+        });
       } catch {
       }
     }
@@ -1188,15 +1628,15 @@ __export(chat_exports, {
   chatCommand: () => chatCommand
 });
 import { createInterface } from "readline";
-import chalk2 from "chalk";
+import chalk3 from "chalk";
 async function chatCommand() {
   const cfg = requireConfig("api_url", "api_key", "workspace_id", "llm.api_key");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   const messages = [{ role: "system", content: SYSTEM_PROMPT }];
   let totalTokens = 0;
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const prompt = () => new Promise((resolve2) => rl.question(chalk2.green.bold("> "), resolve2));
-  console.log(chalk2.blue.bold("corp chat") + " \u2014 type /help for commands, /quit to exit\n");
+  const prompt = () => new Promise((resolve3) => rl.question(chalk3.green.bold("> "), resolve3));
+  console.log(chalk3.blue.bold("corp chat") + " \u2014 type /help for commands, /quit to exit\n");
   const slashHandlers = {
     "/status": async () => {
       try {
@@ -1210,7 +1650,7 @@ async function chatCommand() {
         const data = await client.getObligations();
         const obls = data.obligations ?? [];
         if (obls.length) printObligationsTable(obls);
-        else console.log(chalk2.dim("No obligations found."));
+        else console.log(chalk3.dim("No obligations found."));
       } catch (e) {
         printError(`Obligations error: ${e}`);
       }
@@ -1219,7 +1659,7 @@ async function chatCommand() {
       try {
         const digests = await client.listDigests();
         if (digests.length) printJson(digests);
-        else console.log(chalk2.dim("No digest history."));
+        else console.log(chalk3.dim("No digest history."));
       } catch (e) {
         printError(`Digest error: ${e}`);
       }
@@ -1240,11 +1680,11 @@ async function chatCommand() {
       messages.length = 0;
       messages.push({ role: "system", content: SYSTEM_PROMPT });
       totalTokens = 0;
-      console.log(chalk2.dim("Conversation cleared."));
+      console.log(chalk3.dim("Conversation cleared."));
     },
     "/help": () => {
       console.log(`
-${chalk2.bold("Chat Slash Commands")}
+${chalk3.bold("Chat Slash Commands")}
   /status        Show workspace status
   /obligations   List obligations
   /digest        Show digest history
@@ -1262,7 +1702,7 @@ ${chalk2.bold("Chat Slash Commands")}
       try {
         userInput = (await prompt()).trim();
       } catch {
-        console.log("\n" + chalk2.dim("Goodbye."));
+        console.log("\n" + chalk3.dim("Goodbye."));
         break;
       }
       if (!userInput) continue;
@@ -1270,7 +1710,7 @@ ${chalk2.bold("Chat Slash Commands")}
         const [cmd, ...rest] = userInput.split(/\s+/);
         const args = rest.join(" ");
         if (cmd === "/quit" || cmd === "/exit") {
-          console.log(chalk2.dim("Goodbye."));
+          console.log(chalk3.dim("Goodbye."));
           break;
         }
         const handler = slashHandlers[cmd.toLowerCase()];
@@ -1314,10 +1754,10 @@ ${chalk2.bold("Chat Slash Commands")}
           break;
         }
         for (const tc of response.tool_calls) {
-          console.log(chalk2.dim(`  ${isWriteTool(tc.name, tc.arguments) ? "\u2699" : "\u2139"} ${tc.name}(${JSON.stringify(tc.arguments).slice(0, 80)})`));
+          console.log(chalk3.dim(`  ${isWriteTool(tc.name, tc.arguments) ? "\u2699" : "\u2139"} ${tc.name}(${JSON.stringify(tc.arguments).slice(0, 80)})`));
           const result = await executeTool(tc.name, tc.arguments, client);
           const short = result.length > 200 ? result.slice(0, 197) + "..." : result;
-          console.log(chalk2.dim(`    => ${short}`));
+          console.log(chalk3.dim(`    => ${short}`));
           messages.push({ role: "tool", tool_call_id: tc.id, content: result });
         }
       }
@@ -1353,7 +1793,7 @@ __export(entities_exports, {
   entitiesDissolveCommand: () => entitiesDissolveCommand,
   entitiesShowCommand: () => entitiesShowCommand
 });
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 async function entitiesCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
@@ -1386,18 +1826,18 @@ async function entitiesShowCommand(entityId, opts) {
     if (jsonOutput) {
       printJson(entity);
     } else {
-      console.log(chalk3.blue("\u2500".repeat(40)));
-      console.log(chalk3.blue.bold("  Entity Detail"));
-      console.log(chalk3.blue("\u2500".repeat(40)));
-      console.log(`  ${chalk3.bold("Name:")} ${entity.legal_name ?? entity.name ?? "N/A"}`);
-      console.log(`  ${chalk3.bold("Type:")} ${entity.entity_type ?? "N/A"}`);
-      console.log(`  ${chalk3.bold("Jurisdiction:")} ${entity.jurisdiction ?? "N/A"}`);
-      console.log(`  ${chalk3.bold("Status:")} ${entity.formation_status ?? entity.status ?? "N/A"}`);
-      console.log(`  ${chalk3.bold("State:")} ${entity.formation_state ?? "N/A"}`);
-      console.log(`  ${chalk3.bold("ID:")} ${entity.entity_id ?? "N/A"}`);
-      if (entity.formation_date) console.log(`  ${chalk3.bold("Formation Date:")} ${entity.formation_date}`);
-      if (entity.ein) console.log(`  ${chalk3.bold("EIN:")} ${entity.ein}`);
-      console.log(chalk3.blue("\u2500".repeat(40)));
+      console.log(chalk4.blue("\u2500".repeat(40)));
+      console.log(chalk4.blue.bold("  Entity Detail"));
+      console.log(chalk4.blue("\u2500".repeat(40)));
+      console.log(`  ${chalk4.bold("Name:")} ${entity.legal_name ?? entity.name ?? "N/A"}`);
+      console.log(`  ${chalk4.bold("Type:")} ${entity.entity_type ?? "N/A"}`);
+      console.log(`  ${chalk4.bold("Jurisdiction:")} ${entity.jurisdiction ?? "N/A"}`);
+      console.log(`  ${chalk4.bold("Status:")} ${entity.formation_status ?? entity.status ?? "N/A"}`);
+      console.log(`  ${chalk4.bold("State:")} ${entity.formation_state ?? "N/A"}`);
+      console.log(`  ${chalk4.bold("ID:")} ${entity.entity_id ?? "N/A"}`);
+      if (entity.formation_date) console.log(`  ${chalk4.bold("Formation Date:")} ${entity.formation_date}`);
+      if (entity.ein) console.log(`  ${chalk4.bold("EIN:")} ${entity.ein}`);
+      console.log(chalk4.blue("\u2500".repeat(40)));
     }
   } catch (err) {
     printError(`Failed to fetch entities: ${err}`);
@@ -1455,7 +1895,7 @@ __export(contacts_exports, {
   contactsListCommand: () => contactsListCommand,
   contactsShowCommand: () => contactsShowCommand
 });
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 async function contactsListCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
@@ -1480,24 +1920,24 @@ async function contactsShowCommand(contactId, opts) {
       printJson(profile);
     } else {
       const contact = profile.contact ?? profile;
-      console.log(chalk4.cyan("\u2500".repeat(40)));
-      console.log(chalk4.cyan.bold("  Contact Profile"));
-      console.log(chalk4.cyan("\u2500".repeat(40)));
-      console.log(`  ${chalk4.bold("Name:")} ${contact.name ?? "N/A"}`);
-      console.log(`  ${chalk4.bold("Email:")} ${contact.email ?? "N/A"}`);
-      console.log(`  ${chalk4.bold("Category:")} ${contact.category ?? "N/A"}`);
-      if (contact.phone) console.log(`  ${chalk4.bold("Phone:")} ${contact.phone}`);
-      if (contact.notes) console.log(`  ${chalk4.bold("Notes:")} ${contact.notes}`);
+      console.log(chalk5.cyan("\u2500".repeat(40)));
+      console.log(chalk5.cyan.bold("  Contact Profile"));
+      console.log(chalk5.cyan("\u2500".repeat(40)));
+      console.log(`  ${chalk5.bold("Name:")} ${contact.name ?? "N/A"}`);
+      console.log(`  ${chalk5.bold("Email:")} ${contact.email ?? "N/A"}`);
+      console.log(`  ${chalk5.bold("Category:")} ${contact.category ?? "N/A"}`);
+      if (contact.phone) console.log(`  ${chalk5.bold("Phone:")} ${contact.phone}`);
+      if (contact.notes) console.log(`  ${chalk5.bold("Notes:")} ${contact.notes}`);
       const holdings = profile.equity_holdings;
       if (holdings?.length) {
         console.log(`
-  ${chalk4.bold("Equity Holdings:")}`);
+  ${chalk5.bold("Equity Holdings:")}`);
         for (const h of holdings) console.log(`    ${h.share_class ?? "?"}: ${h.shares ?? "?"} shares`);
       }
       const obls = profile.obligations;
       if (obls?.length) console.log(`
-  ${chalk4.bold("Obligations:")} ${obls.length}`);
-      console.log(chalk4.cyan("\u2500".repeat(40)));
+  ${chalk5.bold("Obligations:")} ${obls.length}`);
+      console.log(chalk5.cyan("\u2500".repeat(40)));
     }
   } catch (err) {
     printError(`Failed to fetch contact: ${err}`);
@@ -1518,8 +1958,14 @@ async function contactsAddCommand(opts) {
     };
     if (opts.phone) data.phone = opts.phone;
     if (opts.notes) data.notes = opts.notes;
+    if (opts.mailingAddress ?? opts.address) data.mailing_address = opts.mailingAddress ?? opts.address;
+    if (opts.capTableAccess) data.cap_table_access = opts.capTableAccess;
     const result = await client.createContact(data);
-    printSuccess(`Contact created: ${result.contact_id ?? result.id ?? "OK"}`);
+    printWriteResult(
+      result,
+      `Contact created: ${result.contact_id ?? result.id ?? "OK"}`,
+      opts.json
+    );
   } catch (err) {
     printError(`Failed to create contact: ${err}`);
     process.exit(1);
@@ -1531,17 +1977,41 @@ async function contactsEditCommand(contactId, opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
     const data = { entity_id: eid };
-    if (opts.name != null) data.name = opts.name;
-    if (opts.email != null) data.email = opts.email;
-    if (opts.category != null) data.category = opts.category;
-    if (opts.phone != null) data.phone = opts.phone;
-    if (opts.notes != null) data.notes = opts.notes;
-    if (Object.keys(data).length === 0) {
+    let hasUpdates = false;
+    if (opts.name != null) {
+      data.name = opts.name;
+      hasUpdates = true;
+    }
+    if (opts.email != null) {
+      data.email = opts.email;
+      hasUpdates = true;
+    }
+    if (opts.category != null) {
+      data.category = opts.category;
+      hasUpdates = true;
+    }
+    if (opts.phone != null) {
+      data.phone = opts.phone;
+      hasUpdates = true;
+    }
+    if (opts.notes != null) {
+      data.notes = opts.notes;
+      hasUpdates = true;
+    }
+    if (opts.capTableAccess != null) {
+      data.cap_table_access = opts.capTableAccess;
+      hasUpdates = true;
+    }
+    if (opts.mailingAddress != null || opts.address != null) {
+      data.mailing_address = opts.mailingAddress ?? opts.address;
+      hasUpdates = true;
+    }
+    if (!hasUpdates) {
       console.log("No fields to update.");
       return;
     }
-    await client.updateContact(contactId, data);
-    printSuccess("Contact updated.");
+    const result = await client.updateContact(contactId, data);
+    printWriteResult(result, "Contact updated.", opts.json);
   } catch (err) {
     printError(`Failed to update contact: ${err}`);
     process.exit(1);
@@ -1562,6 +2032,7 @@ __export(cap_table_exports, {
   addSecurityCommand: () => addSecurityCommand,
   approveValuationCommand: () => approveValuationCommand,
   capTableCommand: () => capTableCommand,
+  createInstrumentCommand: () => createInstrumentCommand,
   createValuationCommand: () => createValuationCommand,
   distributeCommand: () => distributeCommand,
   fourOhNineACommand: () => fourOhNineACommand,
@@ -1575,7 +2046,109 @@ __export(cap_table_exports, {
   transfersCommand: () => transfersCommand,
   valuationsCommand: () => valuationsCommand
 });
-import chalk5 from "chalk";
+import chalk6 from "chalk";
+function normalizedGrantType(grantType) {
+  return grantType.trim().toLowerCase().replaceAll("-", "_").replaceAll(" ", "_");
+}
+function expectedInstrumentKinds(grantType) {
+  switch (normalizedGrantType(grantType)) {
+    case "common":
+    case "common_stock":
+      return ["common_equity"];
+    case "preferred":
+    case "preferred_stock":
+      return ["preferred_equity"];
+    case "unit":
+    case "membership_unit":
+      return ["membership_unit"];
+    case "option":
+    case "options":
+    case "stock_option":
+    case "iso":
+    case "nso":
+      return ["option_grant"];
+    case "rsa":
+      return ["common_equity", "preferred_equity"];
+    default:
+      return [];
+  }
+}
+function grantRequiresCurrent409a(grantType, instrumentKind) {
+  return instrumentKind?.toLowerCase() === "option_grant" || expectedInstrumentKinds(grantType).includes("option_grant");
+}
+function buildInstrumentCreationHint(grantType) {
+  const normalized = normalizedGrantType(grantType);
+  switch (normalized) {
+    case "preferred":
+    case "preferred_stock":
+      return "Create one with: corp cap-table create-instrument --kind preferred_equity --symbol SERIES-A --authorized-units <shares>";
+    case "option":
+    case "options":
+    case "stock_option":
+    case "iso":
+    case "nso":
+      return "Create one with: corp cap-table create-instrument --kind option_grant --symbol OPTION-PLAN --authorized-units <shares>";
+    case "membership_unit":
+    case "unit":
+      return "Create one with: corp cap-table create-instrument --kind membership_unit --symbol UNIT --authorized-units <units>";
+    case "common":
+    case "common_stock":
+      return "Create one with: corp cap-table create-instrument --kind common_equity --symbol COMMON --authorized-units <shares>";
+    default:
+      return "Create a matching instrument first, then pass --instrument-id explicitly.";
+  }
+}
+function resolveInstrumentForGrant(instruments, grantType, explicitInstrumentId) {
+  if (explicitInstrumentId) {
+    const explicit = instruments.find((instrument) => instrument.instrument_id === explicitInstrumentId);
+    if (!explicit) {
+      throw new Error(`Instrument ${explicitInstrumentId} was not found on the cap table.`);
+    }
+    return explicit;
+  }
+  const expectedKinds = expectedInstrumentKinds(grantType);
+  if (expectedKinds.length === 0) {
+    throw new Error(
+      `No default instrument mapping exists for grant type "${grantType}". ${buildInstrumentCreationHint(grantType)}`
+    );
+  }
+  const match = instruments.find((instrument) => expectedKinds.includes(String(instrument.kind).toLowerCase()));
+  if (!match) {
+    throw new Error(
+      `No instrument found for grant type "${grantType}". Expected one of: ${expectedKinds.join(", ")}. ${buildInstrumentCreationHint(grantType)}`
+    );
+  }
+  return match;
+}
+async function entityHasActiveBoard(client, entityId) {
+  const bodies = await client.listGovernanceBodies(entityId);
+  return bodies.some(
+    (body) => String(body.body_type ?? "").toLowerCase() === "board_of_directors" && String(body.status ?? "active").toLowerCase() === "active"
+  );
+}
+async function ensureIssuancePreflight(client, entityId, grantType, instrument, meetingId, resolutionId) {
+  if (!meetingId || !resolutionId) {
+    if (await entityHasActiveBoard(client, entityId)) {
+      throw new Error(
+        "Board approval is required before issuing this round. Pass --meeting-id and --resolution-id from a passed board vote."
+      );
+    }
+  }
+  if (!grantRequiresCurrent409a(grantType, instrument?.kind)) {
+    return;
+  }
+  try {
+    await client.getCurrent409a(entityId);
+  } catch (err) {
+    const msg = String(err);
+    if (msg.includes("404")) {
+      throw new Error(
+        "Stock option issuances require a current approved 409A valuation. Create and approve one first with: corp cap-table create-valuation --type four_oh_nine_a --date YYYY-MM-DD --methodology <method>; corp cap-table submit-valuation <id>; corp cap-table approve-valuation <id> --resolution-id <resolution-id>"
+      );
+    }
+    throw err;
+  }
+}
 async function capTableCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
@@ -1667,31 +2240,43 @@ async function issueEquityCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("cap_table.issue_equity", {
+        entity_id: eid,
+        grant_type: opts.grantType,
+        shares: opts.shares,
+        recipient: opts.recipient,
+        email: opts.email,
+        instrument_id: opts.instrumentId,
+        meeting_id: opts.meetingId,
+        resolution_id: opts.resolutionId
+      });
+      return;
+    }
     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?");
       process.exit(1);
     }
-    let instrumentId = opts.instrumentId;
-    if (!instrumentId) {
-      const instruments = capTable.instruments;
-      if (!instruments?.length) {
-        printError("No instruments found on cap table. Create an instrument first.");
-        process.exit(1);
-      }
-      const grantLower = opts.grantType.toLowerCase();
-      const match = instruments.find(
-        (i) => i.kind.toLowerCase().includes(grantLower) || i.symbol.toLowerCase().includes(grantLower)
-      ) ?? instruments.find((i) => i.kind.toLowerCase().includes("common"));
-      if (match) {
-        instrumentId = match.instrument_id;
-        console.log(`Using instrument: ${match.symbol} (${match.kind})`);
-      } else {
-        instrumentId = instruments[0].instrument_id;
-        console.log(`Using first instrument: ${instruments[0].symbol} (${instruments[0].kind})`);
-      }
+    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>");
+      process.exit(1);
     }
+    const instrument = resolveInstrumentForGrant(instruments, opts.grantType, opts.instrumentId);
+    const instrumentId = instrument.instrument_id;
+    if (!opts.instrumentId) {
+      console.log(`Using instrument: ${instrument.symbol} (${instrument.kind})`);
+    }
+    await ensureIssuancePreflight(
+      client,
+      eid,
+      opts.grantType,
+      instrument,
+      opts.meetingId,
+      opts.resolutionId
+    );
     const round = await client.startEquityRound({
       entity_id: eid,
       name: `${opts.grantType} grant \u2014 ${opts.recipient}`,
@@ -1707,7 +2292,14 @@ async function issueEquityCommand(opts) {
     };
     if (opts.email) securityData.email = opts.email;
     await client.addRoundSecurity(roundId, securityData);
-    const result = await client.issueRound(roundId, { entity_id: eid });
+    const issuePayload = { entity_id: eid };
+    if (opts.meetingId) issuePayload.meeting_id = opts.meetingId;
+    if (opts.resolutionId) issuePayload.resolution_id = opts.resolutionId;
+    const result = await client.issueRound(roundId, issuePayload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Equity issued: ${opts.shares} shares (${opts.grantType}) to ${opts.recipient}`);
     printJson(result);
   } catch (err) {
@@ -1720,35 +2312,42 @@ async function issueSafeCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    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?");
-      process.exit(1);
-    }
-    const instruments = capTable.instruments;
-    const safeInstrument = instruments?.find((i) => i.kind.toLowerCase() === "safe");
-    if (!safeInstrument) {
-      printError("No SAFE instrument found on cap table. Create a SAFE instrument first.");
-      process.exit(1);
+    if (opts.dryRun) {
+      printDryRun("cap_table.issue_safe", {
+        entity_id: eid,
+        investor: opts.investor,
+        amount: opts.amount,
+        safe_type: opts.safeType,
+        valuation_cap: opts.valuationCap,
+        email: opts.email,
+        meeting_id: opts.meetingId,
+        resolution_id: opts.resolutionId
+      });
+      return;
     }
-    const round = await client.startEquityRound({
-      entity_id: eid,
-      name: `SAFE \u2014 ${opts.investor}`,
-      issuer_legal_entity_id: issuerLegalEntityId
-    });
-    const roundId = round.round_id ?? round.equity_round_id;
-    const securityData = {
+    await ensureIssuancePreflight(
+      client,
+      eid,
+      opts.safeType,
+      void 0,
+      opts.meetingId,
+      opts.resolutionId
+    );
+    const body = {
       entity_id: eid,
-      instrument_id: safeInstrument.instrument_id,
-      quantity: opts.amount,
-      recipient_name: opts.investor,
-      principal_cents: opts.amount,
-      grant_type: opts.safeType
+      investor_name: opts.investor,
+      principal_amount_cents: opts.amount,
+      valuation_cap_cents: opts.valuationCap,
+      safe_type: opts.safeType
     };
-    if (opts.email) securityData.email = opts.email;
-    await client.addRoundSecurity(roundId, securityData);
-    const result = await client.issueRound(roundId, { entity_id: eid });
+    if (opts.email) body.email = opts.email;
+    if (opts.meetingId) body.meeting_id = opts.meetingId;
+    if (opts.resolutionId) body.resolution_id = opts.resolutionId;
+    const result = await client.createSafeNote(body);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`SAFE issued: $${(opts.amount / 100).toLocaleString()} to ${opts.investor}`);
     printJson(result);
   } catch (err) {
@@ -1761,6 +2360,28 @@ async function transferSharesCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.pricePerShareCents != null && opts.pricePerShareCents < 0) {
+      throw new Error("price-per-share-cents cannot be negative");
+    }
+    if (opts.from === opts.to) {
+      throw new Error("--from and --to must be different contacts");
+    }
+    if (opts.dryRun) {
+      printDryRun("cap_table.transfer_shares", {
+        entity_id: eid,
+        from_contact_id: opts.from,
+        to_contact_id: opts.to,
+        share_count: opts.shares,
+        transfer_type: opts.type,
+        share_class_id: opts.shareClassId,
+        governing_doc_type: opts.governingDocType,
+        transferee_rights: opts.transfereeRights,
+        prepare_intent_id: opts.prepareIntentId,
+        price_per_share_cents: opts.pricePerShareCents,
+        relationship_to_holder: opts.relationship
+      });
+      return;
+    }
     let intentId = opts.prepareIntentId;
     if (!intentId) {
       const intent = await client.createExecutionIntent({
@@ -1786,8 +2407,7 @@ async function transferSharesCommand(opts) {
     if (opts.pricePerShareCents != null) body.price_per_share_cents = opts.pricePerShareCents;
     if (opts.relationship) body.relationship_to_holder = opts.relationship;
     const result = await client.transferShares(body);
-    printSuccess(`Transfer workflow created: ${result.workflow_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Transfer workflow created: ${result.workflow_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to create transfer workflow: ${err}`);
     process.exit(1);
@@ -1798,15 +2418,19 @@ async function distributeCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.calculateDistribution({
+    const payload = {
       entity_id: eid,
       total_amount_cents: opts.amount,
       distribution_type: opts.type,
       description: opts.description
-    });
-    printSuccess(`Distribution calculated: ${result.distribution_id ?? "OK"}`);
-    printJson(result);
-  } catch (err) {
+    };
+    if (opts.dryRun) {
+      printDryRun("cap_table.distribute", payload);
+      return;
+    }
+    const result = await client.calculateDistribution(payload);
+    printWriteResult(result, `Distribution calculated: ${result.distribution_id ?? "OK"}`, opts.json);
+  } catch (err) {
     printError(`Failed to calculate distribution: ${err}`);
     process.exit(1);
   }
@@ -1816,18 +2440,56 @@ async function startRoundCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.startEquityRound({
+    const payload = {
       entity_id: eid,
       name: opts.name,
       issuer_legal_entity_id: opts.issuerLegalEntityId
-    });
-    printSuccess(`Round started: ${result.round_id ?? "OK"}`);
-    printJson(result);
+    };
+    if (opts.dryRun) {
+      printDryRun("cap_table.start_round", payload);
+      return;
+    }
+    const result = await client.startEquityRound(payload);
+    printWriteResult(result, `Round started: ${result.round_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to start round: ${err}`);
     process.exit(1);
   }
 }
+async function createInstrumentCommand(opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const eid = resolveEntityId(cfg, opts.entityId);
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    let issuerLegalEntityId = opts.issuerLegalEntityId;
+    if (!issuerLegalEntityId) {
+      const capTable = await client.getCapTable(eid);
+      issuerLegalEntityId = capTable.issuer_legal_entity_id;
+    }
+    if (!issuerLegalEntityId) {
+      throw new Error("No issuer legal entity found. Has this entity been formed with a cap table?");
+    }
+    const terms = opts.termsJson ? JSON.parse(opts.termsJson) : {};
+    const payload = {
+      entity_id: eid,
+      issuer_legal_entity_id: issuerLegalEntityId,
+      kind: opts.kind,
+      symbol: opts.symbol,
+      terms
+    };
+    if (opts.authorizedUnits != null) payload.authorized_units = opts.authorizedUnits;
+    if (opts.issuePriceCents != null) payload.issue_price_cents = opts.issuePriceCents;
+    if (opts.dryRun) {
+      printDryRun("cap_table.create_instrument", payload);
+      return;
+    }
+    const result = await client.createInstrument(payload);
+    printWriteResult(result, `Instrument created: ${result.instrument_id ?? "OK"}`, opts.json);
+  } catch (err) {
+    printError(`Failed to create instrument: ${err}`);
+    process.exit(1);
+  }
+}
 async function addSecurityCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
@@ -1843,9 +2505,12 @@ async function addSecurityCommand(opts) {
     if (opts.email) body.email = opts.email;
     if (opts.principalCents) body.principal_cents = opts.principalCents;
     if (opts.grantType) body.grant_type = opts.grantType;
+    if (opts.dryRun) {
+      printDryRun("cap_table.add_security", { round_id: opts.roundId, ...body });
+      return;
+    }
     const result = await client.addRoundSecurity(opts.roundId, body);
-    printSuccess(`Security added for ${opts.recipientName}`);
-    printJson(result);
+    printWriteResult(result, `Security added for ${opts.recipientName}`, opts.json);
   } catch (err) {
     printError(`Failed to add security: ${err}`);
     process.exit(1);
@@ -1856,9 +2521,25 @@ async function issueRoundCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.issueRound(opts.roundId, { entity_id: eid });
-    printSuccess("Round issued and closed");
-    printJson(result);
+    if (opts.dryRun) {
+      printDryRun("cap_table.issue_round", {
+        entity_id: eid,
+        round_id: opts.roundId,
+        meeting_id: opts.meetingId,
+        resolution_id: opts.resolutionId
+      });
+      return;
+    }
+    if ((!opts.meetingId || !opts.resolutionId) && await entityHasActiveBoard(client, eid)) {
+      throw new Error(
+        "Board approval is required before issuing this round. Pass --meeting-id and --resolution-id from a passed board vote."
+      );
+    }
+    const body = { entity_id: eid };
+    if (opts.meetingId) body.meeting_id = opts.meetingId;
+    if (opts.resolutionId) body.resolution_id = opts.resolutionId;
+    const result = await client.issueRound(opts.roundId, body);
+    printWriteResult(result, "Round issued and closed", opts.json);
   } catch (err) {
     printError(`Failed to issue round: ${err}`);
     process.exit(1);
@@ -1877,9 +2558,12 @@ async function createValuationCommand(opts) {
     };
     if (opts.fmv != null) body.fmv_per_share_cents = opts.fmv;
     if (opts.enterpriseValue != null) body.enterprise_value_cents = opts.enterpriseValue;
+    if (opts.dryRun) {
+      printDryRun("cap_table.create_valuation", body);
+      return;
+    }
     const result = await client.createValuation(body);
-    printSuccess(`Valuation created: ${result.valuation_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Valuation created: ${result.valuation_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to create valuation: ${err}`);
     process.exit(1);
@@ -1890,7 +2574,15 @@ async function submitValuationCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("cap_table.submit_valuation", { entity_id: eid, valuation_id: opts.valuationId });
+      return;
+    }
     const result = await client.submitValuationForApproval(opts.valuationId, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Valuation submitted for approval: ${result.valuation_id ?? "OK"}`);
     if (result.meeting_id) console.log(`  Meeting: ${result.meeting_id}`);
     if (result.agenda_item_id) console.log(`  Agenda Item: ${result.agenda_item_id}`);
@@ -1910,9 +2602,16 @@ async function approveValuationCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("cap_table.approve_valuation", {
+        entity_id: eid,
+        valuation_id: opts.valuationId,
+        resolution_id: opts.resolutionId
+      });
+      return;
+    }
     const result = await client.approveValuation(opts.valuationId, eid, opts.resolutionId);
-    printSuccess(`Valuation approved: ${result.valuation_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Valuation approved: ${result.valuation_id ?? "OK"}`, opts.json);
   } catch (err) {
     const msg = String(err);
     if (msg.includes("400")) {
@@ -1924,16 +2623,16 @@ async function approveValuationCommand(opts) {
   }
 }
 function print409a(data) {
-  console.log(chalk5.green("\u2500".repeat(40)));
-  console.log(chalk5.green.bold("  409A Valuation"));
-  console.log(chalk5.green("\u2500".repeat(40)));
+  console.log(chalk6.green("\u2500".repeat(40)));
+  console.log(chalk6.green.bold("  409A Valuation"));
+  console.log(chalk6.green("\u2500".repeat(40)));
   const fmv = typeof data.fmv_per_share_cents === "number" ? data.fmv_per_share_cents / 100 : data.fmv_per_share;
   const enterpriseValue = typeof data.enterprise_value_cents === "number" ? data.enterprise_value_cents / 100 : data.enterprise_value;
-  console.log(`  ${chalk5.bold("FMV/Share:")} $${fmv ?? "N/A"}`);
-  console.log(`  ${chalk5.bold("Enterprise Value:")} $${enterpriseValue ?? "N/A"}`);
-  console.log(`  ${chalk5.bold("Valuation Date:")} ${data.effective_date ?? data.valuation_date ?? "N/A"}`);
-  if (data.provider) console.log(`  ${chalk5.bold("Provider:")} ${data.provider}`);
-  console.log(chalk5.green("\u2500".repeat(40)));
+  console.log(`  ${chalk6.bold("FMV/Share:")} $${fmv ?? "N/A"}`);
+  console.log(`  ${chalk6.bold("Enterprise Value:")} $${enterpriseValue ?? "N/A"}`);
+  console.log(`  ${chalk6.bold("Valuation Date:")} ${data.effective_date ?? data.valuation_date ?? "N/A"}`);
+  if (data.provider) console.log(`  ${chalk6.bold("Provider:")} ${data.provider}`);
+  console.log(chalk6.green("\u2500".repeat(40)));
 }
 var init_cap_table = __esm({
   "src/commands/cap-table.ts"() {
@@ -1966,8 +2665,7 @@ async function financeInvoiceCommand(opts) {
       due_date: opts.dueDate,
       description: opts.description
     });
-    printSuccess(`Invoice created: ${result.invoice_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Invoice created: ${result.invoice_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to create invoice: ${err}`);
     process.exit(1);
@@ -1983,8 +2681,7 @@ async function financePayrollCommand(opts) {
       pay_period_start: opts.periodStart,
       pay_period_end: opts.periodEnd
     });
-    printSuccess(`Payroll run created: ${result.payroll_run_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Payroll run created: ${result.payroll_run_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to run payroll: ${err}`);
     process.exit(1);
@@ -2002,8 +2699,7 @@ async function financePayCommand(opts) {
       payment_method: opts.method,
       description: `Payment via ${opts.method}`
     });
-    printSuccess(`Payment submitted: ${result.payment_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Payment submitted: ${result.payment_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to submit payment: ${err}`);
     process.exit(1);
@@ -2015,8 +2711,7 @@ async function financeOpenAccountCommand(opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
     const result = await client.openBankAccount({ entity_id: eid, bank_name: opts.institution });
-    printSuccess(`Bank account opened: ${result.account_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Bank account opened: ${result.account_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to open bank account: ${err}`);
     process.exit(1);
@@ -2036,8 +2731,7 @@ async function financeClassifyContractorCommand(opts) {
       duration_months: opts.duration,
       provides_tools: opts.providesTools
     });
-    printSuccess(`Classification: ${result.risk_level ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Classification: ${result.risk_level ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to classify contractor: ${err}`);
     process.exit(1);
@@ -2053,8 +2747,7 @@ async function financeReconcileCommand(opts) {
       start_date: opts.startDate,
       end_date: opts.endDate
     });
-    printSuccess(`Ledger reconciled: ${result.reconciliation_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Ledger reconciled: ${result.reconciliation_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to reconcile ledger: ${err}`);
     process.exit(1);
@@ -2081,6 +2774,7 @@ __export(governance_exports, {
   governanceCreateBodyCommand: () => governanceCreateBodyCommand,
   governanceListCommand: () => governanceListCommand,
   governanceMeetingsCommand: () => governanceMeetingsCommand,
+  governanceOpenMeetingCommand: () => governanceOpenMeetingCommand,
   governanceResolutionsCommand: () => governanceResolutionsCommand,
   governanceSeatsCommand: () => governanceSeatsCommand,
   governanceVoteCommand: () => governanceVoteCommand,
@@ -2088,25 +2782,34 @@ __export(governance_exports, {
   sendNoticeCommand: () => sendNoticeCommand,
   writtenConsentCommand: () => writtenConsentCommand
 });
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 async function governanceCreateBodyCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.createGovernanceBody({
+    const payload = {
       entity_id: eid,
       body_type: opts.bodyType,
       name: opts.name,
       quorum_rule: opts.quorum,
       voting_method: opts.voting
-    });
+    };
+    if (opts.dryRun) {
+      printDryRun("governance.create_body", payload);
+      return;
+    }
+    const result = await client.createGovernanceBody(payload);
     const bodyId = result.body_id ?? "OK";
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Governance body created: ${bodyId}`);
     printJson(result);
-    console.log(chalk6.dim("\n  Next steps:"));
-    console.log(chalk6.dim(`    corp governance add-seat ${bodyId} --holder <contact-id>`));
-    console.log(chalk6.dim(`    corp governance seats ${bodyId}`));
+    console.log(chalk7.dim("\n  Next steps:"));
+    console.log(chalk7.dim(`    corp governance add-seat ${bodyId} --holder <contact-id>`));
+    console.log(chalk7.dim(`    corp governance seats ${bodyId}`));
   } catch (err) {
     printError(`Failed to create governance body: ${err}`);
     process.exit(1);
@@ -2118,7 +2821,15 @@ async function governanceAddSeatCommand(bodyId, opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
     const data = { holder_id: opts.holder, role: opts.role ?? "member" };
+    if (opts.dryRun) {
+      printDryRun("governance.add_seat", { entity_id: eid, body_id: bodyId, ...data });
+      return;
+    }
     const result = await client.createGovernanceSeat(bodyId, eid, data);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Seat added: ${result.seat_id ?? "OK"}`);
     printJson(result);
   } catch (err) {
@@ -2187,38 +2898,87 @@ async function governanceConveneCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.scheduleMeeting({
+    const payload = {
       entity_id: eid,
       body_id: opts.body,
       meeting_type: opts.meetingType,
       title: opts.title,
-      scheduled_date: opts.date,
       agenda_item_titles: opts.agenda
-    });
+    };
+    if (opts.date) payload.scheduled_date = opts.date;
+    if (opts.dryRun) {
+      printDryRun("governance.schedule_meeting", payload);
+      return;
+    }
+    const result = await client.scheduleMeeting(payload);
     const meetingId = result.meeting_id ?? "OK";
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Meeting scheduled: ${meetingId}`);
     printJson(result);
-    console.log(chalk6.dim("\n  Next steps:"));
-    console.log(chalk6.dim(`    corp governance notice ${meetingId}`));
-    console.log(chalk6.dim(`    corp governance agenda-items ${meetingId}`));
+    console.log(chalk7.dim("\n  Next steps:"));
+    console.log(chalk7.dim(`    corp governance notice ${meetingId}`));
+    console.log(chalk7.dim(`    corp governance open ${meetingId} --present-seat <seat-id>`));
+    console.log(chalk7.dim(`    corp governance agenda-items ${meetingId}`));
   } catch (err) {
     printError(`Failed to schedule meeting: ${err}`);
     process.exit(1);
   }
 }
+async function governanceOpenMeetingCommand(meetingId, opts) {
+  const cfg = requireConfig("api_url", "api_key", "workspace_id");
+  const eid = resolveEntityId(cfg, opts.entityId);
+  const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
+  try {
+    const payload = { present_seat_ids: opts.presentSeat };
+    if (opts.dryRun) {
+      printDryRun("governance.open_meeting", { entity_id: eid, meeting_id: meetingId, ...payload });
+      return;
+    }
+    const result = await client.conveneMeeting(meetingId, eid, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    printSuccess(`Meeting opened: ${meetingId}`);
+    printJson(result);
+  } catch (err) {
+    printError(`Failed to open meeting: ${err}`);
+    process.exit(1);
+  }
+}
 async function governanceVoteCommand(meetingId, itemId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.castVote(eid, meetingId, itemId, {
+    const payload = {
       voter_id: opts.voter,
       vote_value: opts.vote
-    });
+    };
+    if (opts.dryRun) {
+      printDryRun("governance.cast_vote", { entity_id: eid, meeting_id: meetingId, agenda_item_id: itemId, ...payload });
+      return;
+    }
+    const result = await client.castVote(eid, meetingId, itemId, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Vote cast: ${result.vote_id ?? "OK"}`);
     printJson(result);
   } catch (err) {
-    printError(`Failed to cast vote: ${err}`);
+    const message = String(err);
+    if (message.includes("voting session is not open")) {
+      printError(
+        `Failed to cast vote: ${err}
+  Open the meeting first: corp governance open ${meetingId} --present-seat <seat-id>`
+      );
+    } else {
+      printError(`Failed to cast vote: ${err}`);
+    }
     process.exit(1);
   }
 }
@@ -2227,7 +2987,15 @@ async function sendNoticeCommand(meetingId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("governance.send_notice", { entity_id: eid, meeting_id: meetingId });
+      return;
+    }
     const result = await client.sendNotice(meetingId, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Notice sent for meeting ${meetingId}`);
     printJson(result);
   } catch (err) {
@@ -2240,7 +3008,15 @@ async function adjournMeetingCommand(meetingId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("governance.adjourn_meeting", { entity_id: eid, meeting_id: meetingId });
+      return;
+    }
     const result = await client.adjournMeeting(meetingId, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Meeting ${meetingId} adjourned`);
     printJson(result);
   } catch (err) {
@@ -2253,7 +3029,15 @@ async function cancelMeetingCommand(meetingId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    if (opts.dryRun) {
+      printDryRun("governance.cancel_meeting", { entity_id: eid, meeting_id: meetingId });
+      return;
+    }
     const result = await client.cancelMeeting(meetingId, eid);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Meeting ${meetingId} cancelled`);
     printJson(result);
   } catch (err) {
@@ -2266,10 +3050,19 @@ async function finalizeAgendaItemCommand(meetingId, itemId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.finalizeAgendaItem(meetingId, itemId, {
+    const payload = {
       entity_id: eid,
       status: opts.status
-    });
+    };
+    if (opts.dryRun) {
+      printDryRun("governance.finalize_agenda_item", { meeting_id: meetingId, agenda_item_id: itemId, ...payload });
+      return;
+    }
+    const result = await client.finalizeAgendaItem(meetingId, itemId, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Agenda item ${itemId} finalized as ${opts.status}`);
     printJson(result);
   } catch (err) {
@@ -2282,9 +3075,23 @@ async function computeResolutionCommand(meetingId, itemId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.computeResolution(meetingId, itemId, eid, {
+    const payload = {
       resolution_text: opts.text
-    });
+    };
+    if (opts.dryRun) {
+      printDryRun("governance.compute_resolution", {
+        entity_id: eid,
+        meeting_id: meetingId,
+        agenda_item_id: itemId,
+        ...payload
+      });
+      return;
+    }
+    const result = await client.computeResolution(meetingId, itemId, eid, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Resolution computed for agenda item ${itemId}`);
     printJson(result);
   } catch (err) {
@@ -2297,18 +3104,27 @@ async function writtenConsentCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    const result = await client.writtenConsent({
+    const payload = {
       entity_id: eid,
       body_id: opts.body,
       title: opts.title,
       description: opts.description
-    });
+    };
+    if (opts.dryRun) {
+      printDryRun("governance.written_consent", payload);
+      return;
+    }
+    const result = await client.writtenConsent(payload);
     const meetingId = result.meeting_id ?? "OK";
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Written consent created: ${meetingId}`);
     printJson(result);
-    console.log(chalk6.dim("\n  Next steps:"));
-    console.log(chalk6.dim(`    corp governance agenda-items ${meetingId}`));
-    console.log(chalk6.dim(`    corp governance vote ${meetingId} <item-id> --voter <contact-uuid> --vote for`));
+    console.log(chalk7.dim("\n  Next steps:"));
+    console.log(chalk7.dim(`    corp governance agenda-items ${meetingId}`));
+    console.log(chalk7.dim(`    corp governance vote ${meetingId} <item-id> --voter <contact-uuid> --vote for`));
   } catch (err) {
     printError(`Failed to create written consent: ${err}`);
     process.exit(1);
@@ -2324,10 +3140,10 @@ async function listAgendaItemsCommand(meetingId, opts) {
     else if (items.length === 0) console.log("No agenda items found.");
     else {
       const Table4 = (await import("cli-table3")).default;
-      const chalk11 = (await import("chalk")).default;
+      const chalk13 = (await import("chalk")).default;
       console.log(`
-${chalk11.bold("Agenda Items")}`);
-      const table = new Table4({ head: [chalk11.dim("ID"), chalk11.dim("Title"), chalk11.dim("Status"), chalk11.dim("Type")] });
+${chalk13.bold("Agenda Items")}`);
+      const table = new Table4({ head: [chalk13.dim("ID"), chalk13.dim("Title"), chalk13.dim("Status"), chalk13.dim("Type")] });
       for (const item of items) {
         table.push([
           String(item.item_id ?? item.agenda_item_id ?? item.id ?? "").slice(0, 12),
@@ -2408,19 +3224,48 @@ async function documentsGenerateCommand(opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
+    const parameters = {};
+    if (opts.baseSalary) {
+      parameters.base_salary = opts.baseSalary;
+    }
+    for (const raw of opts.param ?? []) {
+      const idx = raw.indexOf("=");
+      if (idx <= 0) {
+        throw new Error(`Invalid --param value: ${raw}. Expected key=value.`);
+      }
+      const key = raw.slice(0, idx).trim();
+      const value = raw.slice(idx + 1).trim();
+      if (!key) {
+        throw new Error(`Invalid --param value: ${raw}. Expected key=value.`);
+      }
+      parameters[key] = coerceParamValue(value);
+    }
     const result = await client.generateContract({
       entity_id: eid,
       template_type: opts.template,
       counterparty_name: opts.counterparty,
-      effective_date: opts.effectiveDate ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 10)
+      effective_date: opts.effectiveDate ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
+      parameters
     });
-    printSuccess(`Contract generated: ${result.contract_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Contract generated: ${result.contract_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to generate contract: ${err}`);
     process.exit(1);
   }
 }
+function coerceParamValue(raw) {
+  if (raw === "true") return true;
+  if (raw === "false") return false;
+  if (/^-?\d+(\.\d+)?$/.test(raw)) return Number(raw);
+  if (raw.startsWith("{") && raw.endsWith("}") || raw.startsWith("[") && raw.endsWith("]")) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      return raw;
+    }
+  }
+  return raw;
+}
 async function documentsPreviewPdfCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
@@ -2463,8 +3308,7 @@ async function taxFileCommand(opts) {
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
     const result = await client.fileTaxDocument({ entity_id: eid, document_type: opts.type, tax_year: opts.year });
-    printSuccess(`Tax document filed: ${result.filing_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Tax document filed: ${result.filing_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to file tax document: ${err}`);
     process.exit(1);
@@ -2484,8 +3328,7 @@ async function taxDeadlineCommand(opts) {
     const recurrence = normalizeRecurrence(opts.recurrence);
     if (recurrence) payload.recurrence = recurrence;
     const result = await client.trackDeadline(payload);
-    printSuccess(`Deadline tracked: ${result.deadline_id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Deadline tracked: ${result.deadline_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to track deadline: ${err}`);
     process.exit(1);
@@ -2513,7 +3356,9 @@ __export(agents_exports, {
   agentsShowCommand: () => agentsShowCommand,
   agentsSkillCommand: () => agentsSkillCommand
 });
-import chalk7 from "chalk";
+import chalk8 from "chalk";
+import { readFileSync as readFileSync2, realpathSync } from "fs";
+import { relative, resolve } from "path";
 async function agentsListCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
@@ -2536,22 +3381,22 @@ async function agentsShowCommand(agentId, opts) {
       printJson(agent);
       return;
     }
-    console.log(chalk7.magenta("\u2500".repeat(40)));
-    console.log(chalk7.magenta.bold("  Agent Detail"));
-    console.log(chalk7.magenta("\u2500".repeat(40)));
-    console.log(`  ${chalk7.bold("Name:")} ${agent.name ?? "N/A"}`);
-    console.log(`  ${chalk7.bold("Status:")} ${agent.status ?? "N/A"}`);
-    console.log(`  ${chalk7.bold("Model:")} ${agent.model ?? "N/A"}`);
-    console.log(`  ${chalk7.bold("ID:")} ${agent.agent_id ?? "N/A"}`);
+    console.log(chalk8.magenta("\u2500".repeat(40)));
+    console.log(chalk8.magenta.bold("  Agent Detail"));
+    console.log(chalk8.magenta("\u2500".repeat(40)));
+    console.log(`  ${chalk8.bold("Name:")} ${agent.name ?? "N/A"}`);
+    console.log(`  ${chalk8.bold("Status:")} ${agent.status ?? "N/A"}`);
+    console.log(`  ${chalk8.bold("Model:")} ${agent.model ?? "N/A"}`);
+    console.log(`  ${chalk8.bold("ID:")} ${agent.agent_id ?? "N/A"}`);
     if (agent.system_prompt) {
       let prompt = String(agent.system_prompt);
       if (prompt.length > 100) prompt = prompt.slice(0, 97) + "...";
-      console.log(`  ${chalk7.bold("Prompt:")} ${prompt}`);
+      console.log(`  ${chalk8.bold("Prompt:")} ${prompt}`);
     }
     if (agent.skills && Array.isArray(agent.skills) && agent.skills.length > 0) {
-      console.log(`  ${chalk7.bold("Skills:")} ${agent.skills.map((s2) => s2.name ?? "?").join(", ")}`);
+      console.log(`  ${chalk8.bold("Skills:")} ${agent.skills.map((s2) => s2.name ?? "?").join(", ")}`);
     }
-    console.log(chalk7.magenta("\u2500".repeat(40)));
+    console.log(chalk8.magenta("\u2500".repeat(40)));
   } catch (err) {
     printError(`Failed to fetch agent: ${err}`);
     process.exit(1);
@@ -2564,52 +3409,78 @@ async function agentsCreateCommand(opts) {
     const data = { name: opts.name, system_prompt: opts.prompt };
     if (opts.model) data.model = opts.model;
     const result = await client.createAgent(data);
-    printSuccess(`Agent created: ${result.agent_id ?? result.id ?? "OK"}`);
-    printJson(result);
+    printWriteResult(result, `Agent created: ${result.agent_id ?? result.id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to create agent: ${err}`);
     process.exit(1);
   }
 }
-async function agentsPauseCommand(agentId) {
+async function agentsPauseCommand(agentId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    await client.updateAgent(agentId, { status: "paused" });
-    printSuccess(`Agent ${agentId} paused.`);
+    const result = await client.updateAgent(agentId, { status: "paused" });
+    printWriteResult(result, `Agent ${agentId} paused.`, opts.json);
   } catch (err) {
     printError(`Failed to pause agent: ${err}`);
     process.exit(1);
   }
 }
-async function agentsResumeCommand(agentId) {
+async function agentsResumeCommand(agentId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    await client.updateAgent(agentId, { status: "active" });
-    printSuccess(`Agent ${agentId} resumed.`);
+    const result = await client.updateAgent(agentId, { status: "active" });
+    printWriteResult(result, `Agent ${agentId} resumed.`, opts.json);
   } catch (err) {
     printError(`Failed to resume agent: ${err}`);
     process.exit(1);
   }
 }
-async function agentsDeleteCommand(agentId) {
+async function agentsDeleteCommand(agentId, opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    await client.deleteAgent(agentId);
-    printSuccess(`Agent ${agentId} deleted.`);
+    const result = await client.deleteAgent(agentId);
+    printWriteResult(result, `Agent ${agentId} deleted.`, opts.json);
   } catch (err) {
     printError(`Failed to delete agent: ${err}`);
     process.exit(1);
   }
 }
+function resolveTextInput(inlineText, filePath, label, required = false) {
+  if (inlineText && filePath) {
+    throw new Error(`Pass either --${label} or --${label}-file, not both.`);
+  }
+  if (filePath) {
+    if (process.env.CORP_ALLOW_UNSAFE_FILE_INPUT === "1") {
+      return readFileSync2(filePath, "utf8");
+    }
+    const resolvedFile = realpathSync(resolve(filePath));
+    const workingTreeRoot = realpathSync(process.cwd());
+    const rel = relative(workingTreeRoot, resolvedFile);
+    if (rel === "" || !rel.startsWith("..") && !rel.startsWith("/")) {
+      return readFileSync2(resolvedFile, "utf8");
+    }
+    throw new Error(
+      `--${label}-file must stay inside the current working directory unless CORP_ALLOW_UNSAFE_FILE_INPUT=1 is set.`
+    );
+  }
+  if (inlineText) {
+    return inlineText;
+  }
+  if (required) {
+    throw new Error(`Provide --${label} or --${label}-file.`);
+  }
+  return void 0;
+}
 async function agentsMessageCommand(agentId, 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.sendAgentMessage(agentId, opts.body);
-    printSuccess(`Message sent. Execution: ${result.execution_id ?? "OK"}`);
+    const body = resolveTextInput(opts.body, opts.bodyFile, "body", true);
+    const result = await client.sendAgentMessage(agentId, body);
+    printWriteResult(result, `Message sent. Execution: ${result.execution_id ?? "OK"}`, opts.json);
   } catch (err) {
     printError(`Failed to send message: ${err}`);
     process.exit(1);
@@ -2627,13 +3498,17 @@ async function agentsSkillCommand(agentId, 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 instructions = resolveTextInput(
+      opts.instructions,
+      opts.instructionsFile,
+      "instructions"
+    );
     const result = await client.addAgentSkill(agentId, {
       name: opts.name,
       description: opts.description,
-      parameters: opts.instructions ? { instructions: opts.instructions } : {}
+      parameters: instructions ? { instructions } : {}
     });
-    printSuccess(`Skill '${opts.name}' added to agent ${agentId}.`);
-    printJson(result);
+    printWriteResult(result, `Skill '${opts.name}' added to agent ${agentId}.`, opts.json);
   } catch (err) {
     printError(`Failed to add skill: ${err}`);
     process.exit(1);
@@ -2659,7 +3534,7 @@ __export(work_items_exports, {
   workItemsReleaseCommand: () => workItemsReleaseCommand,
   workItemsShowCommand: () => workItemsShowCommand
 });
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 async function workItemsListCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
   const eid = resolveEntityId(cfg, opts.entityId);
@@ -2687,24 +3562,24 @@ async function workItemsShowCommand(workItemId, opts) {
       printJson(w);
       return;
     }
-    console.log(chalk8.cyan("\u2500".repeat(40)));
-    console.log(chalk8.cyan.bold("  Work Item Detail"));
-    console.log(chalk8.cyan("\u2500".repeat(40)));
-    console.log(`  ${chalk8.bold("Title:")} ${w.title ?? "N/A"}`);
-    console.log(`  ${chalk8.bold("Category:")} ${w.category ?? "N/A"}`);
-    console.log(`  ${chalk8.bold("Status:")} ${w.effective_status ?? w.status ?? "N/A"}`);
-    if (w.description) console.log(`  ${chalk8.bold("Description:")} ${w.description}`);
-    if (w.deadline) console.log(`  ${chalk8.bold("Deadline:")} ${w.deadline}`);
-    if (w.asap) console.log(`  ${chalk8.bold("Priority:")} ${chalk8.red.bold("ASAP")}`);
-    if (w.claimed_by) console.log(`  ${chalk8.bold("Claimed by:")} ${w.claimed_by}`);
-    if (w.claimed_at) console.log(`  ${chalk8.bold("Claimed at:")} ${w.claimed_at}`);
-    if (w.claim_ttl_seconds) console.log(`  ${chalk8.bold("Claim TTL:")} ${w.claim_ttl_seconds}s`);
-    if (w.completed_by) console.log(`  ${chalk8.bold("Completed by:")} ${w.completed_by}`);
-    if (w.completed_at) console.log(`  ${chalk8.bold("Completed at:")} ${w.completed_at}`);
-    if (w.result) console.log(`  ${chalk8.bold("Result:")} ${w.result}`);
-    if (w.created_by) console.log(`  ${chalk8.bold("Created by:")} ${w.created_by}`);
-    console.log(`  ${chalk8.bold("Created at:")} ${w.created_at ?? "N/A"}`);
-    console.log(chalk8.cyan("\u2500".repeat(40)));
+    console.log(chalk9.cyan("\u2500".repeat(40)));
+    console.log(chalk9.cyan.bold("  Work Item Detail"));
+    console.log(chalk9.cyan("\u2500".repeat(40)));
+    console.log(`  ${chalk9.bold("Title:")} ${w.title ?? "N/A"}`);
+    console.log(`  ${chalk9.bold("Category:")} ${w.category ?? "N/A"}`);
+    console.log(`  ${chalk9.bold("Status:")} ${w.effective_status ?? w.status ?? "N/A"}`);
+    if (w.description) console.log(`  ${chalk9.bold("Description:")} ${w.description}`);
+    if (w.deadline) console.log(`  ${chalk9.bold("Deadline:")} ${w.deadline}`);
+    if (w.asap) console.log(`  ${chalk9.bold("Priority:")} ${chalk9.red.bold("ASAP")}`);
+    if (w.claimed_by) console.log(`  ${chalk9.bold("Claimed by:")} ${w.claimed_by}`);
+    if (w.claimed_at) console.log(`  ${chalk9.bold("Claimed at:")} ${w.claimed_at}`);
+    if (w.claim_ttl_seconds) console.log(`  ${chalk9.bold("Claim TTL:")} ${w.claim_ttl_seconds}s`);
+    if (w.completed_by) console.log(`  ${chalk9.bold("Completed by:")} ${w.completed_by}`);
+    if (w.completed_at) console.log(`  ${chalk9.bold("Completed at:")} ${w.completed_at}`);
+    if (w.result) console.log(`  ${chalk9.bold("Result:")} ${w.result}`);
+    if (w.created_by) console.log(`  ${chalk9.bold("Created by:")} ${w.created_by}`);
+    console.log(`  ${chalk9.bold("Created at:")} ${w.created_at ?? "N/A"}`);
+    console.log(chalk9.cyan("\u2500".repeat(40)));
   } catch (err) {
     printError(`Failed to fetch work item: ${err}`);
     process.exit(1);
@@ -2725,7 +3600,11 @@ async function workItemsCreateCommand(opts) {
     if (opts.asap) data.asap = true;
     if (opts.createdBy) data.created_by = opts.createdBy;
     const result = await client.createWorkItem(eid, data);
-    printSuccess(`Work item created: ${result.work_item_id ?? result.id ?? "OK"}`);
+    printWriteResult(
+      result,
+      `Work item created: ${result.work_item_id ?? result.id ?? "OK"}`,
+      opts.json
+    );
   } catch (err) {
     printError(`Failed to create work item: ${err}`);
     process.exit(1);
@@ -2738,8 +3617,8 @@ async function workItemsClaimCommand(workItemId, opts) {
   try {
     const data = { claimed_by: opts.claimedBy };
     if (opts.ttl != null) data.ttl_seconds = opts.ttl;
-    await client.claimWorkItem(eid, workItemId, data);
-    printSuccess(`Work item ${workItemId} claimed by ${opts.claimedBy}.`);
+    const result = await client.claimWorkItem(eid, workItemId, data);
+    printWriteResult(result, `Work item ${workItemId} claimed by ${opts.claimedBy}.`, opts.json);
   } catch (err) {
     printError(`Failed to claim work item: ${err}`);
     process.exit(1);
@@ -2752,8 +3631,8 @@ async function workItemsCompleteCommand(workItemId, opts) {
   try {
     const data = { completed_by: opts.completedBy };
     if (opts.result) data.result = opts.result;
-    await client.completeWorkItem(eid, workItemId, data);
-    printSuccess(`Work item ${workItemId} completed.`);
+    const result = await client.completeWorkItem(eid, workItemId, data);
+    printWriteResult(result, `Work item ${workItemId} completed.`, opts.json);
   } catch (err) {
     printError(`Failed to complete work item: ${err}`);
     process.exit(1);
@@ -2764,8 +3643,8 @@ async function workItemsReleaseCommand(workItemId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    await client.releaseWorkItem(eid, workItemId);
-    printSuccess(`Work item ${workItemId} claim released.`);
+    const result = await client.releaseWorkItem(eid, workItemId);
+    printWriteResult(result, `Work item ${workItemId} claim released.`, opts.json);
   } catch (err) {
     printError(`Failed to release work item: ${err}`);
     process.exit(1);
@@ -2776,8 +3655,8 @@ async function workItemsCancelCommand(workItemId, opts) {
   const eid = resolveEntityId(cfg, opts.entityId);
   const client = new CorpAPIClient(cfg.api_url, cfg.api_key, cfg.workspace_id);
   try {
-    await client.cancelWorkItem(eid, workItemId);
-    printSuccess(`Work item ${workItemId} cancelled.`);
+    const result = await client.cancelWorkItem(eid, workItemId);
+    printWriteResult(result, `Work item ${workItemId} cancelled.`, opts.json);
   } catch (err) {
     printError(`Failed to cancel work item: ${err}`);
     process.exit(1);
@@ -2877,17 +3756,148 @@ __export(form_exports, {
   formFinalizeCommand: () => formFinalizeCommand
 });
 import { input as input2, select, confirm as confirm2, number } from "@inquirer/prompts";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import Table2 from "cli-table3";
+import { readFileSync as readFileSync3 } from "fs";
 import { OfficerTitle } from "@thecorporation/corp-tools";
 function isCorp(entityType) {
   return entityType === "c_corp" || entityType === "s_corp" || entityType === "corporation";
 }
 function sectionHeader(title) {
   console.log();
-  console.log(chalk9.blue("\u2500".repeat(50)));
-  console.log(chalk9.blue.bold(`  ${title}`));
-  console.log(chalk9.blue("\u2500".repeat(50)));
+  console.log(chalk10.blue("\u2500".repeat(50)));
+  console.log(chalk10.blue.bold(`  ${title}`));
+  console.log(chalk10.blue("\u2500".repeat(50)));
+}
+function officerTitleLabel(title) {
+  switch (title) {
+    case "ceo":
+      return "CEO";
+    case "cfo":
+      return "CFO";
+    case "cto":
+      return "CTO";
+    case "coo":
+      return "COO";
+    case "vp":
+      return "VP";
+    default:
+      return title.charAt(0).toUpperCase() + title.slice(1);
+  }
+}
+function parseBoolean(value) {
+  if (typeof value === "boolean") return value;
+  if (typeof value !== "string") return void 0;
+  if (value === "true") return true;
+  if (value === "false") return false;
+  return void 0;
+}
+function parseAddressValue(raw) {
+  if (!raw) return void 0;
+  if (typeof raw === "string") {
+    const parts = raw.split("|").map((part) => part.trim());
+    if (parts.length === 4) {
+      return { street: parts[0], city: parts[1], state: parts[2], zip: parts[3] };
+    }
+    throw new Error(`Invalid founder address: ${raw}. Expected street|city|state|zip.`);
+  }
+  if (typeof raw === "object" && raw !== null) {
+    const value = raw;
+    if (typeof value.street === "string" && typeof value.city === "string" && typeof value.state === "string" && typeof value.zip === "string") {
+      return {
+        street: value.street,
+        street2: typeof value.street2 === "string" ? value.street2 : void 0,
+        city: value.city,
+        state: value.state,
+        zip: value.zip
+      };
+    }
+  }
+  throw new Error("Founder address must be an object or street|city|state|zip string.");
+}
+function normalizeFounderInfo(input3) {
+  const name = typeof input3.name === "string" ? input3.name.trim() : "";
+  const email = typeof input3.email === "string" ? input3.email.trim() : "";
+  const role = typeof input3.role === "string" ? input3.role.trim() : "";
+  if (!name || !email || !role) {
+    throw new Error("Founder JSON requires non-empty name, email, and role.");
+  }
+  const founder = { name, email, role };
+  const ownershipPct = input3.ownership_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);
+  if (typeof input3.officer_title === "string") founder.officer_title = input3.officer_title;
+  const incorporator = parseBoolean(input3.is_incorporator ?? input3.incorporator);
+  if (incorporator !== void 0) founder.is_incorporator = incorporator;
+  if (input3.address != null) founder.address = parseAddressValue(input3.address);
+  if (typeof input3.ip_description === "string") founder.ip_description = input3.ip_description;
+  if (input3.vesting && typeof input3.vesting === "object") {
+    const vesting = input3.vesting;
+    if (vesting.total_months != null && vesting.cliff_months != null) {
+      founder.vesting = {
+        total_months: Number(vesting.total_months),
+        cliff_months: Number(vesting.cliff_months),
+        acceleration: typeof vesting.acceleration === "string" ? vesting.acceleration : void 0
+      };
+    }
+  }
+  return founder;
+}
+function parseLegacyMemberSpec(raw) {
+  const parts = raw.split(",").map((p) => p.trim());
+  if (parts.length < 3) {
+    throw new Error(
+      `Invalid member format: ${raw}. Expected: name,email,role[,pct[,address[,officer_title[,is_incorporator]]]]`
+    );
+  }
+  const founder = { name: parts[0], email: parts[1], role: parts[2] };
+  if (parts.length >= 4) founder.ownership_pct = parseFloat(parts[3]);
+  if (parts.length >= 5 && parts[4]) founder.address = parseAddressValue(parts[4]);
+  if (parts.length >= 6 && parts[5]) founder.officer_title = parts[5];
+  if (parts.length >= 7) {
+    const incorporator = parseBoolean(parts[6]);
+    if (incorporator !== void 0) founder.is_incorporator = incorporator;
+  }
+  return founder;
+}
+function parseKeyValueMemberSpec(raw) {
+  const parsed = {};
+  for (const segment of raw.split(",")) {
+    const [key, ...rest] = segment.split("=");
+    if (!key || rest.length === 0) {
+      throw new Error(`Invalid member format: ${raw}. Expected key=value pairs.`);
+    }
+    parsed[key.trim()] = rest.join("=").trim();
+  }
+  return normalizeFounderInfo(parsed);
+}
+function parseScriptedFounders(opts) {
+  const founders = [];
+  for (const raw of opts.member ?? []) {
+    founders.push(raw.includes("=") ? parseKeyValueMemberSpec(raw) : parseLegacyMemberSpec(raw));
+  }
+  for (const raw of opts.memberJson ?? []) {
+    founders.push(normalizeFounderInfo(JSON.parse(raw)));
+  }
+  if (opts.membersFile) {
+    const parsed = JSON.parse(readFileSync3(opts.membersFile, "utf8"));
+    let entries;
+    if (Array.isArray(parsed)) {
+      entries = parsed;
+    } else if (typeof parsed === "object" && parsed !== null && "members" in parsed && Array.isArray(parsed.members)) {
+      entries = parsed.members;
+    } else {
+      throw new Error('members file must be a JSON array or {"members": [...]}');
+    }
+    for (const entry of entries) {
+      if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
+        throw new Error("each founder entry must be a JSON object");
+      }
+      founders.push(normalizeFounderInfo(entry));
+    }
+  }
+  return founders;
 }
 async function promptAddress() {
   const street = await input2({ message: "    Street address" });
@@ -2953,21 +3963,16 @@ async function phasePeople(opts, entityType, scripted) {
   if (!scripted) sectionHeader("Phase 2: Founders & Officers");
   const founders = [];
   if (scripted) {
-    for (const m of opts.member) {
-      const parts = m.split(",").map((p) => p.trim());
-      if (parts.length < 3) {
-        printError(`Invalid member format: ${m}. Expected: name,email,role[,pct]`);
-        process.exit(1);
-      }
-      const f = { name: parts[0], email: parts[1], role: parts[2] };
-      if (parts.length >= 4) f.ownership_pct = parseFloat(parts[3]);
-      founders.push(f);
+    try {
+      return parseScriptedFounders(opts);
+    } catch (err) {
+      printError(String(err));
+      process.exit(1);
     }
-    return founders;
   }
   const founderCount = await number({ message: "Number of founders (1-6)", default: 1 }) ?? 1;
   for (let i = 0; i < founderCount; i++) {
-    console.log(chalk9.dim(`
+    console.log(chalk10.dim(`
   Founder ${i + 1} of ${founderCount}:`));
     const name = await input2({ message: `  Name` });
     const email = await input2({ message: `  Email` });
@@ -2992,7 +3997,7 @@ async function phasePeople(opts, entityType, scripted) {
           message: "  Officer title",
           choices: OfficerTitle.map((t) => ({
             value: t,
-            name: t === "ceo" ? "CEO" : t === "cfo" ? "CFO" : t === "vp" ? "VP" : t.charAt(0).toUpperCase() + t.slice(1)
+            name: officerTitleLabel(t)
           }))
         });
       }
@@ -3013,7 +4018,7 @@ async function phaseStock(opts, entityType, founders, scripted) {
   const rofr = opts.rofr ?? (!scripted && isCorp(entityType) ? await confirm2({ message: "Right of first refusal?", default: true }) : isCorp(entityType));
   if (!scripted) {
     for (const f of founders) {
-      console.log(chalk9.dim(`
+      console.log(chalk10.dim(`
   Equity for ${f.name}:`));
       if (isCorp(entityType)) {
         const shares = await number({ message: `  Shares to purchase`, default: 0 });
@@ -3059,17 +4064,17 @@ async function phaseStock(opts, entityType, founders, scripted) {
 }
 function printSummary(entityType, name, jurisdiction, fiscalYearEnd, sCorpElection, founders, transferRestrictions, rofr) {
   sectionHeader("Formation Summary");
-  console.log(`  ${chalk9.bold("Entity:")} ${name}`);
-  console.log(`  ${chalk9.bold("Type:")} ${entityType}`);
-  console.log(`  ${chalk9.bold("Jurisdiction:")} ${jurisdiction}`);
-  console.log(`  ${chalk9.bold("Fiscal Year End:")} ${fiscalYearEnd}`);
+  console.log(`  ${chalk10.bold("Entity:")} ${name}`);
+  console.log(`  ${chalk10.bold("Type:")} ${entityType}`);
+  console.log(`  ${chalk10.bold("Jurisdiction:")} ${jurisdiction}`);
+  console.log(`  ${chalk10.bold("Fiscal Year End:")} ${fiscalYearEnd}`);
   if (isCorp(entityType)) {
-    console.log(`  ${chalk9.bold("S-Corp Election:")} ${sCorpElection ? "Yes" : "No"}`);
-    console.log(`  ${chalk9.bold("Transfer Restrictions:")} ${transferRestrictions ? "Yes" : "No"}`);
-    console.log(`  ${chalk9.bold("Right of First Refusal:")} ${rofr ? "Yes" : "No"}`);
+    console.log(`  ${chalk10.bold("S-Corp Election:")} ${sCorpElection ? "Yes" : "No"}`);
+    console.log(`  ${chalk10.bold("Transfer Restrictions:")} ${transferRestrictions ? "Yes" : "No"}`);
+    console.log(`  ${chalk10.bold("Right of First Refusal:")} ${rofr ? "Yes" : "No"}`);
   }
   const table = new Table2({
-    head: [chalk9.dim("Name"), chalk9.dim("Email"), chalk9.dim("Role"), chalk9.dim("Equity"), chalk9.dim("Officer")]
+    head: [chalk10.dim("Name"), chalk10.dim("Email"), chalk10.dim("Role"), chalk10.dim("Equity"), chalk10.dim("Officer")]
   });
   for (const f of founders) {
     const equity = f.shares_purchased ? `${f.shares_purchased.toLocaleString()} shares` : f.ownership_pct ? `${f.ownership_pct}%` : "\u2014";
@@ -3086,14 +4091,16 @@ async function formCommand(opts) {
       serverCfg = await client.getConfig();
     } catch {
     }
-    const scripted = !!(opts.member && opts.member.length > 0);
+    const scripted = Boolean(
+      opts.member && opts.member.length > 0 || opts.memberJson && opts.memberJson.length > 0 || opts.membersFile
+    );
     const { entityType, name, jurisdiction, companyAddress, fiscalYearEnd, sCorpElection } = await phaseEntityDetails(opts, serverCfg, scripted);
     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 });
     if (!shouldProceed) {
-      console.log(chalk9.yellow("Formation cancelled."));
+      console.log(chalk10.yellow("Formation cancelled."));
       return;
     }
     const members = founders.map((f) => {
@@ -3124,7 +4131,15 @@ async function formCommand(opts) {
       right_of_first_refusal: rofr
     };
     if (companyAddress) payload.company_address = companyAddress;
+    if (opts.dryRun) {
+      printDryRun("formation.create_with_cap_table", payload);
+      return;
+    }
     const result = await client.createFormationWithCapTable(payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Formation created: ${result.formation_id ?? "OK"}`);
     if (result.entity_id) console.log(`  Entity ID: ${result.entity_id}`);
     if (result.legal_entity_id) console.log(`  Legal Entity ID: ${result.legal_entity_id}`);
@@ -3137,17 +4152,17 @@ async function formCommand(opts) {
     if (holders.length > 0) {
       console.log();
       const table = new Table2({
-        head: [chalk9.dim("Holder"), chalk9.dim("Shares"), chalk9.dim("Ownership %")]
+        head: [chalk10.dim("Holder"), chalk10.dim("Shares"), chalk10.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(chalk9.bold("  Cap Table:"));
+      console.log(chalk10.bold("  Cap Table:"));
       console.log(table.toString());
     }
     if (result.next_action) {
-      console.log(chalk9.yellow(`
+      console.log(chalk10.yellow(`
   Next: ${result.next_action}`));
     }
   } catch (err) {
@@ -3183,13 +4198,21 @@ async function formCreateCommand(opts) {
     if (opts.rofr !== void 0) payload.right_of_first_refusal = opts.rofr;
     const companyAddress = parseCsvAddress(opts.companyAddress);
     if (companyAddress) payload.company_address = companyAddress;
+    if (opts.dryRun) {
+      printDryRun("formation.create_pending", payload);
+      return;
+    }
     const result = await client.createPendingEntity(payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Pending entity created: ${result.entity_id}`);
     console.log(`  Name: ${result.legal_name}`);
     console.log(`  Type: ${result.entity_type}`);
     console.log(`  Jurisdiction: ${result.jurisdiction}`);
     console.log(`  Status: ${result.formation_status}`);
-    console.log(chalk9.yellow(`
+    console.log(chalk10.yellow(`
   Next: corp form add-founder ${result.entity_id} --name "..." --email "..." --role member --pct 50`));
   } catch (err) {
     printError(`Failed to create pending entity: ${err}`);
@@ -3210,14 +4233,22 @@ async function formAddFounderCommand(entityId, opts) {
     if (opts.incorporator) payload.is_incorporator = true;
     const address = parseCsvAddress(opts.address);
     if (address) payload.address = address;
+    if (opts.dryRun) {
+      printDryRun("formation.add_founder", { entity_id: entityId, ...payload });
+      return;
+    }
     const result = await client.addFounder(entityId, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Founder added (${result.member_count} total)`);
     const members = result.members ?? [];
     for (const m of members) {
       const pct = typeof m.ownership_pct === "number" ? ` (${m.ownership_pct}%)` : "";
       console.log(`  - ${m.name} <${m.email ?? "no email"}> [${m.role ?? "member"}]${pct}`);
     }
-    console.log(chalk9.yellow(`
+    console.log(chalk10.yellow(`
   Next: add more founders or run: corp form finalize ${entityId}`));
   } catch (err) {
     printError(`Failed to add founder: ${err}`);
@@ -3237,6 +4268,14 @@ async function formFinalizeCommand(entityId, opts) {
       payload.authorized_shares = authorizedShares;
     }
     if (opts.parValue) payload.par_value = opts.parValue;
+    if (opts.boardSize) {
+      const boardSize = parseInt(opts.boardSize, 10);
+      if (!Number.isFinite(boardSize) || boardSize <= 0) {
+        throw new Error(`Invalid board size: ${opts.boardSize}`);
+      }
+      payload.board_size = boardSize;
+    }
+    if (opts.principalName) payload.principal_name = opts.principalName;
     if (opts.registeredAgentName) payload.registered_agent_name = opts.registeredAgentName;
     if (opts.registeredAgentAddress) payload.registered_agent_address = opts.registeredAgentAddress;
     if (opts.formationDate) payload.formation_date = opts.formationDate;
@@ -3246,7 +4285,17 @@ async function formFinalizeCommand(entityId, opts) {
     if (opts.rofr !== void 0) payload.right_of_first_refusal = opts.rofr;
     const companyAddress = parseCsvAddress(opts.companyAddress);
     if (companyAddress) payload.company_address = companyAddress;
+    if (opts.incorporatorName) payload.incorporator_name = opts.incorporatorName;
+    if (opts.incorporatorAddress) payload.incorporator_address = opts.incorporatorAddress;
+    if (opts.dryRun) {
+      printDryRun("formation.finalize", { entity_id: entityId, ...payload });
+      return;
+    }
     const result = await client.finalizeFormation(entityId, payload);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
     printSuccess(`Formation finalized: ${result.entity_id}`);
     if (result.legal_entity_id) console.log(`  Legal Entity ID: ${result.legal_entity_id}`);
     if (result.instrument_id) console.log(`  Instrument ID: ${result.instrument_id}`);
@@ -3258,17 +4307,17 @@ async function formFinalizeCommand(entityId, opts) {
     if (holders.length > 0) {
       console.log();
       const table = new Table2({
-        head: [chalk9.dim("Holder"), chalk9.dim("Shares"), chalk9.dim("Ownership %")]
+        head: [chalk10.dim("Holder"), chalk10.dim("Shares"), chalk10.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(chalk9.bold("  Cap Table:"));
+      console.log(chalk10.bold("  Cap Table:"));
       console.log(table.toString());
     }
     if (result.next_action) {
-      console.log(chalk9.yellow(`
+      console.log(chalk10.yellow(`
   Next: ${result.next_action}`));
     }
   } catch (err) {
@@ -3290,7 +4339,7 @@ var api_keys_exports = {};
 __export(api_keys_exports, {
   apiKeysCommand: () => apiKeysCommand
 });
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import Table3 from "cli-table3";
 async function apiKeysCommand(opts) {
   const cfg = requireConfig("api_url", "api_key", "workspace_id");
@@ -3310,9 +4359,9 @@ async function apiKeysCommand(opts) {
       return;
     }
     console.log(`
-${chalk10.bold("API Keys")}`);
+${chalk11.bold("API Keys")}`);
     const table = new Table3({
-      head: [chalk10.dim("ID"), chalk10.dim("Name"), chalk10.dim("Key"), chalk10.dim("Created")]
+      head: [chalk11.dim("ID"), chalk11.dim("Name"), chalk11.dim("Key"), chalk11.dim("Created")]
     });
     for (const k of keys) {
       table.push([
@@ -3364,13 +4413,54 @@ var init_demo = __esm({
   }
 });
 
+// src/commands/feedback.ts
+var feedback_exports = {};
+__export(feedback_exports, {
+  feedbackCommand: () => feedbackCommand
+});
+import chalk12 from "chalk";
+async function feedbackCommand(message, opts) {
+  if (!message || message.trim().length === 0) {
+    printError("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})`);
+    process.exit(1);
+  }
+  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.submitFeedback(message, opts.category, opts.email);
+    if (opts.json) {
+      printJson(result);
+      return;
+    }
+    console.log(`
+${chalk12.green("\u2713")} Feedback submitted (${chalk12.dim(result.feedback_id)})`);
+  } catch (err) {
+    printError("Failed to submit feedback", err);
+    process.exit(1);
+  }
+}
+var MAX_FEEDBACK_LENGTH;
+var init_feedback = __esm({
+  "src/commands/feedback.ts"() {
+    "use strict";
+    init_config();
+    init_api_client();
+    init_output();
+    MAX_FEEDBACK_LENGTH = 1e4;
+  }
+});
+
 // src/commands/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
   serveCommand: () => serveCommand
 });
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "fs";
-import { resolve } from "path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "fs";
+import { resolve as resolve2 } from "path";
 import { randomBytes } from "crypto";
 function generateFernetKey() {
   return randomBytes(32).toString("base64url") + "=";
@@ -3380,7 +4470,7 @@ function generateSecret(length = 32) {
 }
 function loadEnvFile(path) {
   if (!existsSync2(path)) return;
-  const content = readFileSync2(path, "utf-8");
+  const content = readFileSync4(path, "utf-8");
   for (const line of content.split("\n")) {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
@@ -3422,35 +4512,21 @@ async function serveCommand(opts) {
     console.error(`Error: Invalid port "${opts.port}"`);
     process.exit(1);
   }
-  const envPath = resolve(process.cwd(), ".env");
+  const envPath = resolve2(process.cwd(), ".env");
   ensureEnvFile(envPath);
   loadEnvFile(envPath);
   const localUrl = `http://localhost:${port}`;
-  const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config(), config_exports));
-  const cfg = loadConfig2();
-  const previousUrl = cfg.api_url;
-  if (cfg.api_url !== localUrl) {
-    cfg.api_url = localUrl;
-    saveConfig2(cfg);
-    console.log(`CLI configured to use local server: ${localUrl}`);
-    console.log(`  (previous: ${previousUrl})`);
-    console.log(`  To revert: corp config set api_url ${previousUrl}
-`);
-  }
   console.log(`Starting server on port ${port}...`);
   console.log(`Data directory: ${opts.dataDir}`);
+  console.log(`CLI API URL remains unchanged.`);
+  console.log(`  Use CORP_API_URL=${localUrl} for commands against this local server.
+`);
   const child = server.startServer({
     port,
     dataDir: opts.dataDir
   });
   const shutdown = () => {
     console.log("\nShutting down server...");
-    if (previousUrl !== localUrl) {
-      const current = loadConfig2();
-      current.api_url = previousUrl;
-      saveConfig2(current);
-      console.log(`CLI restored to: ${previousUrl}`);
-    }
     child.kill("SIGTERM");
   };
   process.on("SIGINT", shutdown);
@@ -3508,34 +4584,61 @@ function inheritOption(localValue, parentValue) {
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
+var TAX_DOCUMENT_TYPE_CHOICES = [
+  "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"
+];
 var program = new Command();
 program.name("corp").description("corp \u2014 Corporate governance from the terminal").version(pkg.version);
 program.command("setup").description("Interactive setup wizard").action(async () => {
   const { setupCommand: setupCommand2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
   await setupCommand2();
 });
-program.command("status").description("Workspace summary").action(async () => {
+program.command("status").description("Workspace summary").option("--json", "Output as JSON").action(async (opts) => {
   const { statusCommand: statusCommand2 } = await Promise.resolve().then(() => (init_status(), status_exports));
-  await statusCommand2();
+  await statusCommand2(opts);
+});
+program.command("context").alias("whoami").description("Show the active workspace, user, and entity context").option("--json", "Output as JSON").action(async (opts) => {
+  const { contextCommand: contextCommand2 } = await Promise.resolve().then(() => (init_context(), context_exports));
+  await contextCommand2(opts);
+});
+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);
 });
 var configCmd = program.command("config").description("Manage configuration");
-configCmd.command("set <key> <value>").description("Set a config value (dot-path)").action(async (key, value) => {
-  const { configSetCommand: configSetCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports2));
-  configSetCommand2(key, value);
+configCmd.command("set <key> <value>").description("Set a config value (dot-path)").option("--force", "Allow updating a security-sensitive config key").action(async (key, value, opts) => {
+  const { configSetCommand: configSetCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
+  configSetCommand2(key, value, opts);
 });
 configCmd.command("get <key>").description("Get a config value (dot-path)").action(async (key) => {
-  const { configGetCommand: configGetCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports2));
+  const { configGetCommand: configGetCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
   configGetCommand2(key);
 });
 configCmd.command("list").description("List all config (API keys masked)").action(async () => {
-  const { configListCommand: configListCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports2));
+  const { configListCommand: configListCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
   configListCommand2();
 });
 program.command("obligations").description("List obligations with urgency tiers").option("--tier <tier>", "Filter by urgency tier").option("--json", "Output as JSON").action(async (opts) => {
   const { obligationsCommand: obligationsCommand2 } = await Promise.resolve().then(() => (init_obligations(), obligations_exports));
   await obligationsCommand2(opts);
 });
-program.command("digest").description("View or trigger daily digests").option("--trigger", "Trigger digest now").option("--key <key>", "Get specific digest by key").action(async (opts) => {
+program.command("digest").description("View or trigger daily digests").option("--trigger", "Trigger digest now").option("--key <key>", "Get specific digest by key").option("--json", "Output as JSON").action(async (opts) => {
   const { digestCommand: digestCommand2 } = await Promise.resolve().then(() => (init_digest(), digest_exports));
   await digestCommand2(opts);
 });
@@ -3584,15 +4687,23 @@ contactsCmd.command("show <contact-id>").option("--json", "Output as JSON").desc
     json: inheritOption(opts.json, parent.json)
   });
 });
-contactsCmd.command("add").requiredOption("--name <name>", "Contact name").requiredOption("--email <email>", "Contact email").option("--type <type>", "Contact type (individual, organization)", "individual").option("--category <category>", "Category (employee, contractor, board_member, investor, law_firm, valuation_firm, accounting_firm, officer, founder, member, other)").option("--phone <phone>", "Phone number").option("--notes <notes>", "Notes").description("Add a new contact").action(async (opts, cmd) => {
+contactsCmd.command("add").requiredOption("--name <name>", "Contact name").requiredOption("--email <email>", "Contact email").option("--type <type>", "Contact type (individual, organization)", "individual").option("--category <category>", "Category (employee, contractor, board_member, investor, law_firm, valuation_firm, accounting_firm, officer, founder, member, other)").option("--cap-table-access <level>", "Cap table access (none, summary, detailed)").option("--address <address>", "Mailing address").option("--mailing-address <address>", "Alias for --address").option("--phone <phone>", "Phone number").option("--notes <notes>", "Notes").option("--json", "Output as JSON").description("Add a new contact").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { contactsAddCommand: contactsAddCommand2 } = await Promise.resolve().then(() => (init_contacts(), contacts_exports));
-  await contactsAddCommand2({ ...opts, entityId: parent.entityId });
+  await contactsAddCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-contactsCmd.command("edit <contact-id>").option("--name <name>", "Contact name").option("--email <email>", "Contact email").option("--category <category>", "Contact category").option("--phone <phone>", "Phone number").option("--notes <notes>", "Notes").description("Edit an existing contact").action(async (contactId, opts, cmd) => {
+contactsCmd.command("edit <contact-id>").option("--name <name>", "Contact name").option("--email <email>", "Contact email").option("--category <category>", "Contact category").option("--cap-table-access <level>", "Cap table access (none, summary, detailed)").option("--address <address>", "Mailing address").option("--mailing-address <address>", "Alias for --address").option("--phone <phone>", "Phone number").option("--notes <notes>", "Notes").option("--json", "Output as JSON").description("Edit an existing contact").action(async (contactId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { contactsEditCommand: contactsEditCommand2 } = await Promise.resolve().then(() => (init_contacts(), contacts_exports));
-  await contactsEditCommand2(contactId, { ...opts, entityId: parent.entityId });
+  await contactsEditCommand2(contactId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var capTableCmd = program.command("cap-table").description("Cap table, equity grants, SAFEs, transfers, and valuations").option("--entity-id <id>", "Entity ID (overrides active entity)").option("--json", "Output as JSON").action(async (opts) => {
   const { capTableCommand: capTableCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
@@ -3618,100 +4729,183 @@ capTableCmd.command("409a").description("Current 409A valuation").action(async (
   const { fourOhNineACommand: fourOhNineACommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
   await fourOhNineACommand2(parent);
 });
-capTableCmd.command("issue-equity").requiredOption("--grant-type <type>", "Grant type (common, preferred, membership_unit, stock_option, iso, nso, rsa)").requiredOption("--shares <n>", "Number of shares", parseInt).requiredOption("--recipient <name>", "Recipient name").option("--email <email>", "Recipient email (auto-creates contact if needed)").option("--instrument-id <id>", "Instrument ID (auto-detected from cap table if omitted)").description("Issue an equity grant (creates a round, adds security, and issues it)").action(async (opts, cmd) => {
+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 <id>", "Issuer legal entity ID (auto-detected from the cap table if omitted)").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();
+  const { createInstrumentCommand: createInstrumentCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
+  await createInstrumentCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+capTableCmd.command("issue-equity").requiredOption("--grant-type <type>", "Grant type (common, preferred, membership_unit, stock_option, iso, nso, rsa)").requiredOption("--shares <n>", "Number of shares", parseInt).requiredOption("--recipient <name>", "Recipient name").option("--email <email>", "Recipient email (auto-creates contact if needed)").option("--instrument-id <id>", "Instrument ID (auto-detected from cap table if omitted)").option("--meeting-id <id>", "Board meeting ID required when a board approval already exists or is being recorded").option("--resolution-id <id>", "Board resolution ID 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 an equity grant (creates a round, adds security, and issues it)").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { issueEquityCommand: issueEquityCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await issueEquityCommand2({ ...opts, entityId: parent.entityId });
+  await issueEquityCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    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).description("Issue a SAFE note").action(async (opts, cmd) => {
+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 <id>", "Board meeting ID required when issuing under a board-governed entity").option("--resolution-id <id>", "Board resolution ID 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, entityId: parent.entityId });
+  await issueSafeCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("transfer").requiredOption("--from <id>", "Source contact ID (from_contact_id)").requiredOption("--to <id>", "Destination contact ID (to_contact_id)").requiredOption("--shares <n>", "Number of shares to transfer", parseInt).requiredOption("--share-class-id <id>", "Share class ID").requiredOption("--governing-doc-type <type>", "Governing doc type (bylaws, operating_agreement, shareholder_agreement, other)").requiredOption("--transferee-rights <rights>", "Transferee rights (full_member, economic_only, limited)").option("--prepare-intent-id <id>", "Prepare intent ID (auto-created if omitted)").option("--type <type>", "Transfer type (gift, trust_transfer, secondary_sale, estate, other)", "secondary_sale").option("--price-per-share-cents <n>", "Price per share in cents", parseInt).option("--relationship <rel>", "Relationship to holder").description("Create a share transfer workflow").action(async (opts, cmd) => {
+capTableCmd.command("transfer").requiredOption("--from <id>", "Source contact ID (from_contact_id)").requiredOption("--to <id>", "Destination contact ID (to_contact_id)").requiredOption("--shares <n>", "Number of shares to transfer", parseInt).requiredOption("--share-class-id <id>", "Share class ID").requiredOption("--governing-doc-type <type>", "Governing doc type (bylaws, operating_agreement, shareholder_agreement, other)").requiredOption("--transferee-rights <rights>", "Transferee rights (full_member, economic_only, limited)").option("--prepare-intent-id <id>", "Prepare intent ID (auto-created if omitted)").option("--type <type>", "Transfer type (gift, trust_transfer, secondary_sale, estate, other)", "secondary_sale").option("--price-per-share-cents <n>", "Price per share in cents", parseInt).option("--relationship <rel>", "Relationship to holder").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the workflow").description("Create a share transfer workflow").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { transferSharesCommand: transferSharesCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await transferSharesCommand2({ ...opts, entityId: parent.entityId });
+  await transferSharesCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    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").description("Calculate a distribution").action(async (opts, cmd) => {
+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) => {
   const parent = cmd.parent.opts();
   const { distributeCommand: distributeCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await distributeCommand2({ ...opts, entityId: parent.entityId });
+  await distributeCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("start-round").requiredOption("--name <name>", "Round name").requiredOption("--issuer-legal-entity-id <id>", "Issuer legal entity ID").description("Start a staged equity round").action(async (opts, cmd) => {
+capTableCmd.command("start-round").requiredOption("--name <name>", "Round name").requiredOption("--issuer-legal-entity-id <id>", "Issuer legal entity ID").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the round").description("Start a staged equity round").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { startRoundCommand: startRoundCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await startRoundCommand2({ ...opts, entityId: parent.entityId });
+  await startRoundCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("add-security").requiredOption("--round-id <id>", "Round ID").requiredOption("--instrument-id <id>", "Instrument ID").requiredOption("--quantity <n>", "Number of shares/units", parseInt).requiredOption("--recipient-name <name>", "Recipient display name").option("--holder-id <id>", "Existing holder ID").option("--email <email>", "Recipient email (to find or create holder)").option("--principal-cents <n>", "Principal amount in cents", parseInt).option("--grant-type <type>", "Grant type").description("Add a security to a staged equity round").action(async (opts, cmd) => {
+capTableCmd.command("add-security").requiredOption("--round-id <id>", "Round ID").requiredOption("--instrument-id <id>", "Instrument ID").requiredOption("--quantity <n>", "Number of shares/units", parseInt).requiredOption("--recipient-name <name>", "Recipient display name").option("--holder-id <id>", "Existing holder ID").option("--email <email>", "Recipient email (to find or create holder)").option("--principal-cents <n>", "Principal amount in cents", parseInt).option("--grant-type <type>", "Grant type").option("--json", "Output as JSON").option("--dry-run", "Show the request without adding the security").description("Add a security to a staged equity round").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { addSecurityCommand: addSecurityCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await addSecurityCommand2({ ...opts, entityId: parent.entityId });
+  await addSecurityCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("issue-round").requiredOption("--round-id <id>", "Round ID").description("Issue all securities and close a staged round").action(async (opts, cmd) => {
+capTableCmd.command("issue-round").option("--meeting-id <id>", "Board meeting ID required when issuing under a board-governed entity").option("--resolution-id <id>", "Board resolution ID required when issuing under a board-governed entity").option("--json", "Output as JSON").option("--dry-run", "Show the request without issuing the round").requiredOption("--round-id <id>", "Round ID").description("Issue all securities and close a staged round").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { issueRoundCommand: issueRoundCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await issueRoundCommand2({ ...opts, entityId: parent.entityId });
+  await issueRoundCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("create-valuation").requiredOption("--type <type>", "Valuation type (four_oh_nine_a, fair_market_value, etc.)").requiredOption("--date <date>", "Effective date (ISO 8601)").requiredOption("--methodology <method>", "Methodology (income, market, asset, backsolve, hybrid)").option("--fmv <cents>", "FMV per share in cents", parseInt).option("--enterprise-value <cents>", "Enterprise value in cents", parseInt).description("Create a valuation").action(async (opts, cmd) => {
+capTableCmd.command("create-valuation").requiredOption("--type <type>", "Valuation type (four_oh_nine_a, fair_market_value, etc.)").requiredOption("--date <date>", "Effective date (ISO 8601)").requiredOption("--methodology <method>", "Methodology (income, market, asset, backsolve, hybrid)").option("--fmv <cents>", "FMV per share in cents", parseInt).option("--enterprise-value <cents>", "Enterprise value in cents", parseInt).option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the valuation").description("Create a valuation").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { createValuationCommand: createValuationCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await createValuationCommand2({ ...opts, entityId: parent.entityId });
+  await createValuationCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("submit-valuation <valuation-id>").description("Submit a valuation for board approval").action(async (valuationId, _opts, cmd) => {
+capTableCmd.command("submit-valuation <valuation-id>").option("--json", "Output as JSON").option("--dry-run", "Show the request without submitting the valuation").description("Submit a valuation for board approval").action(async (valuationId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { submitValuationCommand: submitValuationCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await submitValuationCommand2({ valuationId, entityId: parent.entityId });
+  await submitValuationCommand2({
+    ...opts,
+    valuationId,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-capTableCmd.command("approve-valuation <valuation-id>").option("--resolution-id <id>", "Resolution ID from the board vote").description("Approve a valuation").action(async (valuationId, opts, cmd) => {
+capTableCmd.command("approve-valuation <valuation-id>").option("--resolution-id <id>", "Resolution ID from the board vote").option("--json", "Output as JSON").option("--dry-run", "Show the request without approving the valuation").description("Approve a valuation").action(async (valuationId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { approveValuationCommand: approveValuationCommand2 } = await Promise.resolve().then(() => (init_cap_table(), cap_table_exports));
-  await approveValuationCommand2({ ...opts, valuationId, entityId: parent.entityId });
+  await approveValuationCommand2({
+    ...opts,
+    valuationId,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-var financeCmd = program.command("finance").description("Invoicing, payroll, payments, banking").option("--entity-id <id>", "Entity ID (overrides active entity)");
-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").description("Create an invoice").action(async (opts, cmd) => {
+var financeCmd = program.command("finance").description("Invoicing, payroll, payments, banking").option("--entity-id <id>", "Entity ID (overrides active entity)").option("--json", "Output as 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) => {
   const parent = cmd.parent.opts();
   const { financeInvoiceCommand: financeInvoiceCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financeInvoiceCommand2({ ...opts, entityId: parent.entityId });
+  await financeInvoiceCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-financeCmd.command("payroll").requiredOption("--period-start <date>", "Pay period start").requiredOption("--period-end <date>", "Pay period end").description("Run payroll").action(async (opts, cmd) => {
+financeCmd.command("payroll").requiredOption("--period-start <date>", "Pay period start").requiredOption("--period-end <date>", "Pay period end").option("--json", "Output as JSON").description("Run payroll").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financePayrollCommand: financePayrollCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financePayrollCommand2({ ...opts, entityId: parent.entityId });
+  await financePayrollCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    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").description("Submit a payment").action(async (opts, cmd) => {
+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) => {
   const parent = cmd.parent.opts();
   const { financePayCommand: financePayCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financePayCommand2({ ...opts, entityId: parent.entityId });
+  await financePayCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-financeCmd.command("open-account").option("--institution <name>", "Banking institution", "Mercury").description("Open a business bank account").action(async (opts, cmd) => {
+financeCmd.command("open-account").option("--institution <name>", "Banking institution", "Mercury").option("--json", "Output as JSON").description("Open a business bank account").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financeOpenAccountCommand: financeOpenAccountCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financeOpenAccountCommand2({ ...opts, entityId: parent.entityId });
+  await financeOpenAccountCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-financeCmd.command("classify-contractor").requiredOption("--name <name>", "Contractor name").requiredOption("--state <code>", "US state code").requiredOption("--hours <n>", "Hours per week", parseInt).option("--exclusive", "Exclusive client", false).requiredOption("--duration <n>", "Duration in months", parseInt).option("--provides-tools", "Company provides tools", false).description("Analyze contractor classification risk").action(async (opts, cmd) => {
+financeCmd.command("classify-contractor").requiredOption("--name <name>", "Contractor name").requiredOption("--state <code>", "US state code").requiredOption("--hours <n>", "Hours per week", parseInt).option("--exclusive", "Exclusive client", false).requiredOption("--duration <n>", "Duration in months", parseInt).option("--provides-tools", "Company provides tools", false).option("--json", "Output as JSON").description("Analyze contractor classification risk").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financeClassifyContractorCommand: financeClassifyContractorCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financeClassifyContractorCommand2({ ...opts, entityId: parent.entityId });
+  await financeClassifyContractorCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-financeCmd.command("reconcile").requiredOption("--start-date <date>", "Period start").requiredOption("--end-date <date>", "Period end").description("Reconcile ledger").action(async (opts, cmd) => {
+financeCmd.command("reconcile").requiredOption("--start-date <date>", "Period start").requiredOption("--end-date <date>", "Period end").option("--json", "Output as JSON").description("Reconcile ledger").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { financeReconcileCommand: financeReconcileCommand2 } = await Promise.resolve().then(() => (init_finance(), finance_exports));
-  await financeReconcileCommand2({ ...opts, entityId: parent.entityId });
+  await financeReconcileCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var governanceCmd = program.command("governance").description("Governance bodies, seats, meetings, resolutions").option("--entity-id <id>", "Entity ID (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);
 });
-governanceCmd.command("create-body").requiredOption("--name <name>", "Body name (e.g. 'Board of Directors')").requiredOption("--body-type <type>", "Body type (board_of_directors, llc_member_vote)").option("--quorum <rule>", "Quorum rule (majority, supermajority, unanimous)", "majority").option("--voting <method>", "Voting method (per_capita, per_unit)", "per_capita").description("Create a governance body").action(async (opts, cmd) => {
+governanceCmd.command("create-body").requiredOption("--name <name>", "Body name (e.g. 'Board of Directors')").requiredOption("--body-type <type>", "Body type (board_of_directors, llc_member_vote)").option("--quorum <rule>", "Quorum rule (majority, supermajority, unanimous)", "majority").option("--voting <method>", "Voting method (per_capita, per_unit)", "per_capita").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the governance body").description("Create a governance body").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { governanceCreateBodyCommand: governanceCreateBodyCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await governanceCreateBodyCommand2({ ...opts, entityId: parent.entityId });
+  await governanceCreateBodyCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("add-seat <body-id>").requiredOption("--holder <contact-id>", "Contact ID for the seat holder").option("--role <role>", "Seat role (chair, member, officer, observer)", "member").description("Add a seat to a governance body").action(async (bodyId, opts, cmd) => {
+governanceCmd.command("add-seat <body-id>").requiredOption("--holder <contact-id>", "Contact ID for the seat holder").option("--role <role>", "Seat role (chair, member, officer, observer)", "member").option("--json", "Output as JSON").option("--dry-run", "Show the request without adding the seat").description("Add a seat to a governance body").action(async (bodyId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { governanceAddSeatCommand: governanceAddSeatCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await governanceAddSeatCommand2(bodyId, { ...opts, entityId: parent.entityId });
+  await governanceAddSeatCommand2(bodyId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 governanceCmd.command("seats <body-id>").description("Seats for a governance body").action(async (bodyId, _opts, cmd) => {
   const parent = cmd.parent.opts();
@@ -3728,53 +4922,92 @@ governanceCmd.command("resolutions <meeting-id>").description("Resolutions for a
   const { governanceResolutionsCommand: governanceResolutionsCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   await governanceResolutionsCommand2(meetingId, parent);
 });
-governanceCmd.command("convene").requiredOption("--body <id>", "Governance body ID").requiredOption("--type <type>", "Meeting type (board_meeting, shareholder_meeting, member_meeting, written_consent)").requiredOption("--title <title>", "Meeting title").requiredOption("--date <date>", "Meeting date (ISO 8601)").option("--agenda <item>", "Agenda item (repeatable)", (v, a) => [...a, v], []).description("Convene a governance meeting").action(async (opts, cmd) => {
+governanceCmd.command("convene").requiredOption("--body <id>", "Governance body ID").requiredOption("--type <type>", "Meeting type (board_meeting, shareholder_meeting, member_meeting, written_consent)").requiredOption("--title <title>", "Meeting title").option("--date <date>", "Meeting date (ISO 8601)").option("--agenda <item>", "Agenda item (repeatable)", (v, a) => [...a, v], []).option("--json", "Output as JSON").option("--dry-run", "Show the request without scheduling the meeting").description("Convene a governance meeting").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { governanceConveneCommand: governanceConveneCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await governanceConveneCommand2({ ...opts, meetingType: opts.type, entityId: parent.entityId });
+  await governanceConveneCommand2({
+    ...opts,
+    meetingType: opts.type,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("vote <meeting-id> <item-id>").requiredOption("--voter <id>", "Voter contact UUID").addOption(new Option("--vote <value>", "Vote (for, against, abstain, recusal)").choices(["for", "against", "abstain", "recusal"]).makeOptionMandatory()).description("Cast a vote on an agenda item").action(async (meetingId, itemId, opts, cmd) => {
+governanceCmd.command("open <meeting-id>").requiredOption("--present-seat <id>", "Seat ID present at the meeting (repeatable)", (v, a) => [...a ?? [], v]).option("--json", "Output as JSON").option("--dry-run", "Show the request without opening the meeting").description("Open a scheduled meeting for voting").action(async (meetingId, opts, cmd) => {
+  const parent = cmd.parent.opts();
+  const { governanceOpenMeetingCommand: governanceOpenMeetingCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  await governanceOpenMeetingCommand2(meetingId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
+});
+governanceCmd.command("vote <meeting-id> <item-id>").requiredOption("--voter <id>", "Voter contact UUID").addOption(new Option("--vote <value>", "Vote (for, against, abstain, recusal)").choices(["for", "against", "abstain", "recusal"]).makeOptionMandatory()).option("--json", "Output as JSON").option("--dry-run", "Show the request without casting the vote").description("Cast a vote on an agenda item").action(async (meetingId, itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { governanceVoteCommand: governanceVoteCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   await governanceVoteCommand2(meetingId, itemId, {
     ...opts,
-    entityId: parent.entityId
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
   });
 });
-governanceCmd.command("notice <meeting-id>").description("Send meeting notice").action(async (meetingId, _opts, cmd) => {
+governanceCmd.command("notice <meeting-id>").option("--json", "Output as JSON").option("--dry-run", "Show the request without sending notices").description("Send meeting notice").action(async (meetingId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { sendNoticeCommand: sendNoticeCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await sendNoticeCommand2(meetingId, { entityId: parent.entityId });
+  await sendNoticeCommand2(meetingId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("adjourn <meeting-id>").description("Adjourn a meeting").action(async (meetingId, _opts, cmd) => {
+governanceCmd.command("adjourn <meeting-id>").option("--json", "Output as JSON").option("--dry-run", "Show the request without adjourning the meeting").description("Adjourn a meeting").action(async (meetingId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { adjournMeetingCommand: adjournMeetingCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await adjournMeetingCommand2(meetingId, { entityId: parent.entityId });
+  await adjournMeetingCommand2(meetingId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("cancel <meeting-id>").description("Cancel a meeting").action(async (meetingId, _opts, cmd) => {
+governanceCmd.command("cancel <meeting-id>").option("--json", "Output as JSON").option("--dry-run", "Show the request without cancelling the meeting").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, { entityId: parent.entityId });
+  await cancelMeetingCommand2(meetingId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 governanceCmd.command("agenda-items <meeting-id>").description("List agenda items for a meeting").action(async (meetingId, _opts, cmd) => {
   const parent = cmd.parent.opts();
   const { listAgendaItemsCommand: listAgendaItemsCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   await listAgendaItemsCommand2(meetingId, { entityId: parent.entityId, json: parent.json });
 });
-governanceCmd.command("finalize-item <meeting-id> <item-id>").requiredOption("--status <status>", "Status: voted, discussed, tabled, withdrawn").description("Finalize an agenda item").action(async (meetingId, itemId, opts, cmd) => {
+governanceCmd.command("finalize-item <meeting-id> <item-id>").requiredOption("--status <status>", "Status: voted, discussed, tabled, withdrawn").option("--json", "Output as JSON").option("--dry-run", "Show the request without finalizing the item").description("Finalize an agenda item").action(async (meetingId, itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { finalizeAgendaItemCommand: finalizeAgendaItemCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await finalizeAgendaItemCommand2(meetingId, itemId, { ...opts, entityId: parent.entityId });
+  await finalizeAgendaItemCommand2(meetingId, itemId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("resolve <meeting-id> <item-id>").requiredOption("--text <resolution_text>", "Resolution text").description("Compute a resolution for an agenda item").action(async (meetingId, itemId, opts, cmd) => {
+governanceCmd.command("resolve <meeting-id> <item-id>").requiredOption("--text <resolution_text>", "Resolution text").option("--json", "Output as JSON").option("--dry-run", "Show the request without computing the resolution").description("Compute a resolution for an agenda item").action(async (meetingId, itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { computeResolutionCommand: computeResolutionCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await computeResolutionCommand2(meetingId, itemId, { ...opts, entityId: parent.entityId });
+  await computeResolutionCommand2(meetingId, itemId, {
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-governanceCmd.command("written-consent").requiredOption("--body <id>", "Governance body ID").requiredOption("--title <title>", "Title").requiredOption("--description <desc>", "Description").description("Create a written consent action").action(async (opts, cmd) => {
+governanceCmd.command("written-consent").requiredOption("--body <id>", "Governance body ID").requiredOption("--title <title>", "Title").requiredOption("--description <desc>", "Description").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the written consent").description("Create a written consent action").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { writtenConsentCommand: writtenConsentCommand2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
-  await writtenConsentCommand2({ ...opts, entityId: parent.entityId });
+  await writtenConsentCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var documentsCmd = program.command("documents").description("Documents and signing").option("--entity-id <id>", "Entity ID (overrides active entity)").option("--json", "Output as JSON").action(async (opts) => {
   const { documentsListCommand: documentsListCommand2 } = await Promise.resolve().then(() => (init_documents(), documents_exports));
@@ -3785,26 +5018,42 @@ documentsCmd.command("signing-link <doc-id>").option("--entity-id <id>", "Entity
   const { documentsSigningLinkCommand: documentsSigningLinkCommand2 } = await Promise.resolve().then(() => (init_documents(), documents_exports));
   await documentsSigningLinkCommand2(docId, { entityId: opts.entityId ?? parent.entityId });
 });
-documentsCmd.command("generate").requiredOption("--template <type>", "Template type (consulting_agreement, employment_offer, contractor_agreement, nda, custom)").requiredOption("--counterparty <name>", "Counterparty name").option("--effective-date <date>", "Effective date (ISO 8601, defaults to today)").description("Generate a contract from a template").action(async (opts, cmd) => {
+documentsCmd.command("generate").requiredOption("--template <type>", "Template type (consulting_agreement, employment_offer, contractor_agreement, nda, custom)").requiredOption("--counterparty <name>", "Counterparty name").option("--effective-date <date>", "Effective date (ISO 8601, defaults to today)").option("--base-salary <amount>", "Employment offer base salary (for employment_offer)").option("--param <key=value>", "Additional template parameter (repeatable)", (value, values) => [...values, value], []).option("--json", "Output as JSON").description("Generate a contract from a template").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { documentsGenerateCommand: documentsGenerateCommand2 } = await Promise.resolve().then(() => (init_documents(), documents_exports));
-  await documentsGenerateCommand2({ ...opts, entityId: parent.entityId });
+  await documentsGenerateCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-documentsCmd.command("preview-pdf").requiredOption("--document-id <id>", "AST document definition ID (e.g. 'bylaws')").description("Validate and print the authenticated PDF preview URL for a governance document").action(async (opts, cmd) => {
+documentsCmd.command("preview-pdf").requiredOption("--definition-id <id>", "AST document definition ID (e.g. 'bylaws')").option("--document-id <id>", "Deprecated alias for --definition-id").description("Validate and print the authenticated PDF preview URL for a governance document").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { documentsPreviewPdfCommand: documentsPreviewPdfCommand2 } = await Promise.resolve().then(() => (init_documents(), documents_exports));
-  await documentsPreviewPdfCommand2({ ...opts, entityId: parent.entityId });
+  await documentsPreviewPdfCommand2({
+    ...opts,
+    documentId: opts.definitionId ?? opts.documentId,
+    entityId: parent.entityId
+  });
 });
 var taxCmd = program.command("tax").description("Tax filings and deadline tracking").option("--entity-id <id>", "Entity ID (overrides active entity)");
-taxCmd.command("file").requiredOption("--type <type>", "Document type").requiredOption("--year <year>", "Tax year", parseInt).description("File a tax document").action(async (opts, cmd) => {
+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) => {
   const parent = cmd.parent.opts();
   const { taxFileCommand: taxFileCommand2 } = await Promise.resolve().then(() => (init_tax(), tax_exports));
-  await taxFileCommand2({ ...opts, entityId: parent.entityId });
+  await taxFileCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-taxCmd.command("deadline").requiredOption("--type <type>", "Deadline type").requiredOption("--due-date <date>", "Due date (ISO 8601)").requiredOption("--description <desc>", "Description").option("--recurrence <recurrence>", "Recurrence (e.g. annual; 'yearly' is normalized)").description("Track a compliance deadline").action(async (opts, cmd) => {
+taxCmd.command("deadline").requiredOption("--type <type>", "Deadline type").requiredOption("--due-date <date>", "Due date (ISO 8601)").requiredOption("--description <desc>", "Description").option("--recurrence <recurrence>", "Recurrence (e.g. annual; 'yearly' is normalized)").option("--json", "Output as JSON").description("Track a compliance deadline").action(async (opts, cmd) => {
   const parent = cmd.parent.opts();
   const { taxDeadlineCommand: taxDeadlineCommand2 } = await Promise.resolve().then(() => (init_tax(), tax_exports));
-  await taxDeadlineCommand2({ ...opts, entityId: parent.entityId });
+  await taxDeadlineCommand2({
+    ...opts,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var agentsCmd = program.command("agents").description("Agent management").option("--json", "Output as JSON").action(async (opts) => {
   const { agentsListCommand: agentsListCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
@@ -3818,29 +5067,50 @@ agentsCmd.command("show <agent-id>").option("--json", "Output as JSON").descript
     json: inheritOption(opts.json, parent.json)
   });
 });
-agentsCmd.command("create").requiredOption("--name <name>", "Agent name").requiredOption("--prompt <prompt>", "System prompt").option("--model <model>", "Model").description("Create a new agent").action(async (opts) => {
+agentsCmd.command("create").requiredOption("--name <name>", "Agent name").requiredOption("--prompt <prompt>", "System prompt").option("--model <model>", "Model").option("--json", "Output as JSON").description("Create a new agent").action(async (opts, cmd) => {
+  const parent = cmd.parent.opts();
   const { agentsCreateCommand: agentsCreateCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
-  await agentsCreateCommand2(opts);
+  await agentsCreateCommand2({
+    ...opts,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-agentsCmd.command("pause <agent-id>").description("Pause an agent").action(async (agentId) => {
+agentsCmd.command("pause <agent-id>").option("--json", "Output as JSON").description("Pause an agent").action(async (agentId, opts, cmd) => {
+  const parent = cmd.parent.opts();
   const { agentsPauseCommand: agentsPauseCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
-  await agentsPauseCommand2(agentId);
+  await agentsPauseCommand2(agentId, {
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-agentsCmd.command("resume <agent-id>").description("Resume a paused agent").action(async (agentId) => {
+agentsCmd.command("resume <agent-id>").option("--json", "Output as JSON").description("Resume a paused agent").action(async (agentId, opts, cmd) => {
+  const parent = cmd.parent.opts();
   const { agentsResumeCommand: agentsResumeCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
-  await agentsResumeCommand2(agentId);
+  await agentsResumeCommand2(agentId, {
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-agentsCmd.command("delete <agent-id>").description("Delete an agent").action(async (agentId) => {
+agentsCmd.command("delete <agent-id>").option("--json", "Output as JSON").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);
+  await agentsDeleteCommand2(agentId, {
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-agentsCmd.command("message <agent-id>").requiredOption("--body <text>", "Message text").description("Send a message to an agent").action(async (agentId, opts) => {
+agentsCmd.command("message <agent-id>").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) => {
+  const parent = cmd.parent.opts();
   const { agentsMessageCommand: agentsMessageCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
-  await agentsMessageCommand2(agentId, opts);
+  await agentsMessageCommand2(agentId, {
+    ...opts,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-agentsCmd.command("skill <agent-id>").requiredOption("--name <name>", "Skill name").requiredOption("--description <desc>", "Skill description").option("--instructions <text>", "Instructions").description("Add a skill to an agent").action(async (agentId, opts) => {
+agentsCmd.command("skill <agent-id>").requiredOption("--name <name>", "Skill name").requiredOption("--description <desc>", "Skill description").option("--instructions <text>", "Instructions").option("--instructions-file <path>", "Read skill instructions from a file").option("--json", "Output as JSON").description("Add a skill to an agent").action(async (agentId, opts, cmd) => {
+  const parent = cmd.parent.opts();
   const { agentsSkillCommand: agentsSkillCommand2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
-  await agentsSkillCommand2(agentId, opts);
+  await agentsSkillCommand2(agentId, {
+    ...opts,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var workItemsCmd = program.command("work-items").description("Long-term work item coordination").option("--entity-id <id>", "Entity ID (overrides active entity)").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));
@@ -3855,34 +5125,61 @@ workItemsCmd.command("show <item-id>").option("--json", "Output as JSON").descri
     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").description("Create a new work item").action(async (opts, cmd) => {
+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) => {
   const parent = cmd.parent.opts();
   const { workItemsCreateCommand: workItemsCreateCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
   await workItemsCreateCommand2({
     ...opts,
     category: inheritOption(opts.category, parent.category),
-    entityId: parent.entityId
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
   });
 });
-workItemsCmd.command("claim <item-id>").requiredOption("--by <name>", "Agent or user claiming the item").option("--ttl <seconds>", "Auto-release TTL in seconds", parseInt).description("Claim a work item").action(async (itemId, opts, cmd) => {
+workItemsCmd.command("claim <item-id>").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) => {
   const parent = cmd.parent.opts();
   const { workItemsClaimCommand: workItemsClaimCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
-  await workItemsClaimCommand2(itemId, { claimedBy: opts.by, ttl: opts.ttl, entityId: parent.entityId });
+  const claimedBy = opts.by ?? opts.claimer;
+  if (!claimedBy) {
+    cmd.error("required option '--by <name>' not specified");
+    return;
+  }
+  await workItemsClaimCommand2(itemId, {
+    claimedBy,
+    ttl: opts.ttl,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-workItemsCmd.command("complete <item-id>").requiredOption("--by <name>", "Agent or user completing the item").option("--result <text>", "Completion result or notes").description("Mark a work item as completed").action(async (itemId, opts, cmd) => {
+workItemsCmd.command("complete <item-id>").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) => {
   const parent = cmd.parent.opts();
   const { workItemsCompleteCommand: workItemsCompleteCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
-  await workItemsCompleteCommand2(itemId, { completedBy: opts.by, result: opts.result, entityId: parent.entityId });
+  const completedBy = opts.by ?? opts.completedBy;
+  if (!completedBy) {
+    cmd.error("required option '--by <name>' not specified");
+    return;
+  }
+  await workItemsCompleteCommand2(itemId, {
+    completedBy,
+    result: opts.result ?? opts.notes,
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-workItemsCmd.command("release <item-id>").description("Release a claimed work item").action(async (itemId, _opts, cmd) => {
+workItemsCmd.command("release <item-id>").option("--json", "Output as JSON").description("Release a claimed work item").action(async (itemId, opts, cmd) => {
   const parent = cmd.parent.opts();
   const { workItemsReleaseCommand: workItemsReleaseCommand2 } = await Promise.resolve().then(() => (init_work_items(), work_items_exports));
-  await workItemsReleaseCommand2(itemId, { entityId: parent.entityId });
+  await workItemsReleaseCommand2(itemId, {
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
-workItemsCmd.command("cancel <item-id>").description("Cancel a work item").action(async (itemId, _opts, cmd) => {
+workItemsCmd.command("cancel <item-id>").option("--json", "Output as JSON").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 });
+  await workItemsCancelCommand2(itemId, {
+    entityId: parent.entityId,
+    json: inheritOption(opts.json, parent.json)
+  });
 });
 var billingCmd = program.command("billing").description("Billing status, plans, and subscription management").option("--json", "Output as JSON").action(async (opts) => {
   const { billingCommand: billingCommand2 } = await Promise.resolve().then(() => (init_billing(), billing_exports));
@@ -3902,23 +5199,35 @@ program.command("approvals").description("Approvals are managed through governan
     "Approvals are managed through governance meetings.\n  Use: corp governance convene ... to schedule a board meeting\n  Use: corp governance vote <meeting-id> <item-id> ... to cast votes"
   );
 });
-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>", "Member as 'name,email,role[,pct]' \u2014 role: director|officer|manager|member|chair (repeatable)", (v, a) => [...a, v], []).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").action(async (opts) => {
+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;
   const { formCommand: formCommand2 } = await Promise.resolve().then(() => (init_form(), form_exports));
   await formCommand2(opts);
 });
-formCmd.command("create").description("Create a pending entity (staged flow step 1)").requiredOption("--type <type>", "Entity type (llc, c_corp)").requiredOption("--name <name>", "Legal name").option("--jurisdiction <jurisdiction>", "Jurisdiction (e.g. US-DE, US-WY)").option("--registered-agent-name <name>", "Registered agent legal name").option("--registered-agent-address <address>", "Registered agent address line").option("--formation-date <date>", "Formation date (RFC3339 or YYYY-MM-DD)").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--company-address <address>", "Company address as 'street,city,state,zip'").action(async (opts) => {
+formCmd.command("create").description("Create a pending entity (staged flow step 1)").requiredOption("--type <type>", "Entity type (llc, c_corp)").requiredOption("--name <name>", "Legal name").option("--jurisdiction <jurisdiction>", "Jurisdiction (e.g. US-DE, US-WY)").option("--registered-agent-name <name>", "Registered agent legal name").option("--registered-agent-address <address>", "Registered agent address line").option("--formation-date <date>", "Formation date (RFC3339 or YYYY-MM-DD)").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--company-address <address>", "Company address as 'street,city,state,zip'").option("--json", "Output as JSON").option("--dry-run", "Show the request without creating the pending entity").action(async (opts, cmd) => {
   const { formCreateCommand: formCreateCommand2 } = await Promise.resolve().then(() => (init_form(), form_exports));
-  await formCreateCommand2(opts);
+  await formCreateCommand2({
+    ...opts,
+    json: inheritOption(opts.json, cmd.parent.opts().json),
+    dryRun: inheritOption(opts.dryRun, cmd.parent.opts().dryRun)
+  });
 });
-formCmd.command("add-founder <entity-id>").description("Add a founder to a pending entity (staged flow step 2)").requiredOption("--name <name>", "Founder name").requiredOption("--email <email>", "Founder email").requiredOption("--role <role>", "Role: director|officer|manager|member|chair").requiredOption("--pct <pct>", "Ownership percentage").option("--officer-title <title>", "Officer title (corporations only)").option("--incorporator", "Mark as sole incorporator (corporations only)").option("--address <address>", "Founder address as 'street,city,state,zip'").action(async (entityId, opts) => {
+formCmd.command("add-founder <entity-id>").description("Add a founder to a pending entity (staged flow step 2)").requiredOption("--name <name>", "Founder name").requiredOption("--email <email>", "Founder email").requiredOption("--role <role>", "Role: director|officer|manager|member|chair").requiredOption("--pct <pct>", "Ownership percentage").addOption(new Option("--officer-title <title>", "Officer title (corporations only)").choices(["ceo", "cfo", "cto", "coo", "secretary", "treasurer", "president", "vp", "other"])).option("--incorporator", "Mark as sole incorporator (corporations only)").option("--address <address>", "Founder address as 'street,city,state,zip'").option("--json", "Output as JSON").option("--dry-run", "Show the request without adding the founder").action(async (entityId, opts, cmd) => {
   const { formAddFounderCommand: formAddFounderCommand2 } = await Promise.resolve().then(() => (init_form(), form_exports));
-  await formAddFounderCommand2(entityId, opts);
+  await formAddFounderCommand2(entityId, {
+    ...opts,
+    json: inheritOption(opts.json, cmd.parent.opts().json),
+    dryRun: inheritOption(opts.dryRun, cmd.parent.opts().dryRun)
+  });
 });
-formCmd.command("finalize <entity-id>").description("Finalize formation and generate documents + cap table (staged flow step 3)").option("--authorized-shares <count>", "Authorized shares for corporations").option("--par-value <value>", "Par value per share, e.g. 0.0001").option("--registered-agent-name <name>", "Registered agent legal name").option("--registered-agent-address <address>", "Registered agent address line").option("--formation-date <date>", "Formation date (RFC3339 or YYYY-MM-DD)").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--company-address <address>", "Company address as 'street,city,state,zip'").action(async (entityId, opts) => {
+formCmd.command("finalize <entity-id>").description("Finalize formation and generate documents + cap table (staged flow step 3)").option("--authorized-shares <count>", "Authorized shares for corporations").option("--par-value <value>", "Par value per share, e.g. 0.0001").option("--board-size <count>", "Board size for corporations").option("--principal-name <name>", "Principal or manager name for LLCs").option("--registered-agent-name <name>", "Registered agent legal name").option("--registered-agent-address <address>", "Registered agent address line").option("--formation-date <date>", "Formation date (RFC3339 or YYYY-MM-DD)").option("--fiscal-year-end <date>", "Fiscal year end (MM-DD)").option("--s-corp", "Elect S-Corp status").option("--transfer-restrictions", "Enable transfer restrictions").option("--rofr", "Enable right of first refusal").option("--company-address <address>", "Company address as 'street,city,state,zip'").option("--incorporator-name <name>", "Incorporator legal name (overrides founder)").option("--incorporator-address <address>", "Incorporator mailing address (overrides founder)").option("--json", "Output as JSON").option("--dry-run", "Show the request without finalizing formation").action(async (entityId, opts, cmd) => {
   const { formFinalizeCommand: formFinalizeCommand2 } = await Promise.resolve().then(() => (init_form(), form_exports));
-  await formFinalizeCommand2(entityId, opts);
+  await formFinalizeCommand2(entityId, {
+    ...opts,
+    json: inheritOption(opts.json, cmd.parent.opts().json),
+    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));
@@ -3928,9 +5237,13 @@ program.command("demo").description("Seed a fully-populated demo corporation").r
   const { demoCommand: demoCommand2 } = await Promise.resolve().then(() => (init_demo(), demo_exports));
   await demoCommand2(opts);
 });
+program.command("feedback").description("Submit feedback to TheCorporation").argument("<message>", "Feedback message").option("--category <category>", "Category (e.g. bug, feature, general)", "general").option("--email <email>", "Your email address (to receive a copy)").action(async (message, opts) => {
+  const { feedbackCommand: feedbackCommand2 } = await Promise.resolve().then(() => (init_feedback(), feedback_exports));
+  await feedbackCommand2(message, opts);
+});
 program.command("serve").description("Start the API server locally").option("--port <port>", "Port to listen on", "8000").option("--data-dir <path>", "Data directory", "./data/repos").action(async (opts) => {
   const { serveCommand: serveCommand2 } = await Promise.resolve().then(() => (init_serve(), serve_exports));
   await serveCommand2(opts);
 });
-program.parse();
+await program.parseAsync(process.argv);
 //# sourceMappingURL=index.js.map