@sherwoodagent/cli 0.11.0 → 0.12.1

package/dist/index.js

@@ -2,7 +2,7 @@
 import {
   fetchMetadata,
   uploadMetadata
-} from "./chunk-DVWORPEY.js";
+} from "./chunk-LEQLX7XF.js";
 import {
   createApproval,
   createJoinRequest,
@@ -10,7 +10,7 @@ import {
   queryApprovals,
   queryJoinRequests,
   revokeAttestation
-} from "./chunk-56W62BYY.js";
+} from "./chunk-TTGRYJYY.js";
 import {
   approveDepositor,
   deposit,
@@ -20,15 +20,13 @@ import {
   getVaultAddress,
   getVaultInfo,
   isAgent,
-  ragequit,
   registerAgent,
   removeDepositor,
   resolveSyndicate,
   resolveVaultSyndicate,
   setTextRecord,
-  setVaultAddress,
-  simulateBatch
-} from "./chunk-6IUSJWAL.js";
+  setVaultAddress
+} from "./chunk-SQID2KF4.js";
 import {
   AGENT_REGISTRY,
   EAS_SCHEMAS,
@@ -44,7 +42,7 @@ import {
   UNISWAP_QUOTER_V2_ABI,
   VENICE,
   VENICE_STAKING_ABI
-} from "./chunk-IXMM3TT3.js";
+} from "./chunk-X34TJQ4P.js";
 import {
   getAccount,
   getPublicClient,
@@ -458,32 +456,6 @@ async function runLeveredSwap(opts) {
   console.log(chalk.bold("Batch calls (6):"));
   console.log(formatBatch(calls));
   console.log();
-  const simSpinner = ora("Simulating via vault...").start();
-  try {
-    const results = await simulateBatch(calls);
-    const allSucceeded = results.every((r) => r.success);
-    if (allSucceeded) {
-      simSpinner.succeed("Simulation passed");
-    } else {
-      simSpinner.fail("Simulation: some calls failed");
-      for (let i = 0; i < results.length; i++) {
-        const status = results[i].success ? "\u2713" : "\u2717";
-        console.log(`  ${status} Call ${i + 1}`);
-      }
-      if (!opts.execute) {
-        process.exit(1);
-      }
-      console.log(chalk.yellow("Continuing to execution despite simulation failure..."));
-    }
-  } catch (err) {
-    simSpinner.fail("Simulation failed");
-    const msg = err instanceof Error ? err.message : String(err);
-    console.error(chalk.red(msg));
-    if (!opts.execute) {
-      process.exit(1);
-    }
-    console.log(chalk.yellow("Continuing to execution despite simulation failure..."));
-  }
   if (!opts.execute) {
     console.log();
     console.log(chalk.yellow("Dry run complete. Add --execute to submit on-chain."));
@@ -586,7 +558,7 @@ async function getActiveSyndicates() {
   const result = await client.readContract({
     address: getFactoryAddress(),
     abi: SYNDICATE_FACTORY_ABI,
-    functionName: "getActiveSyndicates"
+    functionName: "getAllActiveSyndicates"
   });
   return result.map((s) => ({
     id: s.id,
@@ -661,7 +633,7 @@ async function getActiveSyndicates2(creator) {
 
 // src/lib/registry.ts
 function getRegistryAddress() {
-  return SHERWOOD().STRATEGY_REGISTRY;
+  return "0x0000000000000000000000000000000000000000";
 }
 async function registerStrategy(implementation, strategyTypeId, name, metadataURI) {
   const wallet = getWalletClient();
@@ -1023,27 +995,6 @@ function registerVeniceCommands(program2) {
     console.log(chalk2.bold(`Batch calls (${calls.length}):`));
     console.log(formatBatch(calls));
     console.log();
-    const simSpinner = ora2("Simulating via vault...").start();
-    try {
-      const results = await simulateBatch(calls);
-      const allSucceeded = results.every((r) => r.success);
-      if (allSucceeded) {
-        simSpinner.succeed("Simulation passed");
-      } else {
-        simSpinner.fail("Simulation: some calls failed");
-        for (let i = 0; i < results.length; i++) {
-          const status = results[i].success ? "ok" : "FAIL";
-          console.log(`  ${status} Call ${i + 1}`);
-        }
-        if (!opts.execute) process.exit(1);
-        console.log(chalk2.yellow("Continuing to execution despite simulation failure..."));
-      }
-    } catch (err) {
-      simSpinner.fail("Simulation failed");
-      console.error(chalk2.red(err instanceof Error ? err.message : String(err)));
-      if (!opts.execute) process.exit(1);
-      console.log(chalk2.yellow("Continuing to execution despite simulation failure..."));
-    }
     if (!opts.execute) {
       console.log();
       console.log(chalk2.yellow("Dry run complete. Add --execute to submit on-chain."));
@@ -1436,27 +1387,6 @@ function registerAllowanceCommands(program2) {
     console.log(chalk3.bold(`Batch calls (${calls.length}):`));
     console.log(formatBatch(calls));
     console.log();
-    const simSpinner = ora3("Simulating via vault...").start();
-    try {
-      const results = await simulateBatch(calls);
-      const allSucceeded = results.every((r) => r.success);
-      if (allSucceeded) {
-        simSpinner.succeed("Simulation passed");
-      } else {
-        simSpinner.fail("Simulation: some calls failed");
-        for (let i = 0; i < results.length; i++) {
-          const status = results[i].success ? "ok" : "FAIL";
-          console.log(`  ${status} Call ${i + 1}`);
-        }
-        if (!opts.execute) process.exit(1);
-        console.log(chalk3.yellow("Continuing to execution despite simulation failure..."));
-      }
-    } catch (err) {
-      simSpinner.fail("Simulation failed");
-      console.error(chalk3.red(err instanceof Error ? err.message : String(err)));
-      if (!opts.execute) process.exit(1);
-      console.log(chalk3.yellow("Continuing to execution despite simulation failure..."));
-    }
     if (!opts.execute) {
       console.log();
       console.log(chalk3.yellow("Dry run complete. Add --execute to submit on-chain."));
@@ -1793,12 +1723,22 @@ async function hasVoted(proposalId, voter) {
     args: [proposalId, voter]
   });
 }
-async function getProposalCalls(proposalId) {
+async function getExecuteCalls(proposalId) {
   const client = getPublicClient();
   const result = await client.readContract({
     address: getGovernorAddress(),
     abi: SYNDICATE_GOVERNOR_ABI,
-    functionName: "getProposalCalls",
+    functionName: "getExecuteCalls",
+    args: [proposalId]
+  });
+  return result.map((c) => ({ target: c.target, data: c.data, value: c.value }));
+}
+async function getSettlementCalls(proposalId) {
+  const client = getPublicClient();
+  const result = await client.readContract({
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "getSettlementCalls",
     args: [proposalId]
   });
   return result.map((c) => ({ target: c.target, data: c.data, value: c.value }));
@@ -1820,7 +1760,7 @@ async function getCapitalSnapshot(proposalId) {
     args: [proposalId]
   });
 }
-async function propose(vault, metadataURI, performanceFeeBps, strategyDuration, calls, splitIndex, coProposers = []) {
+async function propose(vault, metadataURI, performanceFeeBps, strategyDuration, executeCalls, settlementCalls, coProposers = []) {
   const wallet = getWalletClient();
   const client = getPublicClient();
   const hash = await wallet.writeContract({
@@ -1829,7 +1769,7 @@ async function propose(vault, metadataURI, performanceFeeBps, strategyDuration,
     address: getGovernorAddress(),
     abi: SYNDICATE_GOVERNOR_ABI,
     functionName: "propose",
-    args: [vault, metadataURI, performanceFeeBps, strategyDuration, calls, splitIndex, coProposers]
+    args: [vault, metadataURI, performanceFeeBps, strategyDuration, executeCalls, settlementCalls, coProposers]
   });
   const receipt = await client.waitForTransactionReceipt({ hash });
   let proposalId;
@@ -1882,20 +1822,6 @@ async function settleProposal(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();
@@ -1966,7 +1892,7 @@ async function setExecutionWindow(seconds) {
   const receipt = await client.waitForTransactionReceipt({ hash });
   return receipt.transactionHash;
 }
-async function setQuorumBps(bps) {
+async function setVetoThresholdBps(bps) {
   const wallet = getWalletClient();
   const client = getPublicClient();
   const hash = await wallet.writeContract({
@@ -1974,7 +1900,7 @@ async function setQuorumBps(bps) {
     chain: getChain(),
     address: getGovernorAddress(),
     abi: SYNDICATE_GOVERNOR_ABI,
-    functionName: "setQuorumBps",
+    functionName: "setVetoThresholdBps",
     args: [bps]
   });
   const receipt = await client.waitForTransactionReceipt({ hash });
@@ -2022,6 +1948,20 @@ async function setCooldownPeriod(seconds) {
   const receipt = await client.waitForTransactionReceipt({ hash });
   return receipt.transactionHash;
 }
+async function setProtocolFeeBps(bps) {
+  const wallet = getWalletClient();
+  const client = getPublicClient();
+  const hash = await wallet.writeContract({
+    account: getAccount(),
+    chain: getChain(),
+    address: getGovernorAddress(),
+    abi: SYNDICATE_GOVERNOR_ABI,
+    functionName: "setProtocolFeeBps",
+    args: [bps]
+  });
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt.transactionHash;
+}
 
 // src/lib/format.ts
 function formatDurationShort(seconds) {
@@ -2075,7 +2015,7 @@ function parseCallsFile(path) {
 }
 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) => {
+  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("--execute-calls <path>", "Path to JSON file with execute Call[] array").requiredOption("--settle-calls <path>", "Path to JSON file with settlement Call[] array").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)) {
@@ -2084,8 +2024,8 @@ function registerProposalCommands(program2) {
       }
       const performanceFeeBps = parseBigIntArg(opts.performanceFee, "performance-fee");
       const strategyDuration = parseDuration(opts.duration);
-      const splitIndex = parseBigIntArg(opts.splitIndex, "split-index");
-      const calls = parseCallsFile(opts.calls);
+      const executeCalls = parseCallsFile(opts.executeCalls);
+      const settleCalls = parseCallsFile(opts.settleCalls);
       let metadataURI = opts.metadataUri || "";
       if (!metadataURI) {
         const spinner2 = ora5({ text: W("Uploading metadata to IPFS..."), color: "green" }).start();
@@ -2097,7 +2037,7 @@ function registerProposalCommands(program2) {
             description: opts.description,
             chain: getNetwork(),
             strategies: [],
-            terms: { ragequitEnabled: true },
+            terms: {},
             links: {}
           };
           const proposalMeta = {
@@ -2123,11 +2063,11 @@ function registerProposalCommands(program2) {
       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(`  Calls:            ${executeCalls.length} execute + ${settleCalls.length} settle`));
       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);
+      const result = await propose(vault, metadataURI, performanceFeeBps, strategyDuration, executeCalls, settleCalls);
       spinner.succeed(G("Proposal submitted"));
       console.log();
       console.log(LABEL("  \u25C6 Proposal Created"));
@@ -2202,12 +2142,11 @@ function registerProposalCommands(program2) {
       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";
+      const quorumNeeded = totalVotes > 0n ? `${Number(params.vetoThresholdBps) / 100}%` : "\u2014";
       console.log();
       console.log(LABEL(`  \u25C6 Proposal #${p.id}`));
       SEP();
@@ -2238,7 +2177,7 @@ function registerProposalCommands(program2) {
       console.log(W(`  For:              ${formatShares(p.votesFor)}`));
       console.log(W(`  Against:          ${formatShares(p.votesAgainst)}`));
       console.log(W(`  Abstain:          ${formatShares(p.votesAbstain)}`));
-      console.log(W(`  Quorum:           ${quorumNeeded}`));
+      console.log(W(`  Veto Threshold:   ${quorumNeeded}`));
       if (state === PROPOSAL_STATE.Executed || state === PROPOSAL_STATE.Settled) {
         try {
           const cap = await getCapitalSnapshot(id);
@@ -2248,12 +2187,18 @@ function registerProposalCommands(program2) {
         } catch {
         }
       }
+      const execCalls = await getExecuteCalls(id);
+      const settlCalls = await getSettlementCalls(id);
       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}`));
+      console.log(LABEL(`  Execute Calls (${execCalls.length})`));
+      for (let i = 0; i < execCalls.length; i++) {
+        console.log(DIM(`  [${i}] target=${execCalls[i].target}`));
+        console.log(DIM(`       data=${execCalls[i].data.slice(0, 20)}...  value=${execCalls[i].value}`));
+      }
+      console.log(LABEL(`  Settlement Calls (${settlCalls.length})`));
+      for (let i = 0; i < settlCalls.length; i++) {
+        console.log(DIM(`  [${i}] target=${settlCalls[i].target}`));
+        console.log(DIM(`       data=${settlCalls[i].data.slice(0, 20)}...  value=${settlCalls[i].value}`));
       }
       SEP();
       console.log();
@@ -2348,11 +2293,10 @@ function registerProposalCommands(program2) {
       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"));
+      if (isProposer && !durationElapsed) {
+        spinner.text = W("Settling (proposer)...");
+        hash = await settleProposal(proposalId);
+        spinner.succeed(G("Settled by proposer"));
       } else if (durationElapsed && !opts.calls) {
         spinner.text = W("Settling (permissionless)...");
         hash = await settleProposal(proposalId);
@@ -2363,7 +2307,7 @@ function registerProposalCommands(program2) {
         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.");
+        spinner.fail("Cannot settle: duration not elapsed and you are not the proposer.");
         process.exit(1);
       }
       console.log(DIM(`  ${getExplorerUrl(hash)}`));
@@ -2432,7 +2376,7 @@ function registerGovernorCommands(program2) {
       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(`  Veto Threshold:         ${BOLD2(`${Number(params.vetoThresholdBps) / 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))}`));
@@ -2477,14 +2421,14 @@ function registerGovernorCommands(program2) {
       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();
+  governor.command("set-veto-threshold").description("Set the veto threshold in bps (owner only)").requiredOption("--bps <n>", "New veto threshold in bps (e.g. 4000 = 40%)").action(async (opts) => {
+    const spinner = ora6("Setting veto threshold...").start();
     try {
-      const hash = await setQuorumBps(parseBigIntArg(opts.bps, "bps"));
-      spinner.succeed(G2(`Quorum updated to ${Number(opts.bps) / 100}%`));
+      const hash = await setVetoThresholdBps(parseBigIntArg(opts.bps, "bps"));
+      spinner.succeed(G2(`Veto threshold updated to ${Number(opts.bps) / 100}%`));
       console.log(DIM2(`  ${getExplorerUrl(hash)}`));
     } catch (err) {
-      spinner.fail("Failed to set quorum");
+      spinner.fail("Failed to set veto threshold");
       console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
       process.exit(1);
     }
@@ -2525,6 +2469,18 @@ function registerGovernorCommands(program2) {
       process.exit(1);
     }
   });
+  governor.command("set-protocol-fee").description("Set the protocol fee in bps (owner only)").requiredOption("--bps <n>", "New protocol fee in bps (e.g. 500 = 5%, max 1000 = 10%)").action(async (opts) => {
+    const spinner = ora6("Setting protocol fee...").start();
+    try {
+      const hash = await setProtocolFeeBps(parseBigIntArg(opts.bps, "bps"));
+      spinner.succeed(G2(`Protocol fee updated to ${Number(opts.bps) / 100}%`));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+    } catch (err) {
+      spinner.fail("Failed to set protocol fee");
+      console.error(chalk6.red(err instanceof Error ? err.message : String(err)));
+      process.exit(1);
+    }
+  });
 }
 
 // src/index.ts
@@ -2533,7 +2489,7 @@ try {
 } catch {
 }
 async function loadXmtp() {
-  return import("./xmtp-A5G2GEWF.js");
+  return import("./xmtp-ZGW4KGC4.js");
 }
 async function loadCron() {
   return import("./cron-RG46PYWA.js");
@@ -2664,7 +2620,6 @@ syndicate.command("create").description("Create a new syndicate via the factory
           chain: getChain().name,
           strategies: [],
           terms: {
-            ragequitEnabled: true,
             feeModel: "none"
           },
           links: {}
@@ -2850,7 +2805,7 @@ syndicate.command("update-metadata").description("Update syndicate metadata (cre
         description,
         chain: getChain().name,
         strategies: [],
-        terms: { ragequitEnabled: true },
+        terms: {},
         links: {}
       };
       metadataURI = await uploadMetadata(metadata);
@@ -3201,19 +3156,6 @@ vaultCmd.command("deposit").description("Deposit into a vault").option("--vault
     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 = ora7("Ragequitting...").start();
-  try {
-    const hash = await ragequit();
-    spinner.succeed(`Ragequit: ${hash}`);
-    console.log(chalk7.dim(`  ${getExplorerUrl(hash)}`));
-  } catch (err) {
-    spinner.fail("Ragequit failed");
-    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 = ora7("Loading vault info...").start();
@@ -3341,7 +3283,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-2X5FQI5X.js");
+  const { registerChatCommands } = await import("./chat-3PQDDLVR.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Syndicate chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
@@ -3351,14 +3293,14 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-QBWUWXCH.js");
+var { registerSessionCommands } = await import("./session-5FYVX2DW.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
 registerIdentityCommands(program);
 registerProposalCommands(program);
 registerGovernorCommands(program);
-var { registerResearchCommands } = await import("./research-PLYYYJ4F.js");
+var { registerResearchCommands } = await import("./research-O44AJLGZ.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").option("--rpc <url>", "Custom RPC URL for the active --chain network").option("--notify-to <id>", "Destination for cron summaries (Telegram chat ID, phone, etc.)").action((opts) => {