@sherwoodagent/cli 0.7.3 → 0.9.0

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import {
+  fetchMetadata,
   uploadMetadata
 } from "./chunk-DVWORPEY.js";
 import {
@@ -9,7 +10,7 @@ import {
   queryApprovals,
   queryJoinRequests,
   revokeAttestation
-} from "./chunk-P3GYAMGZ.js";
+} from "./chunk-HKZONPXW.js";
 import {
   approveDepositor,
   deposit,
@@ -27,7 +28,7 @@ import {
   setTextRecord,
   setVaultAddress,
   simulateBatch
-} from "./chunk-B7XDUFI3.js";
+} from "./chunk-Q37V65B6.js";
 import {
   AGENT_REGISTRY,
   EAS_SCHEMAS,
@@ -36,20 +37,23 @@ import {
   SHERWOOD,
   STRATEGY_REGISTRY_ABI,
   SYNDICATE_FACTORY_ABI,
+  SYNDICATE_GOVERNOR_ABI,
   SYNDICATE_VAULT_ABI,
   TOKENS,
   UNISWAP,
   UNISWAP_QUOTER_V2_ABI,
   VENICE,
   VENICE_STAKING_ABI
-} from "./chunk-6MEYSN2W.js";
+} from "./chunk-OUES74ID.js";
 import {
+  VALID_NETWORKS,
   cacheGroupId,
   getAccount,
   getAgentId,
   getChain,
   getChainContracts,
   getExplorerUrl,
+  getNetwork,
   getPublicClient,
   getRpcUrl,
   getVeniceApiKey,
@@ -57,17 +61,18 @@ import {
   loadConfig,
   setAgentId,
   setChainContract,
+  setConfigRpcUrl,
   setNetwork,
   setPrivateKey,
   setVeniceApiKey
-} from "./chunk-QMWMT6EH.js";
+} from "./chunk-5ADWTXNT.js";
 
 // src/index.ts
 import { config as loadDotenv } from "dotenv";
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import { parseUnits as parseUnits8 } from "viem";
-import chalk5 from "chalk";
-import ora5 from "ora";
+import chalk7 from "chalk";
+import ora7 from "ora";
 import { input, confirm, select } from "@inquirer/prompts";
 
 // src/providers/moonwell.ts
@@ -929,7 +934,7 @@ function registerVeniceCommands(program2) {
       [assetAddress, totalDeposited, agents] = await Promise.all([
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "asset" }),
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "totalDeposited" }),
-        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentOperators" })
+        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentAddresses" })
       ]);
       [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
@@ -1096,7 +1101,7 @@ function registerVeniceCommands(program2) {
       const [assetAddress, totalDeposited, agents] = await Promise.all([
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "asset" }),
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "totalDeposited" }),
-        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentOperators" })
+        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentAddresses" })
       ]);
       const [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
@@ -1330,7 +1335,7 @@ function registerAllowanceCommands(program2) {
       [assetAddress, totalDeposited, agents] = await Promise.all([
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "asset" }),
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "totalDeposited" }),
-        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentOperators" })
+        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentAddresses" })
       ]);
       [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
@@ -1473,7 +1478,7 @@ function registerAllowanceCommands(program2) {
       const [assetAddress, totalDeposited, agents] = await Promise.all([
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "asset" }),
         client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "totalDeposited" }),
-        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentOperators" })
+        client.readContract({ address: vaultAddress, abi: SYNDICATE_VAULT_ABI, functionName: "getAgentAddresses" })
       ]);
       const [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
@@ -1674,60 +1679,892 @@ function registerIdentityCommands(program2) {
   });
 }
 
-// src/index.ts
-try {
-  loadDotenv();
-} catch {
+// src/commands/proposal.ts
+import { isAddress as isAddress4 } from "viem";
+import chalk5 from "chalk";
+import ora5 from "ora";
+import { readFileSync } from "fs";
+
+// src/lib/governor.ts
+var PROPOSAL_STATES = [
+  "Pending",
+  "Approved",
+  "Rejected",
+  "Expired",
+  "Executed",
+  "Settled",
+  "Cancelled"
+];
+function parseDuration(input2) {
+  const match = input2.match(/^(\d+)(d|h|m|s)?$/);
+  if (!match) throw new Error(`Invalid duration: ${input2}`);
+  const value = BigInt(match[1]);
+  switch (match[2]) {
+    case "d":
+      return value * 86400n;
+    case "h":
+      return value * 3600n;
+    case "m":
+      return value * 60n;
+    case "s":
+    case void 0:
+      return value;
+    default:
+      throw new Error(`Unknown duration unit: ${match[2]}`);
+  }
 }
-async function loadXmtp() {
-  return import("./xmtp-4XTQQ7RE.js");
+function getGovernorAddress() {
+  return SHERWOOD().GOVERNOR;
+}
+async function getGovernorParams() {
+  const client = getPublicClient();
+  const result = await client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getGovernorParams"
+  });
+  return result;
+}
+async function getProposal(id) {
+  const client = getPublicClient();
+  const result = await client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getProposal",
+    args: [id]
+  });
+  return result;
+}
+async function getProposalState(id) {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getProposalState",
+    args: [id]
+  });
+}
+async function proposalCount() {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "proposalCount"
+  });
+}
+async function getVoteWeight(proposalId, voter) {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getVoteWeight",
+    args: [proposalId, voter]
+  });
+}
+async function hasVoted(proposalId, voter) {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "hasVoted",
+    args: [proposalId, voter]
+  });
 }
