@sherwoodagent/cli 0.87.0 → 0.88.0

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   checkApiKeyValid,
   listModels,
   provisionApiKey
-} from "./chunk-IINWI3LD.js";
+} from "./chunk-EEI6FRTE.js";
 import {
   DEFAULT_FEE_TIER,
   HYPERLIQUID_PERP_STRATEGY_ABI,
@@ -31,10 +31,13 @@ import {
   parseAlignedOverrides,
   resolveToken,
   selectBestFeeTier
-} from "./chunk-JGD6A2Q4.js";
+} from "./chunk-QFGZQYZA.js";
 import {
   DEFAULT_ISSUING_CHAIN_ID,
+  STRATEGY_FACTORY_ABI,
   appendVidTag,
+  deriveStrategySalt,
+  effectiveStrategySalt,
   emitCalldata,
   encodeApproveAgent,
   encodeApproveDepositor,
@@ -60,11 +63,12 @@ import {
   isCalldataOnly,
   makeOwnerOfCache,
   parseVidTag,
+  predictStrategyCloneAddress,
   registerIdentityCommands,
   setCalldataOnly,
   stripVidTag,
   verifyVidTag
-} from "./chunk-V7TNYHIK.js";
+} from "./chunk-HMFPP2PE.js";
 import {
   createApproval,
   createJoinRequest,
@@ -74,20 +78,20 @@ import {
   queryJoinRequests,
   revokeJoinRequest,
   stripReferrerPrefix
-} from "./chunk-W3XWRWML.js";
+} from "./chunk-SCQAKMMI.js";
 import {
   createFund,
   getActiveFunds,
   getFund,
   subdomainExists,
   updateMetadata
-} from "./chunk-TTF5TDRV.js";
+} from "./chunk-6D3FNU75.js";
 import {
   resolveFund,
   resolveVaultFund,
   searchFundAcrossChains,
   setTextRecord
-} from "./chunk-37GT3TJX.js";
+} from "./chunk-4ITTHKRX.js";
 import {
   approveDepositor,
   deposit,
@@ -110,8 +114,8 @@ import {
   removeDepositor,
   setAgentFeeBps,
   setVaultAddress
-} from "./chunk-GR3GSU3I.js";
-import "./chunk-R6F57QQF.js";
+} from "./chunk-N2E2Q5GL.js";
+import "./chunk-BH3VTJ4F.js";
 import {
   PROPOSAL_STATE,
   PROPOSAL_STATES,
@@ -138,6 +142,7 @@ import {
   parseDuration,
   proposalCount,
   propose,
+  reclaimProposerBond,
   scanReviewCandidates,
   setCooldownPeriod,
   setExecutionWindow,
@@ -149,7 +154,7 @@ import {
   setVotingPeriod,
   settleProposal,
   vote
-} from "./chunk-CU42ZD4K.js";
+} from "./chunk-G5MXVAFC.js";
 import {
   AERODROME,
   MOONWELL,
@@ -158,7 +163,7 @@ import {
   TOKENS,
   UNISWAP,
   VENICE
-} from "./chunk-UOIAY6ZG.js";
+} from "./chunk-FWQESFFM.js";
 import {
   GAS_UNITS,
   estimateGasCushion,
@@ -169,7 +174,7 @@ import {
   sendTxWithRetry,
   waitForReceipt,
   writeContractWithRetry
-} from "./chunk-MIAMGVZ4.js";
+} from "./chunk-D4BSBW3Q.js";
 import {
   DEFAULT_NETWORK,
   VALID_NETWORKS,
@@ -210,6 +215,7 @@ import {
   PORTFOLIO_STRATEGY_ABI,
   SWAP_ROUTER_ABI,
   SWAP_ROUTER_EXACT_INPUT_SINGLE_ABI,
+  SYNDICATE_GOVERNOR_ABI,
   SYNDICATE_VAULT_ABI,
   VENICE_STAKING_ABI
 } from "./chunk-J2IZWAEW.js";
@@ -289,6 +295,126 @@ async function cloneTemplate(template) {
   return { clone: receipt.contractAddress, hash };
 }
 
+// src/lib/strategy-deploy.ts
+var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+var STRATEGY_FACTORY_EXTRA_ABI = [
+  {
+    name: "registerStrategy",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "strategy", type: "address" }],
+    outputs: []
+  },
+  {
+    name: "isRegisteredStrategy",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "strategy", type: "address" }],
+    outputs: [{ name: "", type: "bool" }]
+  },
+  {
+    name: "approvedTemplate",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "template", type: "address" }],
+    outputs: [{ name: "", type: "bool" }]
+  }
+];
+function planStrategyCloneDeploy(args) {
+  const factory = args.factory ?? SHERWOOD().STRATEGY_FACTORY;
+  if (!factory || factory === ZERO_ADDRESS) {
+    return {
+      mode: "raw",
+      reason: "no STRATEGY_FACTORY in this network's address book \u2014 falling back to a raw ERC-1167 clone. A governor that gates propose on strategy registration will refuse the resulting proposal."
+    };
+  }
+  const salt = args.salt ?? deriveStrategySalt(args.vault, args.proposer, args.template, args.initData);
+  const clone = predictStrategyCloneAddress(
+    factory,
+    args.template,
+    effectiveStrategySalt(args.vault, salt)
+  );
+  return {
+    mode: "factory",
+    factory,
+    clone,
+    salt,
+    to: factory,
+    functionName: "cloneAndInitDeterministic",
+    args: [args.template, args.vault, args.proposer, args.initData, salt]
+  };
+}
+async function deployStrategyClone(args) {
+  const plan = planStrategyCloneDeploy(args);
+  const publicClient = getPublicClient();
+  const account = getAccount();
+  if (plan.mode === "factory") {
+    const approved = await publicClient.readContract({
+      address: plan.factory,
+      abi: STRATEGY_FACTORY_EXTRA_ABI,
+      functionName: "approvedTemplate",
+      args: [args.template]
+    });
+    if (!approved) {
+      throw new Error(
+        `Template ${args.template} is not on StrategyFactory ${plan.factory}'s allowlist \u2014 cloneAndInitDeterministic would revert TemplateNotApproved. The factory owner must call setTemplateApproval(${args.template}, true).`
+      );
+    }
+    const existing = await publicClient.getCode({ address: plan.clone });
+    if (existing && existing !== "0x") {
+      throw new Error(
+        `A strategy clone already exists at the deterministic address ${plan.clone} (same vault + template + init params as an earlier deploy). Re-run with a different --salt to deploy a fresh clone.`
+      );
+    }
+    const hash2 = await writeContractWithRetry({
+      account,
+      chain: getChain(),
+      address: plan.factory,
+      abi: STRATEGY_FACTORY_ABI,
+      functionName: plan.functionName,
+      args: plan.args
+    });
+    const receipt = await waitForReceipt(hash2);
+    if (receipt.status === "reverted") {
+      throw new Error(`StrategyFactory.cloneAndInitDeterministic reverted on-chain (tx: ${hash2})`);
+    }
+    const deployed = await publicClient.getCode({ address: plan.clone });
+    if (!deployed || deployed === "0x") {
+      throw new Error(
+        `The factory deployed a clone, but not at the predicted address ${plan.clone} (tx: ${hash2}). The CLI's CREATE2 prediction and the factory's salt fold have diverged \u2014 do not propose against this address.`
+      );
+    }
+    return { clone: plan.clone, hash: hash2, viaFactory: true, salt: plan.salt };
+  }
+  const { clone, hash } = await cloneTemplate(args.template);
+  const initHash = await writeContractWithRetry({
+    account,
+    chain: getChain(),
+    address: clone,
+    abi: BASE_STRATEGY_ABI,
+    functionName: "initialize",
+    args: [args.vault, args.proposer, args.initData]
+  });
+  const initReceipt = await waitForReceipt(initHash);
+  if (initReceipt.status === "reverted") {
+    throw new Error(`Strategy initialize reverted on-chain (tx: ${initHash})`);
+  }
+  let registerHash;
+  const factory = args.factory ?? SHERWOOD().STRATEGY_FACTORY;
+  if (factory && factory !== ZERO_ADDRESS) {
+    registerHash = await writeContractWithRetry({
+      account,
+      chain: getChain(),
+      address: factory,
+      abi: STRATEGY_FACTORY_EXTRA_ABI,
+      functionName: "registerStrategy",
+      args: [clone]
+    });
+    await waitForReceipt(registerHash);
+  }
+  return { clone, hash, viaFactory: false, initHash, registerHash };
+}
+
 // src/grid/strategy-abi.ts
 var HYPERLIQUID_GRID_STRATEGY_ABI = [
   {
@@ -608,6 +734,20 @@ var TEMPLATES = [
     key: "hyperliquid-grid",
     description: "ATR-based grid trading on Hyperliquid via HyperEVM precompiles",
     addressKey: "HYPERLIQUID_GRID"
+  },
+  {
+    name: "Morpho Supply",
+    key: "morpho-supply",
+    description: "Supply the vault asset to a Morpho market (init encoder not wired in the CLI yet)",
+    addressKey: "MORPHO_SUPPLY",
+    encoder: false
+  },
+  {
+    name: "Concentrated Liquidity",
+    key: "concentrated-liquidity",
+    description: "Uniswap-v3-style concentrated LP range (init encoder not wired in the CLI yet)",
+    addressKey: "CONCENTRATED_LIQUIDITY",
+    encoder: false
   }
 ];
 function resolveTemplate(key) {
@@ -622,6 +762,19 @@ function resolveTemplate(key) {
     console.error(chalk2.red(`Template "${def.name}" not deployed on this network.`));
     process.exit(1);
   }
+  if (def.encoder === false) {
+    console.error(
+      chalk2.red(
+        `Template "${def.name}" is deployed at ${address} but the CLI cannot encode its initialize() tuple yet.`
+      )
+    );
+    console.error(
+      chalk2.yellow(
+        "  Deploy it via StrategyFactory.cloneAndInitDeterministic with hand-encoded initData, then reference the clone from `sherwood proposal create`."
+      )
+    );
+    process.exit(1);
+  }
   return { def, address };
 }
 async function resolvePortfolioFeeTiers(opts, deps) {
@@ -890,7 +1043,7 @@ function formatBatch(calls) {
 
 // src/commands/strategy-propose.ts
 function registerStrategyProposeCommands(strategy2) {
-  strategy2.command("propose").description("Clone + init + build calls + submit governance proposal (all-in-one)").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--vault <address>", "Vault address").option("--write-calls <dir>", "Write execute/settle JSON to directory (skip proposal submission)").option("--name <name>", "Proposal name").option("--description <text>", "Proposal description").option("--duration <duration>", "Strategy duration (7d, 24h, etc.)").option("--proposer <address>", "Proposer/agent address (required for --calldata-only \u2014 the external signer)").option("--metadata-uri <uri>", "Metadata URI (required for --calldata-only \u2014 IPFS pin needs a signer)").option("--salt <bytes32>", "CREATE2 salt for the deterministic clone (--calldata-only; default: derived from inputs)").option("--amount <n>", "Asset amount to deploy").option("--min-redeem <n>", "Min asset on settlement (Moonwell)").option("--token <symbol>", "Asset token symbol (default: USDC)").option("--asset <symbol>", "Asset token (USDC, VVV, or address)").option("--agent <address>", "Agent wallet (Venice, default: your wallet)").option("--min-vvv <n>", "Min VVV from swap (Venice)").option("--single-hop", "Single-hop Aerodrome swap (Venice)").option("--token-a <address>", "Token A (Aerodrome)").option("--token-b <address>", "Token B (Aerodrome)").option("--amount-a <n>", "Token A amount (Aerodrome)").option("--amount-b <n>", "Token B amount (Aerodrome)").option("--stable", "Stable pool (Aerodrome)").option("--gauge <address>", "Gauge address (Aerodrome)").option("--lp-token <address>", "LP token address (Aerodrome)").option("--min-a-out <n>", "Min token A on settle (Aerodrome)").option("--min-b-out <n>", "Min token B on settle (Aerodrome)").option("--slippage <bps>", "Slippage tolerance in bps (wstETH, default: 500 = 5%)").option("--mamo-factory <address>", "Mamo StrategyFactory address (Mamo)").option("--tokens <list>", "Comma-separated token addresses or symbols (Portfolio)").option("--weights <list>", "Comma-separated weights in bps, must sum to 10000 (Portfolio)").option("--max-slippage <bps>", "Max slippage bps (Portfolio, default: 500)").option("--fee-tier <n>", "Pool fee tier (Portfolio, default: 3000)").option("--swap-adapter <address>", "Swap adapter address (Portfolio)").option("--feeds <list>", "Comma-separated Chainlink AggregatorV3 push-feed addresses per token (Portfolio; auto-resolved from the registry when a slot is left empty)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8). Must equal the feed's live decimals().").option("--swap-routes <list>", "Comma-separated per-token swap route spec (Portfolio). Per token: 'v3:<fee>' (mode 0), 'v4:<fee>:<tickSpacing>' (mode 2), or 'v4path:<hop>+<hop>...' (mode 3) where hop='<currency>@<fee>:<tickSpacing>', currency='eth'/'native'=ETH or 'self'=this token or an address. Empty entry = auto-detect / robinhood default.").option(
+  strategy2.command("propose").description("Clone + init + build calls + submit governance proposal (all-in-one)").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--vault <address>", "Vault address").option("--write-calls <dir>", "Write execute/settle JSON to directory (skip proposal submission)").option("--name <name>", "Proposal name").option("--description <text>", "Proposal description").option("--duration <duration>", "Strategy duration (7d, 24h, etc.)").option("--proposer <address>", "Proposer/agent address (required for --calldata-only \u2014 the external signer)").option("--metadata-uri <uri>", "Metadata URI (required for --calldata-only \u2014 IPFS pin needs a signer)").option("--salt <bytes32>", "CREATE2 salt for the deterministic clone (default: derived from vault+proposer+template+initData). Pass a fresh one to re-deploy identical params.").option("--amount <n>", "Asset amount to deploy").option("--min-redeem <n>", "Min asset on settlement (Moonwell)").option("--token <symbol>", "Asset token symbol (default: USDC)").option("--asset <symbol>", "Asset token (USDC, VVV, or address)").option("--agent <address>", "Agent wallet (Venice, default: your wallet)").option("--min-vvv <n>", "Min VVV from swap (Venice)").option("--single-hop", "Single-hop Aerodrome swap (Venice)").option("--token-a <address>", "Token A (Aerodrome)").option("--token-b <address>", "Token B (Aerodrome)").option("--amount-a <n>", "Token A amount (Aerodrome)").option("--amount-b <n>", "Token B amount (Aerodrome)").option("--stable", "Stable pool (Aerodrome)").option("--gauge <address>", "Gauge address (Aerodrome)").option("--lp-token <address>", "LP token address (Aerodrome)").option("--min-a-out <n>", "Min token A on settle (Aerodrome)").option("--min-b-out <n>", "Min token B on settle (Aerodrome)").option("--slippage <bps>", "Slippage tolerance in bps (wstETH, default: 500 = 5%)").option("--mamo-factory <address>", "Mamo StrategyFactory address (Mamo)").option("--tokens <list>", "Comma-separated token addresses or symbols (Portfolio)").option("--weights <list>", "Comma-separated weights in bps, must sum to 10000 (Portfolio)").option("--max-slippage <bps>", "Max slippage bps (Portfolio, default: 500)").option("--fee-tier <n>", "Pool fee tier (Portfolio, default: 3000)").option("--swap-adapter <address>", "Swap adapter address (Portfolio)").option("--feeds <list>", "Comma-separated Chainlink AggregatorV3 push-feed addresses per token (Portfolio; auto-resolved from the registry when a slot is left empty)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8). Must equal the feed's live decimals().").option("--swap-routes <list>", "Comma-separated per-token swap route spec (Portfolio). Per token: 'v3:<fee>' (mode 0), 'v4:<fee>:<tickSpacing>' (mode 2), or 'v4path:<hop>+<hop>...' (mode 3) where hop='<currency>@<fee>:<tickSpacing>', currency='eth'/'native'=ETH or 'self'=this token or an address. Empty entry = auto-detect / robinhood default.").option(
     "--max-drawdown-bps <bps>",
     "Declared loss allowance for this proposal, in bps of --amount (0-10000, default 2000 = 20%). This is the envelope voters and guardians are asked to accept, and the basis the settle-price guard sizes its tolerance from \u2014 not a formality."
   ).option("--leverage <number>", "Leverage multiplier (Hyperliquid Perp, default: 10)").option("--asset-index <number>", "Perp asset index (Hyperliquid Perp, default: 0 for BTC)").option("--max-position <amount>", "Max position size in USD (Hyperliquid Perp, default: 100000)").option("--max-trades-per-day <n>", "Max trades per day (Hyperliquid Perp, default: 50)").option("--max-order-size <amount>", "Max single-order size in asset units (Hyperliquid Grid, default: 10000)").option("--max-orders-per-tick <n>", "Max orders per tick (Hyperliquid Grid, default: 20)").option("--asset-indices <list>", "Comma-separated perp asset indices (Hyperliquid Grid, default: 0)").action(async (templateKey, opts) => {
@@ -977,7 +1130,7 @@ function registerStrategyProposeCommands(strategy2) {
         process.exit(1);
       }
       if (!opts.agent) opts.agent = proposer;
-      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-HVBSI6Z2.js");
+      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-QFBN6RYS.js");
       const strategyDuration2 = parseDuration3(opts.duration);
       const chainId = getChain().id;
       try {
@@ -1100,42 +1253,40 @@ function registerStrategyProposeCommands(strategy2) {
       console.error(chalk3.red(formatContractError(err)));
       process.exit(1);
     }
-    const cloneSpinner = ora2(`Cloning ${def.name} template...`).start();
     let clone;
-    try {
-      const result = await cloneTemplate(templateAddr);
-      clone = result.clone;
-      cloneSpinner.succeed(`Cloned: ${chalk3.green(clone)}`);
-      console.log(chalk3.dim(`  Tx: ${getExplorerUrl(result.hash)}`));
-    } catch (err) {
-      cloneSpinner.fail("Clone failed");
-      console.error(chalk3.red(formatContractError(err)));
-      process.exit(1);
-    }
-    const initSpinner = ora2("Initializing strategy...").start();
     let asset;
     let assetAmount;
     let extraApprovals;
+    const deploySpinner = ora2(`Deploying ${def.name} strategy...`).start();
     try {
       const built = await resolveAndBuildInitData(templateKey, opts, vault);
       asset = built.asset;
       assetAmount = built.assetAmount;
       extraApprovals = built.extraApprovals;
-      const initHash = await writeContractWithRetry({
-        account,
-        chain: getChain(),
-        address: clone,
-        abi: BASE_STRATEGY_ABI,
-        functionName: "initialize",
-        args: [vault, account.address, built.initData]
+      const deployed = await deployStrategyClone({
+        template: templateAddr,
+        vault,
+        proposer: account.address,
+        initData: built.initData,
+        salt: opts.salt
       });
-      const initReceipt = await waitForReceipt(initHash);
-      if (initReceipt.status === "reverted") {
-        throw new Error("Initialize transaction reverted on-chain");
+      clone = deployed.clone;
+      deploySpinner.succeed(
+        deployed.viaFactory ? `Deployed + registered: ${chalk3.green(clone)}` : `Cloned + initialized: ${chalk3.green(clone)}`
+      );
+      console.log(chalk3.dim(`  Tx: ${getExplorerUrl(deployed.hash)}`));
+      if (deployed.initHash) console.log(chalk3.dim(`  Init tx: ${getExplorerUrl(deployed.initHash)}`));
+      if (deployed.registerHash) console.log(chalk3.dim(`  Register tx: ${getExplorerUrl(deployed.registerHash)}`));
+      if (deployed.salt) console.log(chalk3.dim(`  Salt: ${deployed.salt}`));
+      if (!deployed.viaFactory) {
+        console.log(
+          chalk3.yellow(
+            "  No StrategyFactory on this network \u2014 the clone was deployed raw. A governor that gates propose on strategy registration will refuse it."
+          )
+        );
       }
-      initSpinner.succeed("Initialized");
     } catch (err) {
-      initSpinner.fail("Initialize failed");
+      deploySpinner.fail("Strategy deploy failed");
       console.error(chalk3.red(formatContractError(err)));
       process.exit(1);
     }
@@ -1208,9 +1359,9 @@ function registerStrategyProposeCommands(strategy2) {
       console.error(chalk3.red("Missing --name or --duration. Use --write-calls to skip proposal submission."));
       process.exit(1);
     }
-    const { propose: propose2 } = await import("./governor-HVBSI6Z2.js");
+    const { propose: propose2 } = await import("./governor-QFBN6RYS.js");
     const { pinJSON } = await import("./ipfs-M56BLMCW.js");
-    const { parseDuration: parseDuration2 } = await import("./governor-HVBSI6Z2.js");
+    const { parseDuration: parseDuration2 } = await import("./governor-QFBN6RYS.js");
     const strategyDuration = parseDuration2(opts.duration);
     const metaSpinner = ora2("Pinning metadata to IPFS...").start();
     let metadataURI;
@@ -1242,7 +1393,7 @@ function registerStrategyProposeCommands(strategy2) {
       metadataURI = `data:application/json;base64,${Buffer.from(inline).toString("base64")}`;
     }
     try {
-      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-CDI7BELZ.js");
+      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-WWGSRNRP.js");
       const feeBps = await getAgentFeeBps2(vault);
       console.log(
         chalk3.yellow(
@@ -1313,6 +1464,11 @@ function registerStrategyTemplateCommands(strategy2) {
         console.log(`  ${chalk4.bold(t.name)} (${chalk4.cyan(t.key)})`);
         console.log(`    ${t.description}`);
         console.log(`    Template: ${chalk4.green(addr)}`);
+        if (t.encoder === false) {
+          console.log(
+            chalk4.yellow("    No CLI init encoder yet \u2014 propose it via hand-encoded initData.")
+          );
+        }
       }
     }
     if (availableCount === 0) {
@@ -1332,7 +1488,7 @@ function registerStrategyTemplateCommands(strategy2) {
     console.log(chalk4.dim("Full proposal:     sherwood strategy propose <template> --vault <addr> ..."));
     console.log();
   });
-  strategy2.command("clone").description("Clone a strategy template and initialize it").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--vault <address>", "Vault address").option("--amount <n>", "Asset amount to deploy").option("--min-redeem <n>", "Min asset on settlement (Moonwell)").option("--token <symbol>", "Asset token symbol (default: USDC)").option("--asset <symbol>", "Asset token (USDC, VVV, or address)").option("--agent <address>", "Agent wallet (Venice, default: your wallet)").option("--min-vvv <n>", "Min VVV from swap (Venice)").option("--single-hop", "Single-hop Aerodrome swap (Venice)").option("--token-a <address>", "Token A (Aerodrome)").option("--token-b <address>", "Token B (Aerodrome)").option("--amount-a <n>", "Token A amount (Aerodrome)").option("--amount-b <n>", "Token B amount (Aerodrome)").option("--stable", "Stable pool (Aerodrome)").option("--gauge <address>", "Gauge address (Aerodrome)").option("--lp-token <address>", "LP token address (Aerodrome)").option("--min-a-out <n>", "Min token A on settle (Aerodrome)").option("--min-b-out <n>", "Min token B on settle (Aerodrome)").option("--slippage <bps>", "Slippage tolerance in bps (wstETH, default: 500 = 5%)").option("--mamo-factory <address>", "Mamo StrategyFactory address (Mamo)").option("--tokens <list>", "Comma-separated token addresses or symbols (Portfolio)").option("--weights <list>", "Comma-separated weights in bps, must sum to 10000 (Portfolio)").option("--max-slippage <bps>", "Max slippage bps (Portfolio, default: 500)").option("--fee-tier <n>", "Pool fee tier (Portfolio, default: 3000)").option("--swap-adapter <address>", "Swap adapter address (Portfolio)").option("--feeds <list>", "Comma-separated Chainlink AggregatorV3 push-feed addresses per token (Portfolio; auto-resolved from the registry when a slot is left empty)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8). Must equal the feed's live decimals().").option("--swap-routes <list>", "Comma-separated per-token swap route spec (Portfolio). Per token: 'v3:<fee>' (mode 0), 'v4:<fee>:<tickSpacing>' (mode 2), or 'v4path:<hop>+<hop>...' (mode 3) where hop='<currency>@<fee>:<tickSpacing>', currency='eth'/'native'=ETH or 'self'=this token or an address. Empty entry = auto-detect / robinhood default.").option(
+  strategy2.command("clone").description("Clone a strategy template and initialize it").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--vault <address>", "Vault address").option("--salt <bytes32>", "CREATE2 salt for the deterministic clone (default: derived from vault+proposer+template+initData). Pass a fresh one to re-deploy identical params.").option("--amount <n>", "Asset amount to deploy").option("--min-redeem <n>", "Min asset on settlement (Moonwell)").option("--token <symbol>", "Asset token symbol (default: USDC)").option("--asset <symbol>", "Asset token (USDC, VVV, or address)").option("--agent <address>", "Agent wallet (Venice, default: your wallet)").option("--min-vvv <n>", "Min VVV from swap (Venice)").option("--single-hop", "Single-hop Aerodrome swap (Venice)").option("--token-a <address>", "Token A (Aerodrome)").option("--token-b <address>", "Token B (Aerodrome)").option("--amount-a <n>", "Token A amount (Aerodrome)").option("--amount-b <n>", "Token B amount (Aerodrome)").option("--stable", "Stable pool (Aerodrome)").option("--gauge <address>", "Gauge address (Aerodrome)").option("--lp-token <address>", "LP token address (Aerodrome)").option("--min-a-out <n>", "Min token A on settle (Aerodrome)").option("--min-b-out <n>", "Min token B on settle (Aerodrome)").option("--slippage <bps>", "Slippage tolerance in bps (wstETH, default: 500 = 5%)").option("--mamo-factory <address>", "Mamo StrategyFactory address (Mamo)").option("--tokens <list>", "Comma-separated token addresses or symbols (Portfolio)").option("--weights <list>", "Comma-separated weights in bps, must sum to 10000 (Portfolio)").option("--max-slippage <bps>", "Max slippage bps (Portfolio, default: 500)").option("--fee-tier <n>", "Pool fee tier (Portfolio, default: 3000)").option("--swap-adapter <address>", "Swap adapter address (Portfolio)").option("--feeds <list>", "Comma-separated Chainlink AggregatorV3 push-feed addresses per token (Portfolio; auto-resolved from the registry when a slot is left empty)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8). Must equal the feed's live decimals().").option("--swap-routes <list>", "Comma-separated per-token swap route spec (Portfolio). Per token: 'v3:<fee>' (mode 0), 'v4:<fee>:<tickSpacing>' (mode 2), or 'v4path:<hop>+<hop>...' (mode 3) where hop='<currency>@<fee>:<tickSpacing>', currency='eth'/'native'=ETH or 'self'=this token or an address. Empty entry = auto-detect / robinhood default.").option(
     "--max-drawdown-bps <bps>",
     "Declared loss allowance for this proposal, in bps of --amount (0-10000, default 2000 = 20%). This is the envelope voters and guardians are asked to accept, and the basis the settle-price guard sizes its tolerance from \u2014 not a formality."
   ).option("--leverage <number>", "Leverage multiplier (Hyperliquid Perp, default: 10)").option("--asset-index <number>", "Perp asset index (Hyperliquid Perp, default: 0 for BTC)").option("--max-position <amount>", "Max position size in USD (Hyperliquid Perp, default: 100000)").option("--max-trades-per-day <n>", "Max trades per day (Hyperliquid Perp, default: 50)").option("--max-order-size <amount>", "Max single-order size in asset units (Hyperliquid Grid, default: 10000)").option("--max-orders-per-tick <n>", "Max orders per tick (Hyperliquid Grid, default: 20)").option("--asset-indices <list>", "Comma-separated perp asset indices (Hyperliquid Grid, default: 0)").action(async (templateKey, opts) => {
@@ -1342,39 +1498,35 @@ function registerStrategyTemplateCommands(strategy2) {
       process.exit(1);
     }
     const { def, address: templateAddr } = resolveTemplate(templateKey);
-    const cloneSpinner = ora3(`Cloning ${def.name} template...`).start();
     let clone;
-    let cloneHash;
-    try {
-      const result = await cloneTemplate(templateAddr);
-      clone = result.clone;
-      cloneHash = result.hash;
-      cloneSpinner.succeed(`Cloned: ${chalk4.green(clone)}`);
-      console.log(chalk4.dim(`  Tx: ${getExplorerUrl(cloneHash)}`));
-    } catch (err) {
-      cloneSpinner.fail("Clone failed");
-      console.error(chalk4.red(formatContractError(err)));
-      process.exit(1);
-    }
-    const initSpinner = ora3("Initializing strategy...").start();
+    const deploySpinner = ora3(`Deploying ${def.name} strategy...`).start();
     try {
       const { initData } = await resolveAndBuildInitData(templateKey, opts, vault);
       const account = getAccount();
-      const initHash = await writeContractWithRetry({
-        account,
-        chain: getChain(),
-        address: clone,
-        abi: BASE_STRATEGY_ABI,
-        functionName: "initialize",
-        args: [vault, account.address, initData]
+      const deployed = await deployStrategyClone({
+        template: templateAddr,
+        vault,
+        proposer: account.address,
+        initData,
+        salt: opts.salt
       });
-      const receipt = await waitForReceipt(initHash);
-      if (receipt.status === "reverted") {
-        throw new Error("Initialize transaction reverted on-chain");
+      clone = deployed.clone;
+      deploySpinner.succeed(
+        deployed.viaFactory ? `Deployed + registered: ${chalk4.green(clone)}` : `Cloned + initialized: ${chalk4.green(clone)}`
+      );
+      console.log(chalk4.dim(`  Tx: ${getExplorerUrl(deployed.hash)}`));
+      if (deployed.initHash) console.log(chalk4.dim(`  Init tx: ${getExplorerUrl(deployed.initHash)}`));
+      if (deployed.registerHash) console.log(chalk4.dim(`  Register tx: ${getExplorerUrl(deployed.registerHash)}`));
+      if (deployed.salt) console.log(chalk4.dim(`  Salt: ${deployed.salt}`));
+      if (!deployed.viaFactory) {
+        console.log(
+          chalk4.yellow(
+            "  No StrategyFactory on this network \u2014 the clone was deployed raw. A governor that gates propose on strategy registration will refuse it."
+          )
+        );
       }
-      initSpinner.succeed("Initialized");
     } catch (err) {
-      initSpinner.fail("Initialize failed");
+      deploySpinner.fail("Strategy deploy failed");
       console.error(chalk4.red(formatContractError(err)));
       process.exit(1);
     }
@@ -1513,7 +1665,7 @@ function registerStrategyTemplateCommands(strategy2) {
       let prices = [];
       let priceSource = null;
       try {
-        const { getTokenPricesInAsset } = await import("./price-O3THX2HL.js");
+        const { getTokenPricesInAsset } = await import("./price-EXZDYVDD.js");
         prices = await getTokenPricesInAsset({
           tokens: allocations.map((a, i) => ({
             token: a.token,
@@ -1922,7 +2074,7 @@ function registerVeniceCommands(program2) {
       console.log(chalk5.dim(`  Key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`));
       console.log(chalk5.dim("  Saved to ~/.sherwood/config.json"));
       try {
-        const { createVeniceProvisionAttestation, getEasScanUrl } = await import("./eas-VFTWEI4K.js");
+        const { createVeniceProvisionAttestation, getEasScanUrl } = await import("./eas-B4HR2HXX.js");
         const attestation = await createVeniceProvisionAttestation(account.address);
         if (attestation) {
           console.log(chalk5.dim(`  Attested: ${getEasScanUrl(attestation.uid)}`));
@@ -2278,7 +2430,7 @@ ${opts.prompt}`;
         console.log(chalk5.dim(`Model: ${result.model} | Tokens: ${result.usage.promptTokens} in, ${result.usage.completionTokens} out, ${result.usage.totalTokens} total`));
       }
       try {
-        const { createVeniceInferenceAttestation, getEasScanUrl } = await import("./eas-VFTWEI4K.js");
+        const { createVeniceInferenceAttestation, getEasScanUrl } = await import("./eas-B4HR2HXX.js");
         const { keccak256: keccak2562, toHex, isAddress: isAddr } = await import("viem");
         const { getChainContracts: getChainContracts2 } = await import("./config-ZGFS4I7K.js");
         const { getChain: getActiveChain } = await import("./network-7445KSCF.js");
@@ -3277,8 +3429,8 @@ function printSimulationResult(result, callType) {
 }
 async function sendSimulationAlert(subdomain, proposalId, vault, execResult, settleResult) {
   try {
-    const xmtp = await import("./xmtp-7LAWDKJT.js");
-    const { getAccount: getAccount2 } = await import("./client-C6N2ASTH.js");
+    const xmtp = await import("./xmtp-72IRK7JL.js");
+    const { getAccount: getAccount2 } = await import("./client-PYFE6YQR.js");
     const group = await xmtp.getGroup("", subdomain);
     const allRisks = [...execResult.risks, ...settleResult?.risks ?? []];
     const criticals = allRisks.filter((r) => r.level === "critical");
@@ -4562,6 +4714,65 @@ function registerProposalCommands(program2) {
       process.exit(1);
     }
   });
+  proposal.command("reclaim-bond").description("Reclaim the proposer bond of a terminal proposal (cancelled / rejected / expired / settled)").requiredOption("--id <proposalId>", "Proposal ID").requiredOption("--vault <address>", "Vault the proposal belongs to (per-vault governor)").action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const vault = parseVaultOption(opts.vault);
+      if (isCalldataOnly()) {
+        const governor = await getGovernorOf(vault);
+        emitCalldata({
+          txs: [
+            {
+              to: governor,
+              data: encodeFunctionData3({
+                abi: SYNDICATE_GOVERNOR_ABI,
+                functionName: "reclaimProposerBond",
+                args: [proposalId]
+              }),
+              value: "0x0",
+              chainId: getChain().id
+            }
+          ],
+          preconditions: [],
+          description: `Release proposal #${proposalId}'s proposer bond from escrow back to the proposer.`,
+          note: "Permissionless \u2014 any wallet may broadcast it; the WOOD goes to whoever posted the bond. The proposal must be Rejected / Expired / Cancelled / Settled, and for an EXECUTED proposal the challenge window (executedAt + strategyDuration + challengeWindow) must have closed."
+        });
+        return;
+      }
+      const spinner = ora6("Loading proposal...").start();
+      const [p, state] = await Promise.all([
+        getProposal(vault, proposalId),
+        getProposalState(vault, proposalId)
+      ]);
+      const TERMINAL = /* @__PURE__ */ new Set([
+        PROPOSAL_STATE.Rejected,
+        PROPOSAL_STATE.Expired,
+        PROPOSAL_STATE.Cancelled,
+        PROPOSAL_STATE.Settled
+      ]);
+      if (!TERMINAL.has(state)) {
+        spinner.fail(
+          `Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 a bond is only reclaimable from Rejected / Expired / Cancelled / Settled.`
+        );
+        process.exit(1);
+      }
+      if (p.proposerBondWood === 0n) {
+        spinner.fail(
+          "This proposal has no proposer bond left to reclaim (never bonded, already reclaimed, or forfeited)."
+        );
+        process.exit(1);
+      }
+      spinner.text = W3(`Reclaiming ${formatUnits8(p.proposerBondWood, 18)} WOOD...`);
+      const hash = await reclaimProposerBond(vault, proposalId);
+      spinner.succeed(G3(`Bond released: ${formatUnits8(p.proposerBondWood, 18)} WOOD \u2192 ${p.proposer}`));
+      console.log(DIM3(`  ${getExplorerUrl(hash)}`));
+      console.log();
+    } catch (err) {
+      console.error(chalk8.red(`
+  \u2716 ${formatContractError(err)}`));
+      process.exit(1);
+    }
+  });
   proposal.command("simulate").description("Simulate proposal calls via Tenderly (or eth_call fallback)").option("--id <proposalId>", "Proposal ID to simulate").option("--vault <address>", "Vault address (required \u2014 proposal IDs are per-vault)").option("--execute-calls <path>", "Path to JSON execute calls file").option("--settle-calls <path>", "Path to JSON settlement calls file").option("--notify <subdomain>", "Send results to vault XMTP chat").action(async (opts) => {
     try {
       let vault;
@@ -7837,9 +8048,9 @@ try {
 } catch {
 }
 var require2 = createRequire(import.meta.url);
-var CLI_VERSION = "0.87.0";
+var CLI_VERSION = "0.88.0";
 async function loadXmtp() {
-  return import("./xmtp-7LAWDKJT.js");
+  return import("./xmtp-72IRK7JL.js");
 }
 async function loadCron() {
   return import("./cron-E3UAZF5B.js");
@@ -8510,7 +8721,7 @@ vaultCmd.command("add").description("Register an agent on a vault (creator only)
       agentId = BigInt(opts.agentId);
     } else {
       spinner.text = "Looking up ERC-8004 identity from wallet...";
-      const { lookupAgentIdByWallet } = await import("./identity-OLD25QEP.js");
+      const { lookupAgentIdByWallet } = await import("./identity-I2BG4IGT.js");
       const resolved = await lookupAgentIdByWallet(agentWallet);
       if (resolved === null) {
         spinner.fail("Agent wallet does not own an ERC-8004 identity NFT");
@@ -9213,7 +9424,7 @@ vaultCmd.command("redeem").description("Redeem vault shares for the underlying a
 var strategy = program.command("strategy").description("Strategy templates \u2014 list, clone, propose");
 registerStrategyTemplateCommands(strategy);
 program.command("providers").description("List available providers (research + swap routing)").action(async () => {
-  const { listProviders } = await import("./providers-KZNCCUKT.js");
+  const { listProviders } = await import("./providers-6UZKDFQD.js");
   for (const info of listProviders()) {
     console.log(`
 ${info.name} (${info.type})`);
@@ -9223,7 +9434,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-OZAAN5LT.js");
+  const { registerChatCommands } = await import("./chat-AKLYUJZV.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Vault chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
@@ -9233,7 +9444,7 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-A7CYZSSA.js");
+var { registerSessionCommands } = await import("./session-45NQAHFI.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
@@ -9242,11 +9453,11 @@ registerProposalCommands(program);
 registerQueueCommands(program);
 registerGovernorCommands(program);
 registerGuardianCommands(program);
-var { registerResearchCommands } = await import("./research-ARFBFXIT.js");
+var { registerResearchCommands } = await import("./research-T7A27OMB.js");
 registerResearchCommands(program);
-var { registerAgentCommands } = await import("./agent-A2JEYGQS.js");
+var { registerAgentCommands } = await import("./agent-FCGZL4GF.js");
 registerAgentCommands(program);
-var { registerTradeCommands } = await import("./trade-ZCK332E4.js");
+var { registerTradeCommands } = await import("./trade-ZOVM433K.js");
 registerTradeCommands(program);
 registerGridCommand(program);
 var configCmd = program.command("config");