+async function getProposalCalls(proposalId) {
+  const client = getPublicClient();
+  const result = await client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getProposalCalls",
+    args: [proposalId]
+  });
+  return result.map((c) => ({ target: c.target, data: c.data, value: c.value }));
+}
+async function getRegisteredVaults() {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getRegisteredVaults"
+  });
+}
+async function getCapitalSnapshot(proposalId) {
+  const client = getPublicClient();
+  return client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getCapitalSnapshot",
+    args: [proposalId]
+  });
+}
+async function propose(vault, metadataURI, performanceFeeBps, strategyDuration, calls, splitIndex) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "propose",
+    args: [vault, metadataURI, performanceFeeBps, strategyDuration, calls, splitIndex]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  let proposalId;
+  try {
+    proposalId = await proposalCount();
+  } catch {
+    proposalId = 0n;
+  }
+  return { hash: receipt.transactionHash, proposalId };
+}
+async function vote(proposalId, support) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "vote",
+    args: [proposalId, support]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function executeProposal(proposalId) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "executeProposal",
+    args: [proposalId]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function settleProposal(proposalId) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "settleProposal",
+    args: [proposalId]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function settleByAgent(proposalId, calls) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "settleByAgent",
+    args: [proposalId, calls]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function emergencySettle(proposalId, calls) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "emergencySettle",
+    args: [proposalId, calls]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function cancelProposal(proposalId) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "cancelProposal",
+    args: [proposalId]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function emergencyCancel(proposalId) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "emergencyCancel",
+    args: [proposalId]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setVotingPeriod(seconds) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setVotingPeriod",
+    args: [seconds]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setExecutionWindow(seconds) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setExecutionWindow",
+    args: [seconds]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setQuorumBps(bps) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setQuorumBps",
+    args: [bps]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setMaxPerformanceFeeBps(bps) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setMaxPerformanceFeeBps",
+    args: [bps]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setMaxStrategyDuration(seconds) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setMaxStrategyDuration",
+    args: [seconds]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+async function setCooldownPeriod(seconds) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setCooldownPeriod",
+    args: [seconds]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
+
+// src/lib/format.ts
+function formatDurationShort(seconds) {
+  const s = Number(seconds);
+  if (s >= 86400) return `${(s / 86400).toFixed(s % 86400 === 0 ? 0 : 1)}d`;
+  if (s >= 3600) return `${(s / 3600).toFixed(s % 3600 === 0 ? 0 : 1)}h`;
+  if (s >= 60) return `${(s / 60).toFixed(0)}m`;
+  return `${s}s`;
+}
+function formatDurationLong(seconds) {
+  const s = Number(seconds);
+  if (s >= 86400) return `${(s / 86400).toFixed(s % 86400 === 0 ? 0 : 1)} day${s >= 172800 ? "s" : ""}`;
+  if (s >= 3600) return `${(s / 3600).toFixed(s % 3600 === 0 ? 0 : 1)} hour${s >= 7200 ? "s" : ""}`;
+  if (s >= 60) return `${(s / 60).toFixed(0)} min`;
+  return `${s}s`;
+}
+function formatShares(raw) {
+  const num = Number(raw) / 1e6;
+  return num.toLocaleString("en-US", { minimumFractionDigits: 0, maximumFractionDigits: 2 });
+}
+function formatUSDC(raw) {
+  const num = Number(raw) / 1e6;
+  return `$${num.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
+}
+function parseBigIntArg(value, name) {
+  if (!/^-?\d+$/.test(value)) {
+    throw new Error(`Invalid ${name}: "${value}" is not a valid integer`);
+  }
+  return BigInt(value);
+}
+
+// src/commands/proposal.ts
 var G = chalk5.green;
 var W = chalk5.white;
 var DIM = chalk5.gray;
 var BOLD = chalk5.white.bold;
 var LABEL = chalk5.green.bold;
 var SEP = () => console.log(DIM("\u2500".repeat(60)));
+function formatTimestamp(ts) {
+  if (ts === 0n) return "\u2014";
+  return new Date(Number(ts) * 1e3).toLocaleString();
+}
+function parseCallsFile(path) {
+  const raw = readFileSync(path, "utf-8");
+  const parsed = JSON.parse(raw);
+  return parsed.map((c) => ({
+    target: c.target,
+    data: c.data,
+    value: BigInt(c.value || "0")
+  }));
+}
+function registerProposalCommands(program2) {
+  const proposal = program2.command("proposal").description("Governance proposals \u2014 create, vote, execute, settle");
+  proposal.command("create").description("Submit a strategy proposal").requiredOption("--vault <address>", "Vault address the proposal targets").requiredOption("--name <name>", "Strategy name").requiredOption("--description <text>", "Strategy rationale and risk summary").requiredOption("--performance-fee <bps>", "Agent fee in bps (e.g. 1500 = 15%)").requiredOption("--duration <duration>", "Strategy duration (e.g. 7d, 24h, 3600)").requiredOption("--calls <path>", "Path to JSON file with Call[] array").requiredOption("--split-index <n>", "Index where execute calls end and settle calls begin").option("--metadata-uri <uri>", "Override \u2014 skip IPFS upload and use this URI directly").action(async (opts) => {
+    try {
+      const vault = opts.vault;
+      if (!isAddress4(vault)) {
+        console.error(chalk5.red(`Invalid vault address: ${opts.vault}`));
+        process.exit(1);
+      }
+      const performanceFeeBps = parseBigIntArg(opts.performanceFee, "performance-fee");
+      const strategyDuration = parseDuration(opts.duration);
+      const splitIndex = parseBigIntArg(opts.splitIndex, "split-index");
+      const calls = parseCallsFile(opts.calls);
+      let metadataURI = opts.metadataUri || "";
+      if (!metadataURI) {
+        const spinner2 = ora5({ text: W("Uploading metadata to IPFS..."), color: "green" }).start();
+        try {
+          const account = getAccount();
+          const metadata = {
+            schema: "sherwood/proposal/v1",
+            name: opts.name,
+            description: opts.description,
+            chain: getNetwork(),
+            strategies: [],
+            terms: { ragequitEnabled: true },
+            links: {}
+          };
+          const proposalMeta = {
+            ...metadata,
+            proposer: account.address,
+            vault,
+            performanceFeeBps: Number(performanceFeeBps),
+            strategyDuration: Number(strategyDuration),
+            createdAt: Math.floor(Date.now() / 1e3)
+          };
+          metadataURI = await uploadMetadata(proposalMeta);
+          spinner2.succeed(G(`Metadata pinned: ${DIM(metadataURI)}`));
+        } catch (err) {
+          spinner2.warn(chalk5.yellow("IPFS upload failed \u2014 using inline metadata"));
+          const json = JSON.stringify({ name: opts.name, description: opts.description, vault });
+          metadataURI = `data:application/json;base64,${Buffer.from(json).toString("base64")}`;
+        }
+      }
+      console.log();
+      console.log(LABEL("  \u25C6 Proposal Summary"));
+      SEP();
+      console.log(W(`  Name:             ${BOLD(opts.name)}`));
+      console.log(W(`  Vault:            ${G(vault)}`));
+      console.log(W(`  Performance Fee:  ${Number(performanceFeeBps) / 100}%`));
+      console.log(W(`  Duration:         ${formatDurationShort(strategyDuration)}`));
+      console.log(W(`  Calls:            ${calls.length} (split at ${splitIndex})`));
+      console.log(W(`  Metadata:         ${DIM(metadataURI.length > 50 ? metadataURI.slice(0, 50) + "..." : metadataURI)}`));
+      SEP();
+      const spinner = ora5({ text: W("Submitting proposal..."), color: "green" }).start();
+      const result = await propose(vault, metadataURI, performanceFeeBps, strategyDuration, calls, splitIndex);
+      spinner.succeed(G("Proposal submitted"));
+      console.log();
+      console.log(LABEL("  \u25C6 Proposal Created"));
+      SEP();
+      console.log(W(`  Proposal ID:  ${G(`#${result.proposalId}`)}`));
+      console.log(W(`  Tx:           ${DIM(getExplorerUrl(result.hash))}`));
+      SEP();
+      console.log();
+    } catch (err) {
+      console.error(chalk5.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}`));
+      process.exit(1);
+    }
+  });
+  proposal.command("list").description("List proposals").option("--vault <address>", "Filter by vault").option("--state <filter>", "Filter by state: pending, approved, executed, settled, all", "all").action(async (opts) => {
+    const spinner = ora5("Loading proposals...").start();
+    try {
+      const count = await proposalCount();
+      if (count === 0n) {
+        spinner.stop();
+        console.log(DIM("\n  No proposals found.\n"));
+        return;
+      }
+      const vaultFilter = opts.vault ? opts.vault.toLowerCase() : null;
+      const stateFilter = opts.state.toLowerCase();
+      const stateIndex = PROPOSAL_STATES.findIndex((s) => s.toLowerCase() === stateFilter);
+      const ids = Array.from({ length: Number(count) }, (_, i) => BigInt(i + 1));
+      const results = await Promise.all(
+        ids.map(async (id) => {
+          const [p, state] = await Promise.all([getProposal(id), getProposalState(id)]);
+          return { ...p, computedState: state };
+        })
+      );
+      const proposals = results.filter((p) => {
+        if (vaultFilter && p.vault.toLowerCase() !== vaultFilter) return false;
+        if (stateFilter !== "all" && stateIndex >= 0 && p.computedState !== stateIndex) return false;
+        return true;
+      });
+      spinner.stop();
+      if (proposals.length === 0) {
+        console.log(DIM("\n  No matching proposals.\n"));
+        return;
+      }
+      console.log();
+      console.log(BOLD(`Proposals (${proposals.length})`));
+      console.log(DIM("\u2500".repeat(90)));
+      console.log(
+        DIM("  ID  ") + DIM("Agent".padEnd(14)) + DIM("State".padEnd(12)) + DIM("Votes (For/Against)".padEnd(22)) + DIM("Fee".padEnd(8)) + DIM("Duration".padEnd(10)) + DIM("Created")
+      );
+      console.log(DIM("\u2500".repeat(90)));
+      for (const p of proposals) {
+        const state = PROPOSAL_STATES[p.computedState] || "Unknown";
+        const created = p.snapshotTimestamp > 0n ? new Date(Number(p.snapshotTimestamp) * 1e3).toLocaleDateString() : "\u2014";
+        const agent = `${p.proposer.slice(0, 6)}...${p.proposer.slice(-4)}`;
+        const fee = `${Number(p.performanceFeeBps) / 100}%`;
+        const dur = formatDurationShort(p.strategyDuration);
+        const votes = `${formatShares(p.votesFor)}/${formatShares(p.votesAgainst)}`;
+        console.log(
+          `  ${String(p.id).padEnd(4)}${agent.padEnd(14)}${state.padEnd(12)}${votes.padEnd(22)}${fee.padEnd(8)}${dur.padEnd(10)}${created}`
+        );
+      }
+      console.log();
+    } catch (err) {
+      spinner.fail("Failed to load proposals");
+      console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  proposal.command("show").description("Show full proposal details").argument("<id>", "Proposal ID").action(async (idStr) => {
+    const spinner = ora5("Loading proposal...").start();
+    try {
+      const id = parseBigIntArg(idStr, "proposal ID");
+      const p = await getProposal(id);
+      const state = await getProposalState(id);
+      const calls = await getProposalCalls(id);
+      const params = await getGovernorParams();
+      spinner.stop();
+      const stateLabel = PROPOSAL_STATES[state] || "Unknown";
+      const totalVotes = p.votesFor + p.votesAgainst;
+      const quorumNeeded = totalVotes > 0n ? `${Number(params.quorumBps) / 100}%` : "\u2014";
+      console.log();
+      console.log(LABEL(`  \u25C6 Proposal #${p.id}`));
+      SEP();
+      if (p.metadataURI && p.metadataURI.startsWith("ipfs://")) {
+        try {
+          const meta = await fetchMetadata(p.metadataURI);
+          console.log(W(`  Name:             ${BOLD(meta.name)}`));
+          console.log(W(`  Description:      ${DIM(meta.description)}`));
+        } catch {
+          console.log(W(`  Metadata:         ${DIM(p.metadataURI)}`));
+        }
+      } else if (p.metadataURI) {
+        console.log(W(`  Metadata:         ${DIM(p.metadataURI)}`));
+      }
+      console.log(W(`  State:            ${BOLD(stateLabel)}`));
+      console.log(W(`  Proposer:         ${G(p.proposer)}`));
+      console.log(W(`  Vault:            ${G(p.vault)}`));
+      console.log(W(`  Performance Fee:  ${Number(p.performanceFeeBps) / 100}%`));
+      console.log(W(`  Duration:         ${formatDurationShort(p.strategyDuration)}`));
+      console.log();
+      console.log(LABEL("  Timestamps"));
+      console.log(W(`  Snapshot:         ${formatTimestamp(p.snapshotTimestamp)}`));
+      console.log(W(`  Vote End:         ${formatTimestamp(p.voteEnd)}`));
+      console.log(W(`  Execute By:       ${formatTimestamp(p.executeBy)}`));
+      console.log(W(`  Executed At:      ${formatTimestamp(p.executedAt)}`));
+      console.log();
+      console.log(LABEL("  Votes"));
+      console.log(W(`  For:              ${formatShares(p.votesFor)}`));
+      console.log(W(`  Against:          ${formatShares(p.votesAgainst)}`));
+      console.log(W(`  Quorum:           ${quorumNeeded}`));
+      if (state === 4 || state === 5) {
+        try {
+          const cap = await getCapitalSnapshot(id);
+          console.log();
+          console.log(LABEL("  Capital"));
+          console.log(W(`  Snapshot:         ${formatUSDC(cap)}`));
+        } catch {
+        }
+      }
+      console.log();
+      console.log(LABEL(`  Calls (${calls.length}, split at ${p.splitIndex})`));
+      for (let i = 0; i < calls.length; i++) {
+        const phase = BigInt(i) < p.splitIndex ? "execute" : "settle";
+        console.log(DIM(`  [${i}] (${phase}) target=${calls[i].target}`));
+        console.log(DIM(`       data=${calls[i].data.slice(0, 20)}...  value=${calls[i].value}`));
+      }
+      SEP();
+      console.log();
+    } catch (err) {
+      spinner.fail("Failed to load proposal");
+      console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  proposal.command("vote").description("Cast a vote on a pending proposal").requiredOption("--id <proposalId>", "Proposal ID").requiredOption("--support <yes|no>", "Vote direction: yes or no").action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const support = opts.support.toLowerCase() === "yes";
+      const account = getAccount();
+      const spinner = ora5("Loading proposal...").start();
+      const p = await getProposal(proposalId);
+      const state = await getProposalState(proposalId);
+      if (state !== 0) {
+        spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"}, not Pending`);
+        process.exit(1);
+      }
+      const alreadyVoted = await hasVoted(proposalId, account.address);
+      if (alreadyVoted) {
+        spinner.fail("You have already voted on this proposal");
+        process.exit(1);
+      }
+      const weight = await getVoteWeight(proposalId, account.address);
+      spinner.stop();
+      console.log();
+      console.log(LABEL("  \u25C6 Cast Vote"));
+      SEP();
+      console.log(W(`  Proposal:  #${proposalId}`));
+      console.log(W(`  Vault:     ${G(p.vault)}`));
+      console.log(W(`  Support:   ${support ? G("YES") : chalk5.red("NO")}`));
+      console.log(W(`  Weight:    ${formatShares(weight)} shares`));
+      SEP();
+      const voteSpinner = ora5({ text: W("Submitting vote..."), color: "green" }).start();
+      const hash = await vote(proposalId, support);
+      voteSpinner.succeed(G("Vote cast"));
+      console.log(DIM(`  ${getExplorerUrl(hash)}`));
+      console.log();
+    } catch (err) {
+      console.error(chalk5.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}`));
+      process.exit(1);
+    }
+  });
+  proposal.command("execute").description("Execute an approved proposal").requiredOption("--id <proposalId>", "Proposal ID").action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const spinner = ora5("Loading proposal...").start();
+      const state = await getProposalState(proposalId);
+      if (state !== 1) {
+        spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"}, not Approved`);
+        process.exit(1);
+      }
+      spinner.text = W("Executing proposal...");
+      const hash = await executeProposal(proposalId);
+      spinner.succeed(G("Proposal executed"));
+      console.log(DIM(`  ${getExplorerUrl(hash)}`));
+      try {
+        const cap = await getCapitalSnapshot(proposalId);
+        console.log(DIM(`  Capital snapshot: ${formatUSDC(cap)}`));
+      } catch {
+      }
+      console.log();
+    } catch (err) {
+      console.error(chalk5.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}`));
+      process.exit(1);
+    }
+  });
+  proposal.command("settle").description("Settle an executed proposal (auto-routes settlement path)").requiredOption("--id <proposalId>", "Proposal ID").option("--calls <path>", "Path to JSON file with settle Call[] (for agent/emergency settle)").action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const account = getAccount();
+      const spinner = ora5("Loading proposal...").start();
+      const p = await getProposal(proposalId);
+      const state = await getProposalState(proposalId);
+      if (state !== 4) {
+        spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"}, not Executed`);
+        process.exit(1);
+      }
+      const isProposer = account.address.toLowerCase() === p.proposer.toLowerCase();
+      const now = BigInt(Math.floor(Date.now() / 1e3));
+      const durationElapsed = p.executedAt > 0n && now >= p.executedAt + p.strategyDuration;
+      let hash;
+      if (isProposer && opts.calls) {
+        spinner.text = W("Settling by agent...");
+        const calls = parseCallsFile(opts.calls);
+        hash = await settleByAgent(proposalId, calls);
+        spinner.succeed(G("Settled by agent"));
+      } else if (durationElapsed && !opts.calls) {
+        spinner.text = W("Settling (permissionless)...");
+        hash = await settleProposal(proposalId);
+        spinner.succeed(G("Settled (permissionless)"));
+      } else if (durationElapsed && opts.calls) {
+        spinner.text = W("Emergency settling...");
+        const calls = parseCallsFile(opts.calls);
+        hash = await emergencySettle(proposalId, calls);
+        spinner.succeed(G("Emergency settled"));
+      } else {
+        spinner.fail("Cannot settle: duration not elapsed. If you are the proposer, provide --calls.");
+        process.exit(1);
+      }
+      console.log(DIM(`  ${getExplorerUrl(hash)}`));
+      console.log();
+    } catch (err) {
+      console.error(chalk5.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}`));
+      process.exit(1);
+    }
+  });
+  proposal.command("cancel").description("Cancel a proposal (proposer or vault owner)").requiredOption("--id <proposalId>", "Proposal ID").option("--emergency", "Emergency cancel (vault owner only, any non-settled state)").action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const spinner = ora5("Loading proposal...").start();
+      const state = await getProposalState(proposalId);
+      if (state === 5 || state === 6) {
+        spinner.fail(`Proposal is already ${PROPOSAL_STATES[state]}`);
+        process.exit(1);
+      }
+      let hash;
+      if (opts.emergency) {
+        spinner.text = W("Emergency cancelling...");
+        hash = await emergencyCancel(proposalId);
+        spinner.succeed(G("Emergency cancelled"));
+      } else {
+        if (state !== 0 && state !== 1) {
+          spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 use --emergency for non-pending/approved`);
+          process.exit(1);
+        }
+        spinner.text = W("Cancelling proposal...");
+        hash = await cancelProposal(proposalId);
+        spinner.succeed(G("Proposal cancelled"));
+      }
+      console.log(DIM(`  ${getExplorerUrl(hash)}`));
+      console.log();
+    } catch (err) {
+      console.error(chalk5.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}`));
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/governor.ts
+import chalk6 from "chalk";
+import ora6 from "ora";
+var G2 = chalk6.green;
+var W2 = chalk6.white;
+var DIM2 = chalk6.gray;
+var BOLD2 = chalk6.white.bold;
+var LABEL2 = chalk6.green.bold;
+var SEP2 = () => console.log(DIM2("\u2500".repeat(60)));
+function registerGovernorCommands(program2) {
+  const governor = program2.command("governor").description("Governor parameters and vault management");
+  governor.command("info").description("Display current governor parameters and registered vaults").action(async () => {
+    const spinner = ora6("Loading governor info...").start();
+    try {
+      const [params, vaults] = await Promise.all([
+        getGovernorParams(),
+        getRegisteredVaults()
+      ]);
+      spinner.stop();
+      console.log();
+      console.log(LABEL2("  \u25C6 Governor Parameters"));
+      SEP2();
+      console.log(W2(`  Address:              ${G2(getGovernorAddress())}`));
+      console.log(W2(`  Voting Period:        ${BOLD2(formatDurationLong(params.votingPeriod))}`));
+      console.log(W2(`  Execution Window:     ${BOLD2(formatDurationLong(params.executionWindow))}`));
+      console.log(W2(`  Quorum:               ${BOLD2(`${Number(params.quorumBps) / 100}%`)}`));
+      console.log(W2(`  Max Performance Fee:  ${BOLD2(`${Number(params.maxPerformanceFeeBps) / 100}%`)}`));
+      console.log(W2(`  Max Strategy Duration:${BOLD2(` ${formatDurationLong(params.maxStrategyDuration)}`)}`));
+      console.log(W2(`  Cooldown Period:      ${BOLD2(formatDurationLong(params.cooldownPeriod))}`));
+      console.log();
+      console.log(LABEL2(`  Registered Vaults (${vaults.length})`));
+      if (vaults.length === 0) {
+        console.log(DIM2("  (none)"));
+      } else {
+        for (const v of vaults) {
+          console.log(W2(`    ${G2(v)}`));
+        }
+      }
+      SEP2();
+      console.log();
+    } catch (err) {
+      spinner.fail("Failed to load governor info");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-voting-period").description("Set the voting period (owner only)").requiredOption("--seconds <n>", "New voting period in seconds").action(async (opts) => {
+    const spinner = ora6("Setting voting period...").start();
+    try {
+      const hash = await setVotingPeriod(parseBigIntArg(opts.seconds, "seconds"));
+      spinner.succeed(G2(`Voting period updated to ${opts.seconds}s`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set voting period");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-execution-window").description("Set the execution window (owner only)").requiredOption("--seconds <n>", "New execution window in seconds").action(async (opts) => {
+    const spinner = ora6("Setting execution window...").start();
+    try {
+      const hash = await setExecutionWindow(parseBigIntArg(opts.seconds, "seconds"));
+      spinner.succeed(G2(`Execution window updated to ${opts.seconds}s`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set execution window");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-quorum").description("Set the quorum threshold in bps (owner only)").requiredOption("--bps <n>", "New quorum in bps (e.g. 4000 = 40%)").action(async (opts) => {
+    const spinner = ora6("Setting quorum...").start();
+    try {
+      const hash = await setQuorumBps(parseBigIntArg(opts.bps, "bps"));
+      spinner.succeed(G2(`Quorum updated to ${Number(opts.bps) / 100}%`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set quorum");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-max-fee").description("Set the max performance fee in bps (owner only)").requiredOption("--bps <n>", "New max fee in bps (e.g. 3000 = 30%)").action(async (opts) => {
+    const spinner = ora6("Setting max fee...").start();
+    try {
+      const hash = await setMaxPerformanceFeeBps(parseBigIntArg(opts.bps, "bps"));
+      spinner.succeed(G2(`Max performance fee updated to ${Number(opts.bps) / 100}%`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set max fee");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-max-duration").description("Set the max strategy duration in seconds (owner only)").requiredOption("--seconds <n>", "New max duration in seconds").action(async (opts) => {
+    const spinner = ora6("Setting max duration...").start();
+    try {
+      const hash = await setMaxStrategyDuration(parseBigIntArg(opts.seconds, "seconds"));
+      spinner.succeed(G2(`Max strategy duration updated to ${opts.seconds}s`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set max duration");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+  governor.command("set-cooldown").description("Set the cooldown period in seconds (owner only)").requiredOption("--seconds <n>", "New cooldown in seconds").action(async (opts) => {
+    const spinner = ora6("Setting cooldown...").start();
+    try {
+      const hash = await setCooldownPeriod(parseBigIntArg(opts.seconds, "seconds"));
+      spinner.succeed(G2(`Cooldown period updated to ${opts.seconds}s`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set cooldown");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
+}
+
+// src/index.ts
+try {
+  loadDotenv();
+} catch {
+}
+async function loadXmtp() {
+  return import("./xmtp-S4VRXMFK.js");
+}
+var G3 = chalk7.green;
+var W3 = chalk7.white;
+var DIM3 = chalk7.gray;
+var BOLD3 = chalk7.white.bold;
+var LABEL3 = chalk7.green.bold;
+var SEP3 = () => console.log(DIM3("\u2500".repeat(60)));
 function resolveVault(opts) {
   if (opts.vault) {
     setVaultAddress(opts.vault);
   }
 }
 var program = new Command();
-program.name("sherwood").description("CLI for agent-managed investment syndicates").version("0.1.0").option("--testnet", "Use Base Sepolia testnet instead of Base mainnet", false).hook("preAction", (thisCommand) => {
+program.name("sherwood").description("CLI for agent-managed investment syndicates").version("0.1.0").addOption(
+  new Option("--chain <network>", "Target network").choices(VALID_NETWORKS).default("base")
+).option("--testnet", "Alias for --chain base-sepolia (deprecated)", false).hook("preAction", (thisCommand) => {
   const opts = thisCommand.optsWithGlobals();
-  setNetwork(opts.testnet ? "base-sepolia" : "base");
+  let network = opts.chain;
   if (opts.testnet) {
-    console.log(chalk5.yellow("[testnet] Base Sepolia"));
+    if (network !== "base") {
+      console.warn(
+        chalk7.yellow("[warn] --testnet ignored, --chain takes precedence")
+      );
+    } else {
+      network = "base-sepolia";
+    }
+  }
+  setNetwork(network);
+  if (getNetwork() !== "base") {
+    console.log(chalk7.yellow(`[${getNetwork()}]`));
   }
 });
 var syndicate = program.command("syndicate");
-syndicate.command("create").description("Create a new syndicate via the factory (interactive)").option("--subdomain <name>", "ENS subdomain (skip prompt)").option("--name <name>", "Syndicate name (skip prompt)").option("--agent-id <id>", "ERC-8004 agent identity token ID (skip prompt)").option("--asset <symbol-or-address>", "Vault asset: USDC, WETH, or a token address").option("--description <text>", "Short description").option("--metadata-uri <uri>", "Override metadata URI (skip IPFS upload)").option("--open-deposits", "Allow anyone to deposit (no whitelist)").option("--public-chat", "Enable dashboard spectator mode", false).action(async (opts) => {
+syndicate.command("create").description("Create a new syndicate via the factory (interactive)").option("--subdomain <name>", "ENS subdomain (skip prompt)").option("--name <name>", "Syndicate name (skip prompt)").option("--agent-id <id>", "ERC-8004 agent identity token ID (skip prompt)").option("--asset <symbol-or-address>", "Vault asset: USDC, WETH, or a token address").option("--description <text>", "Short description").option("--metadata-uri <uri>", "Override metadata URI (skip IPFS upload)").option("--open-deposits", "Allow anyone to deposit (no whitelist)").option("--public-chat", "Enable dashboard spectator mode", false).option("-y, --yes", "Skip confirmation prompt (non-interactive mode)", false).action(async (opts) => {
   try {
     console.log();
-    console.log(LABEL("  \u25C6 Create Syndicate"));
-    SEP();
+    console.log(LABEL3("  \u25C6 Create Syndicate"));
+    SEP3();
     const wallet = getAccount();
-    console.log(DIM(`  Wallet:  ${wallet.address}`));
-    console.log(DIM(`  Network: ${getChain().name}`));
-    SEP();
+    console.log(DIM3(`  Wallet:  ${wallet.address}`));
+    console.log(DIM3(`  Network: ${getChain().name}`));
+    SEP3();
     const savedAgentId = getAgentId();
-    const name = opts.name || await input({
-      message: G("Syndicate name"),
+    const nonInteractive = opts.yes;
+    const name = opts.name || (nonInteractive ? (() => {
+      throw new Error("--name is required in non-interactive mode (-y)");
+    })() : await input({
+      message: G3("Syndicate name"),
       validate: (v) => v.length > 0 || "Name is required"
-    });
-    const subdomain = opts.subdomain || await input({
-      message: G("ENS subdomain"),
+    }));
+    const subdomain = opts.subdomain || (nonInteractive ? name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "") : await input({
+      message: G3("ENS subdomain"),
       default: name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, ""),
       validate: (v) => v.length >= 3 || "Must be at least 3 characters"
-    });
-    const description = opts.description || await input({
-      message: G("Description"),
+    }));
+    const description = opts.description || (nonInteractive ? `${name} \u2014 a Sherwood syndicate` : await input({
+      message: G3("Description"),
       default: `${name} \u2014 a Sherwood syndicate`
-    });
-    const agentIdStr = opts.agentId || (savedAgentId ? await input({ message: G("Agent ID (ERC-8004)"), default: String(savedAgentId) }) : await input({ message: G("Agent ID (ERC-8004)"), validate: (v) => /^\d+$/.test(v) || "Must be a number" }));
-    const openDeposits = opts.openDeposits !== void 0 ? opts.openDeposits : await confirm({
-      message: G("Open deposits? (anyone can deposit)"),
+    }));
+    const agentIdStr = opts.agentId || (savedAgentId ? nonInteractive ? String(savedAgentId) : await input({ message: G3("Agent ID (ERC-8004)"), default: String(savedAgentId) }) : nonInteractive ? "0" : await input({ message: G3("Agent ID (ERC-8004)"), validate: (v) => /^\d+$/.test(v) || "Must be a number" }));
+    const openDeposits = opts.openDeposits !== void 0 ? opts.openDeposits : nonInteractive ? true : await confirm({
+      message: G3("Open deposits? (anyone can deposit)"),
       default: true
     });
     const ASSET_SYMBOLS = {
@@ -1743,12 +2580,14 @@ syndicate.command("create").description("Create a new syndicate via the factory
         asset = opts.asset;
       } else {
         const supported = Object.keys(ASSET_SYMBOLS).join(", ");
-        console.error(chalk5.red(`  Unknown asset "${opts.asset}". Use a symbol (${supported}) or a 0x address.`));
+        console.error(chalk7.red(`  Unknown asset "${opts.asset}". Use a symbol (${supported}) or a 0x address.`));
         process.exit(1);
       }
+    } else if (nonInteractive) {
+      asset = TOKENS().USDC !== "0x0000000000000000000000000000000000000000" ? ASSET_SYMBOLS.USDC : ASSET_SYMBOLS.WETH;
     } else {
       const assetChoice = await select({
-        message: G("Vault asset (what token do depositors provide?)"),
+        message: G3("Vault asset (what token do depositors provide?)"),
         choices: [
           { name: "USDC", value: "USDC", description: "USD Coin (6 decimals)" },
           { name: "WETH", value: "WETH", description: "Wrapped Ether (18 decimals)" }
@@ -1763,24 +2602,26 @@ syndicate.command("create").description("Create a new syndicate via the factory
     ]);
     const symbol = `sw${assetSymbol}`;
     console.log();
-    console.log(LABEL("  \u25C6 Review"));
-    SEP();
-    console.log(W(`  Name:         ${BOLD(name)}`));
-    console.log(W(`  ENS:          ${G(`${subdomain}.sherwoodagent.eth`)}`));
-    console.log(W(`  Description:  ${DIM(description)}`));
-    console.log(W(`  Agent ID:     #${agentIdStr}`));
-    console.log(W(`  Asset:        ${assetSymbol} (${asset.slice(0, 10)}...)`));
-    console.log(W(`  Share token:  ${symbol}`));
-    console.log(W(`  Open deposits: ${openDeposits ? G("yes") : chalk5.red("no (whitelist)")}`));
-    SEP();
-    const go = await confirm({ message: G("Deploy syndicate?"), default: true });
-    if (!go) {
-      console.log(DIM("  Cancelled."));
-      return;
+    console.log(LABEL3("  \u25C6 Review"));
+    SEP3();
+    console.log(W3(`  Name:         ${BOLD3(name)}`));
+    console.log(W3(`  ENS:          ${G3(`${subdomain}.sherwoodagent.eth`)}`));
+    console.log(W3(`  Description:  ${DIM3(description)}`));
+    console.log(W3(`  Agent ID:     #${agentIdStr}`));
+    console.log(W3(`  Asset:        ${assetSymbol} (${asset.slice(0, 10)}...)`));
+    console.log(W3(`  Share token:  ${symbol}`));
+    console.log(W3(`  Open deposits: ${openDeposits ? G3("yes") : chalk7.red("no (whitelist)")}`));
+    SEP3();
+    if (!nonInteractive) {
+      const go = await confirm({ message: G3("Deploy syndicate?"), default: true });
+      if (!go) {
+        console.log(DIM3("  Cancelled."));
+        return;
+      }
     }
     let metadataURI = opts.metadataUri || "";
     if (!metadataURI) {
-      const spinner2 = ora5({ text: W("Uploading metadata to IPFS..."), color: "green" }).start();
+      const spinner2 = ora7({ text: W3("Uploading metadata to IPFS..."), color: "green" }).start();
       try {
         const metadata = {
           schema: "sherwood/syndicate/v1",
@@ -1795,14 +2636,14 @@ syndicate.command("create").description("Create a new syndicate via the factory
           links: {}
         };
         metadataURI = await uploadMetadata(metadata);
-        spinner2.succeed(G(`Metadata pinned: ${DIM(metadataURI)}`));
+        spinner2.succeed(G3(`Metadata pinned: ${DIM3(metadataURI)}`));
       } catch (err) {
-        spinner2.warn(chalk5.yellow(`IPFS upload failed \u2014 using inline metadata`));
+        spinner2.warn(chalk7.yellow(`IPFS upload failed \u2014 using inline metadata`));
         const json = JSON.stringify({ name, description, subdomain, asset: assetSymbol, openDeposits, createdBy: "@sherwoodagent/cli" });
         metadataURI = `data:application/json;base64,${Buffer.from(json).toString("base64")}`;
       }
     }
-    const spinner = ora5({ text: W("Deploying vault via factory..."), color: "green" }).start();
+    const spinner = ora7({ text: W3("Deploying vault via factory..."), color: "green" }).start();
     const result = await createSyndicate({
       creatorAgentId: BigInt(agentIdStr),
       metadataURI,
@@ -1813,21 +2654,19 @@ syndicate.command("create").description("Create a new syndicate via the factory
       subdomain
     });
     setChainContract(getChain().id, "vault", result.vault);
-    spinner.text = W("Registering creator as agent...");
+    spinner.text = W3("Registering creator as agent...");
     try {
       setVaultAddress(result.vault);
       const creatorAddress = getAccount().address;
       await registerAgent(
         BigInt(agentIdStr),
-        creatorAddress,
-        // pkp = creator EOA (direct execution)
         creatorAddress
-        // operator = creator EOA
+        // agentAddress = creator EOA (direct execution)
       );
     } catch (regErr) {
-      console.warn(chalk5.yellow("\n  \u26A0 Could not auto-register creator as agent \u2014 register manually with `syndicate add`"));
+      console.warn(chalk7.yellow("\n  \u26A0 Could not auto-register creator as agent \u2014 register manually with `syndicate add`"));
     }
-    spinner.text = W("Setting up chat...");
+    spinner.text = W3("Setting up chat...");
     try {
       const xmtp = await loadXmtp();
       const xmtpClient = await xmtp.getXmtpClient();
@@ -1835,30 +2674,30 @@ syndicate.command("create").description("Create a new syndicate via the factory
       await setTextRecord(subdomain, "xmtpGroupId", groupId, result.vault);
       cacheGroupId(subdomain, groupId);
     } catch {
-      console.warn(chalk5.yellow("\n  \u26A0 Could not create XMTP chat group"));
-      console.warn(chalk5.dim(`    Recover later with: sherwood chat ${subdomain} init`));
+      console.warn(chalk7.yellow("\n  \u26A0 Could not create XMTP chat group"));
+      console.warn(chalk7.dim(`    Recover later with: sherwood chat ${subdomain} init`));
     }
     spinner.stop();
     console.log();
-    console.log(LABEL("  \u25C6 Syndicate Created"));
-    SEP();
-    console.log(W(`  ID:       ${G(`#${result.syndicateId}`)}`));
-    console.log(W(`  Vault:    ${G(result.vault)}`));
-    console.log(W(`  ENS:      ${G(`${subdomain}.sherwoodagent.eth`)}`));
-    console.log(W(`  Metadata: ${DIM(metadataURI.length > 50 ? metadataURI.slice(0, 50) + "..." : metadataURI)}`));
-    console.log(W(`  Explorer: ${DIM(getExplorerUrl(result.hash))}`));
-    console.log(W(`  Chat:     ${DIM(`sherwood chat ${subdomain}`)}`));
-    SEP();
-    console.log(G("  \u2713 Vault saved to ~/.sherwood/config.json"));
+    console.log(LABEL3("  \u25C6 Syndicate Created"));
+    SEP3();
+    console.log(W3(`  ID:       ${G3(`#${result.syndicateId}`)}`));
+    console.log(W3(`  Vault:    ${G3(result.vault)}`));
+    console.log(W3(`  ENS:      ${G3(`${subdomain}.sherwoodagent.eth`)}`));
+    console.log(W3(`  Metadata: ${DIM3(metadataURI.length > 50 ? metadataURI.slice(0, 50) + "..." : metadataURI)}`));
+    console.log(W3(`  Explorer: ${DIM3(getExplorerUrl(result.hash))}`));
+    console.log(W3(`  Chat:     ${DIM3(`sherwood chat ${subdomain}`)}`));
+    SEP3();
+    console.log(G3("  \u2713 Vault saved to ~/.sherwood/config.json"));
     console.log();
   } catch (err) {
-    console.error(chalk5.red(`
+    console.error(chalk7.red(`
   \u2716 ${err instanceof Error ? err.message : String(err)}`));
     process.exit(1);
   }
 });
 syndicate.command("list").description("List active syndicates (queries subgraph, falls back to on-chain)").option("--creator <address>", "Filter by creator address").action(async (opts) => {
-  const spinner = ora5("Loading syndicates...").start();
+  const spinner = ora7("Loading syndicates...").start();
   try {
     let syndicates;
     if (process.env.SUBGRAPH_URL) {
@@ -1877,65 +2716,65 @@ syndicate.command("list").description("List active syndicates (queries subgraph,
     }
     spinner.stop();
     if (syndicates.length === 0) {
-      console.log(chalk5.dim("No active syndicates found."));
+      console.log(chalk7.dim("No active syndicates found."));
       return;
     }
     console.log();
-    console.log(chalk5.bold(`Active Syndicates (${syndicates.length})`));
+    console.log(chalk7.bold(`Active Syndicates (${syndicates.length})`));
     if (!process.env.SUBGRAPH_URL) {
-      console.log(chalk5.dim("  (Set SUBGRAPH_URL for faster indexed queries)"));
+      console.log(chalk7.dim("  (Set SUBGRAPH_URL for faster indexed queries)"));
     }
-    console.log(chalk5.dim("\u2500".repeat(70)));
+    console.log(chalk7.dim("\u2500".repeat(70)));
     for (const s of syndicates) {
       const ts = typeof s.createdAt === "string" ? Number(s.createdAt) : Number(s.createdAt);
       const date = new Date(ts * 1e3).toLocaleDateString();
       const ensName = s.subdomain ? `${s.subdomain}.sherwoodagent.eth` : "";
-      console.log(`  #${s.id}  ${chalk5.bold(ensName || String(s.vault))}`);
-      if (ensName) console.log(`    Vault:   ${chalk5.cyan(String(s.vault))}`);
+      console.log(`  #${s.id}  ${chalk7.bold(ensName || String(s.vault))}`);
+      if (ensName) console.log(`    Vault:   ${chalk7.cyan(String(s.vault))}`);
       console.log(`    Creator: ${s.creator}`);
       console.log(`    Created: ${date}`);
       if (s.totalDeposits) {
         console.log(`    Deposits: ${s.totalDeposits} USDC`);
       }
       if (s.metadataURI) {
-        console.log(`    Metadata: ${chalk5.dim(s.metadataURI)}`);
+        console.log(`    Metadata: ${chalk7.dim(s.metadataURI)}`);
       }
       console.log();
     }
   } catch (err) {
     spinner.fail("Failed to load syndicates");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("info").description("Display syndicate details by ID").argument("<id>", "Syndicate ID").action(async (idStr) => {
-  const spinner = ora5("Loading syndicate info...").start();
+  const spinner = ora7("Loading syndicate info...").start();
   try {
     const id = BigInt(idStr);
     const info = await getSyndicate(id);
     spinner.stop();
     if (!info.vault || info.vault === "0x0000000000000000000000000000000000000000") {
-      console.log(chalk5.red(`Syndicate #${id} not found.`));
+      console.log(chalk7.red(`Syndicate #${id} not found.`));
       process.exit(1);
     }
     const date = new Date(Number(info.createdAt) * 1e3).toLocaleDateString();
     console.log();
-    console.log(chalk5.bold(`Syndicate #${info.id}`));
-    console.log(chalk5.dim("\u2500".repeat(40)));
+    console.log(chalk7.bold(`Syndicate #${info.id}`));
+    console.log(chalk7.dim("\u2500".repeat(40)));
     if (info.subdomain) {
-      console.log(`  ENS:        ${chalk5.bold(`${info.subdomain}.sherwoodagent.eth`)}`);
+      console.log(`  ENS:        ${chalk7.bold(`${info.subdomain}.sherwoodagent.eth`)}`);
     }
-    console.log(`  Vault:      ${chalk5.cyan(info.vault)}`);
+    console.log(`  Vault:      ${chalk7.cyan(info.vault)}`);
     console.log(`  Creator:    ${info.creator}`);
     console.log(`  Created:    ${date}`);
-    console.log(`  Active:     ${info.active ? chalk5.green("yes") : chalk5.red("no")}`);
+    console.log(`  Active:     ${info.active ? chalk7.green("yes") : chalk7.red("no")}`);
     if (info.metadataURI) {
-      console.log(`  Metadata:   ${chalk5.dim(info.metadataURI)}`);
+      console.log(`  Metadata:   ${chalk7.dim(info.metadataURI)}`);
     }
     setVaultAddress(info.vault);
     const vaultInfo = await getVaultInfo();
     console.log();
-    console.log(chalk5.bold("  Vault Stats"));
+    console.log(chalk7.bold("  Vault Stats"));
     console.log(`    Total Assets:       ${vaultInfo.totalAssets}`);
     console.log(`    Agent Count:        ${vaultInfo.agentCount}`);
     console.log(`    Redemptions Locked: ${vaultInfo.redemptionsLocked}`);
@@ -1943,12 +2782,12 @@ syndicate.command("info").description("Display syndicate details by ID").argumen
     console.log();
   } catch (err) {
     spinner.fail("Failed to load syndicate info");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("update-metadata").description("Update syndicate metadata (creator only)").requiredOption("--id <id>", "Syndicate ID").option("--name <name>", "Syndicate name").option("--description <text>", "Short description").option("--uri <uri>", "Direct metadata URI (skips IPFS upload)").action(async (opts) => {
-  const spinner = ora5({ text: W("Loading syndicate..."), color: "green" }).start();
+  const spinner = ora7({ text: W3("Loading syndicate..."), color: "green" }).start();
   try {
     const syndicateId = BigInt(opts.id);
     let metadataURI = opts.uri;
@@ -1960,7 +2799,7 @@ syndicate.command("update-metadata").description("Update syndicate metadata (cre
       }
       const name = opts.name || info.subdomain;
       const description = opts.description || `${name} \u2014 a Sherwood syndicate on ${info.subdomain}.sherwoodagent.eth`;
-      spinner.text = W("Uploading metadata to IPFS...");
+      spinner.text = W3("Uploading metadata to IPFS...");
       const metadata = {
         schema: "sherwood/syndicate/v1",
         name,
@@ -1971,46 +2810,46 @@ syndicate.command("update-metadata").description("Update syndicate metadata (cre
         links: {}
       };
       metadataURI = await uploadMetadata(metadata);
-      spinner.text = W("Updating on-chain metadata...");
+      spinner.text = W3("Updating on-chain metadata...");
     }
     const hash = await updateMetadata(syndicateId, metadataURI);
-    spinner.succeed(G(`Metadata updated`));
-    console.log(DIM(`  IPFS: ${metadataURI}`));
-    console.log(DIM(`  ${getExplorerUrl(hash)}`));
+    spinner.succeed(G3(`Metadata updated`));
+    console.log(DIM3(`  IPFS: ${metadataURI}`));
+    console.log(DIM3(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Metadata update failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("approve-depositor").description("Approve an address to deposit (owner only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--depositor <address>", "Address to approve").action(async (opts) => {
   resolveVault(opts);
-  const spinner = ora5("Approving depositor...").start();
+  const spinner = ora7("Approving depositor...").start();
   try {
     const hash = await approveDepositor(opts.depositor);
     spinner.succeed(`Depositor approved: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Approval failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("remove-depositor").description("Remove an address from the depositor whitelist (owner only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--depositor <address>", "Address to remove").action(async (opts) => {
   resolveVault(opts);
-  const spinner = ora5("Removing depositor...").start();
+  const spinner = ora7("Removing depositor...").start();
   try {
     const hash = await removeDepositor(opts.depositor);
     spinner.succeed(`Depositor removed: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Removal failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
-syndicate.command("add").description("Register an agent on a syndicate vault (creator only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").action(async (opts) => {
-  const spinner = ora5("Verifying creator...").start();
+syndicate.command("add").description("Register an agent on a syndicate vault (creator only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--wallet <address>", "Agent wallet address").action(async (opts) => {
+  const spinner = ora7("Verifying creator...").start();
   try {
     resolveVault(opts);
     const vaultAddress = getVaultAddress();
@@ -2023,35 +2862,34 @@ syndicate.command("add").description("Register an agent on a syndicate vault (cr
     spinner.text = "Registering agent...";
     const hash = await registerAgent(
       BigInt(opts.agentId),
-      opts.pkp,
-      opts.eoa
+      opts.wallet
     );
     spinner.succeed(`Agent registered: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
     try {
       const xmtp = await loadXmtp();
       const xmtpClient = await xmtp.getXmtpClient();
       const group = await xmtp.getGroup(xmtpClient, subdomain);
-      await xmtp.addMember(group, opts.pkp);
+      await xmtp.addMember(group, opts.wallet);
       await xmtp.sendEnvelope(group, {
         type: "AGENT_REGISTERED",
-        agent: { erc8004Id: Number(opts.agentId), address: opts.pkp },
+        agent: { erc8004Id: Number(opts.agentId), address: opts.wallet },
         syndicate: subdomain,
         timestamp: Math.floor(Date.now() / 1e3)
       });
-      console.log(chalk5.dim(`  Added to chat: ${subdomain}`));
+      console.log(chalk7.dim(`  Added to chat: ${subdomain}`));
     } catch {
-      console.warn(chalk5.yellow("  \u26A0 Could not add agent to chat group"));
-      console.warn(chalk5.dim(`    If no group exists, run: sherwood chat ${subdomain} init`));
+      console.warn(chalk7.yellow("  \u26A0 Could not add agent to chat group"));
+      console.warn(chalk7.dim(`    If no group exists, run: sherwood chat ${subdomain} init`));
     }
   } catch (err) {
     spinner.fail("Registration failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("join").description("Request to join a syndicate (creates an EAS attestation)").requiredOption("--subdomain <name>", "Syndicate subdomain to join").option("--message <text>", "Message to the creator", "Requesting to join your syndicate").action(async (opts) => {
-  const spinner = ora5("Resolving syndicate...").start();
+  const spinner = ora7("Resolving syndicate...").start();
   try {
     const agentId = getAgentId();
     if (!agentId) {
@@ -2068,9 +2906,9 @@ syndicate.command("join").description("Request to join a syndicate (creates an E
       try {
         const xmtp = await loadXmtp();
         await xmtp.getXmtpClient();
-        console.log(chalk5.dim("  XMTP identity ready"));
+        console.log(chalk7.dim("  XMTP identity ready"));
       } catch {
-        console.warn(chalk5.yellow("  \u26A0 Could not initialize XMTP identity"));
+        console.warn(chalk7.yellow("  \u26A0 Could not initialize XMTP identity"));
       }
       return;
     }
@@ -2081,14 +2919,14 @@ syndicate.command("join").description("Request to join a syndicate (creates an E
     );
     if (existingRequest) {
       spinner.succeed("You already have a pending join request for this syndicate");
-      console.log(chalk5.dim(`  Attestation: ${existingRequest.uid}`));
-      console.log(chalk5.dim(`  Submitted:   ${new Date(existingRequest.time * 1e3).toLocaleString()}`));
+      console.log(chalk7.dim(`  Attestation: ${existingRequest.uid}`));
+      console.log(chalk7.dim(`  Submitted:   ${new Date(existingRequest.time * 1e3).toLocaleString()}`));
       try {
         const xmtp = await loadXmtp();
         await xmtp.getXmtpClient();
-        console.log(chalk5.dim("  XMTP identity ready"));
+        console.log(chalk7.dim("  XMTP identity ready"));
       } catch {
-        console.warn(chalk5.yellow("  \u26A0 Could not initialize XMTP identity"));
+        console.warn(chalk7.yellow("  \u26A0 Could not initialize XMTP identity"));
       }
       return;
     }
@@ -2107,29 +2945,29 @@ syndicate.command("join").description("Request to join a syndicate (creates an E
       spinner.succeed("Join request created (XMTP identity ready)");
     } catch {
       spinner.succeed("Join request created");
-      console.warn(chalk5.yellow("  \u26A0 Could not initialize XMTP identity \u2014 creator may not be able to auto-add you to chat"));
+      console.warn(chalk7.yellow("  \u26A0 Could not initialize XMTP identity \u2014 creator may not be able to auto-add you to chat"));
     }
     console.log();
-    console.log(LABEL("  \u25C6 Join Request Submitted"));
-    SEP();
-    console.log(W(`  Syndicate:    ${G(`${opts.subdomain}.sherwoodagent.eth`)}`));
-    console.log(W(`  Agent ID:     #${agentId}`));
-    console.log(W(`  Creator:      ${DIM(syndicate2.creator)}`));
-    console.log(W(`  Attestation:  ${DIM(uid)}`));
-    console.log(W(`  EAS Scan:     ${DIM(getEasScanUrl(uid))}`));
-    console.log(W(`  Explorer:     ${DIM(getExplorerUrl(hash))}`));
-    SEP();
-    console.log(G("  \u2713 The creator can review with:"));
-    console.log(DIM(`    sherwood syndicate requests --subdomain ${opts.subdomain}`));
+    console.log(LABEL3("  \u25C6 Join Request Submitted"));
+    SEP3();
+    console.log(W3(`  Syndicate:    ${G3(`${opts.subdomain}.sherwoodagent.eth`)}`));
+    console.log(W3(`  Agent ID:     #${agentId}`));
+    console.log(W3(`  Creator:      ${DIM3(syndicate2.creator)}`));
+    console.log(W3(`  Attestation:  ${DIM3(uid)}`));
+    console.log(W3(`  EAS Scan:     ${DIM3(getEasScanUrl(uid))}`));
+    console.log(W3(`  Explorer:     ${DIM3(getExplorerUrl(hash))}`));
+    SEP3();
+    console.log(G3("  \u2713 The creator can review with:"));
+    console.log(DIM3(`    sherwood syndicate requests --subdomain ${opts.subdomain}`));
     console.log();
   } catch (err) {
     spinner.fail("Join request failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("requests").description("View pending join requests for a syndicate (creator only)").option("--subdomain <name>", "Syndicate subdomain").option("--vault <address>", "Vault address (default: from config)").action(async (opts) => {
-  const spinner = ora5("Loading join requests...").start();
+  const spinner = ora7("Loading join requests...").start();
   try {
     let creatorAddress;
     let subdomain;
@@ -2160,34 +2998,34 @@ syndicate.command("requests").description("View pending join requests for a synd
     );
     spinner.stop();
     if (requests.length === 0) {
-      console.log(DIM("\n  No pending join requests.\n"));
+      console.log(DIM3("\n  No pending join requests.\n"));
       return;
     }
     console.log();
-    console.log(LABEL(`  \u25C6 Pending Join Requests (${requests.length})`));
-    SEP();
+    console.log(LABEL3(`  \u25C6 Pending Join Requests (${requests.length})`));
+    SEP3();
     for (let i = 0; i < requests.length; i++) {
       const req = requests[i];
       const date = new Date(req.time * 1e3).toLocaleString();
-      console.log(W(`  ${i + 1}. Agent #${req.decoded.agentId} ${DIM(`(${req.attester})`)}`));
-      console.log(DIM(`     Message:     "${req.decoded.message}"`));
-      console.log(DIM(`     Requested:   ${date}`));
-      console.log(DIM(`     Attestation: ${req.uid}`));
+      console.log(W3(`  ${i + 1}. Agent #${req.decoded.agentId} ${DIM3(`(${req.attester})`)}`));
+      console.log(DIM3(`     Message:     "${req.decoded.message}"`));
+      console.log(DIM3(`     Requested:   ${date}`));
+      console.log(DIM3(`     Attestation: ${req.uid}`));
       console.log();
     }
-    console.log(G("  To approve:"));
-    console.log(DIM(`    sherwood syndicate approve --agent-id <id> --pkp <addr> --eoa <addr>`));
-    console.log(G("  To reject:"));
-    console.log(DIM(`    sherwood syndicate reject --attestation <uid>`));
+    console.log(G3("  To approve:"));
+    console.log(DIM3(`    sherwood syndicate approve --agent-id <id> --wallet <addr>`));
+    console.log(G3("  To reject:"));
+    console.log(DIM3(`    sherwood syndicate reject --attestation <uid>`));
     console.log();
   } catch (err) {
     spinner.fail("Failed to load requests");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
-syndicate.command("approve").description("Approve an agent join request (registers agent + creates EAS approval)").option("--vault <address>", "Vault address (default: from config)").option("--subdomain <name>", "Syndicate subdomain (alternative to --vault)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").action(async (opts) => {
-  const spinner = ora5("Verifying creator...").start();
+syndicate.command("approve").description("Approve an agent join request (registers agent + creates EAS approval)").option("--vault <address>", "Vault address (default: from config)").option("--subdomain <name>", "Syndicate subdomain (alternative to --vault)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--wallet <address>", "Agent wallet address").action(async (opts) => {
+  const spinner = ora7("Verifying creator...").start();
   try {
     if (opts.subdomain && !opts.vault) {
       const syndicateInfo = await resolveSyndicate(opts.subdomain);
@@ -2206,14 +3044,13 @@ syndicate.command("approve").description("Approve an agent join request (registe
     try {
       const regHash = await registerAgent(
         BigInt(opts.agentId),
-        opts.pkp,
-        opts.eoa
+        opts.wallet
       );
-      console.log(DIM(`  Agent registered: ${getExplorerUrl(regHash)}`));
+      console.log(DIM3(`  Agent registered: ${getExplorerUrl(regHash)}`));
     } catch (regErr) {
       const msg = regErr instanceof Error ? regErr.message : String(regErr);
       if (msg.includes("0xe098d3ee") || msg.includes("AgentAlreadyRegistered")) {
-        console.log(DIM("  Agent already registered on vault \u2014 skipping"));
+        console.log(DIM3("  Agent already registered on vault \u2014 skipping"));
       } else {
         throw regErr;
       }
@@ -2226,14 +3063,14 @@ syndicate.command("approve").description("Approve an agent join request (registe
     let approvalUid;
     if (alreadyApproved) {
       approvalUid = alreadyApproved.uid;
-      console.log(DIM(`  Approval attestation already exists \u2014 skipping`));
+      console.log(DIM3(`  Approval attestation already exists \u2014 skipping`));
     } else {
       spinner.text = "Creating approval attestation...";
       const result = await createApproval(
         syndicateId,
         BigInt(opts.agentId),
         vaultAddress,
-        opts.eoa
+        opts.wallet
       );
       approvalUid = result.uid;
     }
@@ -2242,46 +3079,45 @@ syndicate.command("approve").description("Approve an agent join request (registe
       const xmtp = await loadXmtp();
       const xmtpClient = await xmtp.getXmtpClient();
       const group = await xmtp.getGroup(xmtpClient, subdomain);
-      await xmtp.addMember(group, opts.pkp);
+      await xmtp.addMember(group, opts.wallet);
       await xmtp.sendEnvelope(group, {
         type: "AGENT_REGISTERED",
-        agent: { erc8004Id: Number(opts.agentId), address: opts.pkp },
+        agent: { erc8004Id: Number(opts.agentId), address: opts.wallet },
         syndicate: subdomain,
         timestamp: Math.floor(Date.now() / 1e3)
       });
-      console.log(DIM(`  Added to chat: ${subdomain}`));
+      console.log(DIM3(`  Added to chat: ${subdomain}`));
     } catch {
-      console.warn(chalk5.yellow("  \u26A0 Could not add agent to chat group"));
-      console.warn(chalk5.dim(`    If no group exists, run: sherwood chat ${subdomain} init`));
+      console.warn(chalk7.yellow("  \u26A0 Could not add agent to chat group"));
+      console.warn(chalk7.dim(`    If no group exists, run: sherwood chat ${subdomain} init`));
     }
     spinner.succeed("Agent approved and registered");
     console.log();
-    console.log(LABEL("  \u25C6 Agent Approved"));
-    SEP();
-    console.log(W(`  Agent ID:     #${opts.agentId}`));
-    console.log(W(`  PKP:          ${G(opts.pkp)}`));
-    console.log(W(`  EOA:          ${G(opts.eoa)}`));
-    console.log(W(`  Approval:     ${DIM(approvalUid)}`));
-    console.log(W(`  EAS Scan:     ${DIM(getEasScanUrl(approvalUid))}`));
-    SEP();
+    console.log(LABEL3("  \u25C6 Agent Approved"));
+    SEP3();
+    console.log(W3(`  Agent ID:     #${opts.agentId}`));
+    console.log(W3(`  Wallet:       ${G3(opts.wallet)}`));
+    console.log(W3(`  Approval:     ${DIM3(approvalUid)}`));
+    console.log(W3(`  EAS Scan:     ${DIM3(getEasScanUrl(approvalUid))}`));
+    SEP3();
   } catch (err) {
     spinner.fail("Approval failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 syndicate.command("reject").description("Reject a join request by revoking its attestation").requiredOption("--attestation <uid>", "Join request attestation UID to revoke").action(async (opts) => {
-  const spinner = ora5("Revoking attestation...").start();
+  const spinner = ora7("Revoking attestation...").start();
   try {
     const hash = await revokeAttestation(
       EAS_SCHEMAS().SYNDICATE_JOIN_REQUEST,
       opts.attestation
     );
     spinner.succeed("Join request rejected");
-    console.log(DIM(`  ${getExplorerUrl(hash)}`));
+    console.log(DIM3(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Rejection failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
@@ -2290,39 +3126,39 @@ vaultCmd.command("deposit").description("Deposit into a vault").option("--vault
   resolveVault(opts);
   const decimals = await getAssetDecimals();
   const amount = parseUnits8(opts.amount, decimals);
-  const spinner = ora5(`Depositing ${opts.amount}...`).start();
+  const spinner = ora7(`Depositing ${opts.amount}...`).start();
   try {
     const hash = await deposit(amount);
     spinner.succeed(`Deposited: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Deposit failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 vaultCmd.command("ragequit").description("Withdraw all shares from a vault").option("--vault <address>", "Vault address (default: from config)").action(async (opts) => {
   resolveVault(opts);
-  const spinner = ora5("Ragequitting...").start();
+  const spinner = ora7("Ragequitting...").start();
   try {
     const hash = await ragequit();
     spinner.succeed(`Ragequit: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Ragequit failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 vaultCmd.command("info").description("Display vault state").option("--vault <address>", "Vault address (default: from config)").action(async (opts) => {
   resolveVault(opts);
-  const spinner = ora5("Loading vault info...").start();
+  const spinner = ora7("Loading vault info...").start();
   try {
     const info = await getVaultInfo();
     spinner.stop();
     console.log();
-    console.log(chalk5.bold("Vault Info"));
-    console.log(chalk5.dim("\u2500".repeat(40)));
+    console.log(chalk7.bold("Vault Info"));
+    console.log(chalk7.dim("\u2500".repeat(40)));
     console.log(`  Address:            ${info.address}`);
     console.log(`  Total Assets:       ${info.totalAssets}`);
     console.log(`  Agent Count:        ${info.agentCount}`);
@@ -2331,85 +3167,85 @@ vaultCmd.command("info").description("Display vault state").option("--vault <add
     console.log();
   } catch (err) {
     spinner.fail("Failed to load vault info");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 vaultCmd.command("balance").description("Show LP share balance and asset value").option("--vault <address>", "Vault address (default: from config)").option("--address <address>", "Address to check (default: your wallet)").action(async (opts) => {
   resolveVault(opts);
-  const spinner = ora5("Loading balance...").start();
+  const spinner = ora7("Loading balance...").start();
   try {
     const balance = await getBalance(opts.address);
     spinner.stop();
     console.log();
-    console.log(chalk5.bold("LP Position"));
-    console.log(chalk5.dim("\u2500".repeat(40)));
+    console.log(chalk7.bold("LP Position"));
+    console.log(chalk7.dim("\u2500".repeat(40)));
     console.log(`  Shares:       ${balance.shares.toString()}`);
     console.log(`  Asset Value:  ${balance.assetsValue}`);
     console.log(`  % of Vault:   ${balance.percentOfVault}`);
     console.log();
   } catch (err) {
     spinner.fail("Failed to load balance");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 var strategy = program.command("strategy");
 strategy.command("list").description("List registered strategies").option("--type <id>", "Filter by strategy type").action(async (opts) => {
-  const spinner = ora5("Loading strategies...").start();
+  const spinner = ora7("Loading strategies...").start();
   try {
     const strategies = await listStrategies(
       opts.type ? BigInt(opts.type) : void 0
     );
     spinner.stop();
     if (strategies.length === 0) {
-      console.log(chalk5.dim("No strategies registered."));
+      console.log(chalk7.dim("No strategies registered."));
       return;
     }
     console.log();
-    console.log(chalk5.bold(`Strategies (${strategies.length})`));
-    console.log(chalk5.dim("\u2500".repeat(70)));
+    console.log(chalk7.bold(`Strategies (${strategies.length})`));
+    console.log(chalk7.dim("\u2500".repeat(70)));
     for (const s of strategies) {
-      const status = s.active ? chalk5.green("active") : chalk5.red("inactive");
-      console.log(`  #${s.id}  ${chalk5.bold(s.name)}  [type: ${s.strategyTypeId}]  ${status}`);
+      const status = s.active ? chalk7.green("active") : chalk7.red("inactive");
+      console.log(`  #${s.id}  ${chalk7.bold(s.name)}  [type: ${s.strategyTypeId}]  ${status}`);
       console.log(`    Creator:        ${s.creator}`);
       console.log(`    Implementation: ${s.implementation}`);
       if (s.metadataURI) {
-        console.log(`    Metadata:       ${chalk5.dim(s.metadataURI)}`);
+        console.log(`    Metadata:       ${chalk7.dim(s.metadataURI)}`);
       }
       console.log();
     }
   } catch (err) {
     spinner.fail("Failed to load strategies");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 strategy.command("info").description("Show strategy details").argument("<id>", "Strategy ID").action(async (idStr) => {
-  const spinner = ora5("Loading strategy...").start();
+  const spinner = ora7("Loading strategy...").start();
   try {
     const s = await getStrategy(BigInt(idStr));
     spinner.stop();
     console.log();
-    console.log(chalk5.bold(`Strategy #${s.id}`));
-    console.log(chalk5.dim("\u2500".repeat(40)));
+    console.log(chalk7.bold(`Strategy #${s.id}`));
+    console.log(chalk7.dim("\u2500".repeat(40)));
     console.log(`  Name:           ${s.name}`);
     console.log(`  Type:           ${s.strategyTypeId}`);
-    console.log(`  Active:         ${s.active ? chalk5.green("yes") : chalk5.red("no")}`);
+    console.log(`  Active:         ${s.active ? chalk7.green("yes") : chalk7.red("no")}`);
     console.log(`  Creator:        ${s.creator}`);
     console.log(`  Implementation: ${s.implementation}`);
     if (s.metadataURI) {
-      console.log(`  Metadata:       ${chalk5.dim(s.metadataURI)}`);
+      console.log(`  Metadata:       ${chalk7.dim(s.metadataURI)}`);
     }
     console.log();
   } catch (err) {
     spinner.fail("Failed to load strategy");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
 strategy.command("register").description("Register a new strategy on-chain").requiredOption("--implementation <address>", "Strategy contract address").requiredOption("--type <id>", "Strategy type ID").requiredOption("--name <name>", "Strategy name").option("--metadata <uri>", "Metadata URI (IPFS/Arweave)", "").action(async (opts) => {
-  const spinner = ora5("Registering strategy...").start();
+  const spinner = ora7("Registering strategy...").start();
   try {
     const hash = await registerStrategy(
       opts.implementation,
@@ -2418,10 +3254,10 @@ strategy.command("register").description("Register a new strategy on-chain").req
       opts.metadata
     );
     spinner.succeed(`Strategy registered: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
   } catch (err) {
     spinner.fail("Registration failed");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
+    console.error(chalk7.red(err instanceof Error ? err.message : String(err)));
     process.exit(1);
   }
 });
@@ -2430,7 +3266,7 @@ strategy.command("run").description("Execute the levered swap strategy").option(
   await runLeveredSwap(opts);
 });
 program.command("providers").description("List available DeFi providers").action(async () => {
-  const { MessariProvider, NansenProvider } = await import("./research-5QALNYVS.js");
+  const { MessariProvider, NansenProvider } = await import("./research-ZR7HXITG.js");
   const providers = [new MoonwellProvider(), new UniswapProvider(), new MessariProvider(), new NansenProvider()];
   for (const p of providers) {
     const info = p.info();
@@ -2441,57 +3277,70 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-BSLMAYM5.js");
+  const { registerChatCommands } = await import("./chat-BNYWD3EL.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Syndicate chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
-    console.error(chalk5.red("XMTP CLI not available."));
-    console.error(chalk5.dim("Install with:  npm install -g @xmtp/cli"));
-    console.error(chalk5.dim("Or reinstall:  npm i -g @sherwoodagent/cli"));
+    console.error(chalk7.red("XMTP CLI not available."));
+    console.error(chalk7.dim("Install with:  npm install -g @xmtp/cli"));
+    console.error(chalk7.dim("Or reinstall:  npm i -g @sherwoodagent/cli"));
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-XUOMZWOT.js");
+var { registerSessionCommands } = await import("./session-QQSHCGNK.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
 registerIdentityCommands(program);
-var { registerResearchCommands } = await import("./research-ILKLSHVP.js");
+registerProposalCommands(program);
+registerGovernorCommands(program);
+var { registerResearchCommands } = await import("./research-57SKO27M.js");
 registerResearchCommands(program);
 var configCmd = program.command("config");
-configCmd.command("set").description("Save settings to ~/.sherwood/config.json (persists across sessions)").option("--private-key <key>", "Wallet private key (0x-prefixed)").option("--vault <address>", "Default SyndicateVault address").action((opts) => {
+configCmd.command("set").description("Save settings to ~/.sherwood/config.json (persists across sessions)").option("--private-key <key>", "Wallet private key (0x-prefixed)").option("--vault <address>", "Default SyndicateVault address").option("--rpc <url>", "Custom RPC URL for the active --chain network").action((opts) => {
   let saved = false;
   if (opts.privateKey) {
     setPrivateKey(opts.privateKey);
     const account = getAccount();
-    console.log(chalk5.green("Private key saved to ~/.sherwood/config.json"));
-    console.log(chalk5.dim(`  Wallet: ${account.address}`));
+    console.log(chalk7.green("Private key saved to ~/.sherwood/config.json"));
+    console.log(chalk7.dim(`  Wallet: ${account.address}`));
     saved = true;
   }
   if (opts.vault) {
     const chainId = getChain().id;
     setChainContract(chainId, "vault", opts.vault);
-    console.log(chalk5.green(`Vault saved to ~/.sherwood/config.json (chain ${chainId})`));
-    console.log(chalk5.dim(`  Vault: ${opts.vault}`));
+    console.log(chalk7.green(`Vault saved to ~/.sherwood/config.json (chain ${chainId})`));
+    console.log(chalk7.dim(`  Vault: ${opts.vault}`));
+    saved = true;
+  }
+  if (opts.rpc) {
+    const network = getNetwork();
+    setConfigRpcUrl(network, opts.rpc);
+    console.log(chalk7.green(`RPC URL saved for ${network}`));
+    console.log(chalk7.dim(`  RPC: ${opts.rpc}`));
     saved = true;
   }
   if (!saved) {
-    console.log(chalk5.red("Provide at least one of: --private-key, --vault"));
+    console.log(chalk7.red("Provide at least one of: --private-key, --vault, --rpc"));
     process.exit(1);
   }
 });
 configCmd.command("show").description("Display current config for the active network").action(() => {
+  const network = getNetwork();
   const chainId = getChain().id;
   const contracts = getChainContracts(chainId);
   const config = loadConfig();
+  const customRpc = config.rpc?.[network];
   console.log();
-  console.log(chalk5.bold(`Sherwood Config (chain ${chainId})`));
-  console.log(chalk5.dim("\u2500".repeat(50)));
-  console.log(`  Wallet:     ${config.privateKey ? chalk5.green("configured") : chalk5.dim("not set")}`);
-  console.log(`  Agent ID:   ${config.agentId ?? chalk5.dim("not set")}`);
-  console.log(`  Vault:      ${contracts.vault ?? chalk5.dim("not set")}`);
+  console.log(chalk7.bold(`Sherwood Config`));
+  console.log(chalk7.dim("\u2500".repeat(50)));
+  console.log(`  Network:    ${chalk7.cyan(network)} (chain ${chainId})`);
+  console.log(`  RPC:        ${customRpc ? chalk7.green(customRpc) : chalk7.dim("default")}`);
+  console.log(`  Wallet:     ${config.privateKey ? chalk7.green("configured") : chalk7.dim("not set")}`);
+  console.log(`  Agent ID:   ${config.agentId ?? chalk7.dim("not set")}`);
+  console.log(`  Vault:      ${contracts.vault ?? chalk7.dim("not set")}`);
   console.log();
-  console.log(chalk5.dim("  Config file: ~/.sherwood/config.json"));
+  console.log(chalk7.dim("  Config file: ~/.sherwood/config.json"));
   console.log();
 });
 program.parse();