@sherwoodagent/cli 0.86.1 → 0.87.1

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   checkApiKeyValid,
   listModels,
   provisionApiKey
-} from "./chunk-KVB5P2OE.js";
+} from "./chunk-EEI6FRTE.js";
 import {
   DEFAULT_FEE_TIER,
   HYPERLIQUID_PERP_STRATEGY_ABI,
@@ -31,10 +31,13 @@ import {
   parseAlignedOverrides,
   resolveToken,
   selectBestFeeTier
-} from "./chunk-3IAZQMAW.js";
+} from "./chunk-QFGZQYZA.js";
 import {
   DEFAULT_ISSUING_CHAIN_ID,
+  STRATEGY_FACTORY_ABI,
   appendVidTag,
+  deriveStrategySalt,
+  effectiveStrategySalt,
   emitCalldata,
   encodeApproveAgent,
   encodeApproveDepositor,
@@ -50,7 +53,6 @@ import {
   encodeMgmtSplit,
   encodePerfSplit,
   encodePropose,
-  encodeProposeWithSandbox,
   encodeRedeem,
   encodeRegisterAgent,
   encodeSettle,
@@ -61,11 +63,12 @@ import {
   isCalldataOnly,
   makeOwnerOfCache,
   parseVidTag,
+  predictStrategyCloneAddress,
   registerIdentityCommands,
   setCalldataOnly,
   stripVidTag,
   verifyVidTag
-} from "./chunk-6QBGTX2Q.js";
+} from "./chunk-VYCLG5DE.js";
 import {
   createApproval,
   createJoinRequest,
@@ -75,20 +78,20 @@ import {
   queryJoinRequests,
   revokeJoinRequest,
   stripReferrerPrefix
-} from "./chunk-OUYMZ5ZC.js";
+} from "./chunk-SI65QHTY.js";
 import {
   createFund,
   getActiveFunds,
   getFund,
   subdomainExists,
   updateMetadata
-} from "./chunk-EVUKJ7CJ.js";
+} from "./chunk-6D3FNU75.js";
 import {
   resolveFund,
   resolveVaultFund,
   searchFundAcrossChains,
   setTextRecord
-} from "./chunk-ZN2MHIB7.js";
+} from "./chunk-4ITTHKRX.js";
 import {
   approveDepositor,
   deposit,
@@ -111,8 +114,8 @@ import {
   removeDepositor,
   setAgentFeeBps,
   setVaultAddress
-} from "./chunk-XPVXNG2K.js";
-import "./chunk-EA65CDQH.js";
+} from "./chunk-N2E2Q5GL.js";
+import "./chunk-BH3VTJ4F.js";
 import {
   PROPOSAL_STATE,
   PROPOSAL_STATES,
@@ -137,9 +140,9 @@ import {
   getVoteWeight,
   hasVoted,
   parseDuration,
-  parseProposalIdFromLogs,
   proposalCount,
   propose,
+  reclaimProposerBond,
   scanReviewCandidates,
   setCooldownPeriod,
   setExecutionWindow,
@@ -151,7 +154,7 @@ import {
   setVotingPeriod,
   settleProposal,
   vote
-} from "./chunk-YAS52NEF.js";
+} from "./chunk-G5MXVAFC.js";
 import {
   AERODROME,
   MOONWELL,
@@ -160,7 +163,7 @@ import {
   TOKENS,
   UNISWAP,
   VENICE
-} from "./chunk-IAM4VIU2.js";
+} from "./chunk-FWQESFFM.js";
 import {
   GAS_UNITS,
   estimateGasCushion,
@@ -171,7 +174,7 @@ import {
   sendTxWithRetry,
   waitForReceipt,
   writeContractWithRetry
-} from "./chunk-QRMZRAMG.js";
+} from "./chunk-D4BSBW3Q.js";
 import {
   DEFAULT_NETWORK,
   VALID_NETWORKS,
@@ -181,7 +184,7 @@ import {
   isTestnet,
   setNetwork,
   withNetwork
-} from "./chunk-PVTZMRC6.js";
+} from "./chunk-G3FUEM5N.js";
 import {
   addFund,
   cacheGroupId,
@@ -212,9 +215,10 @@ import {
   PORTFOLIO_STRATEGY_ABI,
   SWAP_ROUTER_ABI,
   SWAP_ROUTER_EXACT_INPUT_SINGLE_ABI,
+  SYNDICATE_GOVERNOR_ABI,
   SYNDICATE_VAULT_ABI,
   VENICE_STAKING_ABI
-} from "./chunk-F3MDCUGO.js";
+} from "./chunk-J2IZWAEW.js";
 import {
   fetchMetadata,
   mergeFundMetadata,
@@ -225,13 +229,13 @@ import {
 import { config as loadDotenv } from "dotenv";
 import { createRequire } from "module";
 import { Command, Option } from "commander";
-import { parseUnits as parseUnits11, formatUnits as formatUnits9, isAddress as isAddress10 } from "viem";
+import { parseUnits as parseUnits11, formatUnits as formatUnits10, isAddress as isAddress10 } from "viem";
 import chalk17 from "chalk";
 import ora9 from "ora";
 import { input, confirm, select } from "@inquirer/prompts";
 
 // src/lib/generated/contract-constants.ts
-var MAX_AGENT_FEE_BPS = 3e3;
+var MAX_AGENT_FEE_BPS = 2500;
 
 // src/lib/format.ts
 function formatDurationShort(seconds) {
@@ -291,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 = [
   {
@@ -610,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) {
@@ -624,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) {
@@ -892,10 +1043,10 @@ 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("--feed-ids <list>", "Comma-separated Chainlink feed ids/addresses per token (Portfolio; auto-resolved from registry in push-feed mode)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8 push / 18 Data Streams)").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("--max-price-ages <list>", "Comma-separated per-token max Chainlink push-feed staleness in seconds (Portfolio, push mode; robinhood-mainnet equity feeds default to 345600 = 96h, crypto/stable feeds to the contract default). Empty entry = registry default.").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) => {
+  ).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) => {
     const vault = opts.vault;
     if (!isAddress3(vault)) {
       console.error(chalk3.red("Invalid vault address"));
@@ -979,7 +1130,7 @@ function registerStrategyProposeCommands(strategy2) {
         process.exit(1);
       }
       if (!opts.agent) opts.agent = proposer;
-      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-JNSWPJVQ.js");
+      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-QFBN6RYS.js");
       const strategyDuration2 = parseDuration3(opts.duration);
       const chainId = getChain().id;
       try {
@@ -1102,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);
     }
@@ -1210,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-JNSWPJVQ.js");
+    const { propose: propose2 } = await import("./governor-QFBN6RYS.js");
     const { pinJSON } = await import("./ipfs-M56BLMCW.js");
-    const { parseDuration: parseDuration2 } = await import("./governor-JNSWPJVQ.js");
+    const { parseDuration: parseDuration2 } = await import("./governor-QFBN6RYS.js");
     const strategyDuration = parseDuration2(opts.duration);
     const metaSpinner = ora2("Pinning metadata to IPFS...").start();
     let metadataURI;
@@ -1244,7 +1393,7 @@ function registerStrategyProposeCommands(strategy2) {
       metadataURI = `data:application/json;base64,${Buffer.from(inline).toString("base64")}`;
     }
     try {
-      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-HWJQJW5U.js");
+      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-WWGSRNRP.js");
       const feeBps = await getAgentFeeBps2(vault);
       console.log(
         chalk3.yellow(
@@ -1315,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) {
@@ -1334,49 +1488,45 @@ 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("--feed-ids <list>", "Comma-separated Chainlink feed ids/addresses per token (Portfolio; auto-resolved from registry in push-feed mode)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8 push / 18 Data Streams)").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("--max-price-ages <list>", "Comma-separated per-token max Chainlink push-feed staleness in seconds (Portfolio, push mode; robinhood-mainnet equity feeds default to 345600 = 96h, crypto/stable feeds to the contract default). Empty entry = registry default.").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) => {
+  ).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) => {
     const vault = opts.vault;
     if (!isAddress4(vault)) {
       console.error(chalk4.red("Invalid vault address"));
       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);
     }
@@ -1405,10 +1555,10 @@ function registerStrategyTemplateCommands(strategy2) {
     console.log(chalk4.dim("Use this address in your proposal batch calls."));
     console.log();
   });
-  strategy2.command("init").description("Initialize an already-deployed but uninitialized strategy clone").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--clone <address>", "Clone address to initialize").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("--feed-ids <list>", "Comma-separated Chainlink feed ids/addresses per token (Portfolio; auto-resolved from registry in push-feed mode)").option("--price-decimals <list>", "Comma-separated raw feed decimals per token (Portfolio; default 8 push / 18 Data Streams)").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("init").description("Initialize an already-deployed but uninitialized strategy clone").argument("<template>", "Template: moonwell-supply, aerodrome-lp, venice-inference, wsteth-moonwell, mamo-yield, portfolio, hyperliquid-perp, hyperliquid-grid").requiredOption("--clone <address>", "Clone address to initialize").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(
     "--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("--max-price-ages <list>", "Comma-separated per-token max Chainlink push-feed staleness in seconds (Portfolio, push mode; robinhood-mainnet equity feeds default to 345600 = 96h, crypto/stable feeds to the contract default). Empty entry = registry default.").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) => {
+  ).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) => {
     const clone = opts.clone;
     const vault = opts.vault;
     if (!isAddress4(clone)) {
@@ -1515,7 +1665,7 @@ function registerStrategyTemplateCommands(strategy2) {
       let prices = [];
       let priceSource = null;
       try {
-        const { getTokenPricesInAsset } = await import("./price-YNPYE2EO.js");
+        const { getTokenPricesInAsset } = await import("./price-EXZDYVDD.js");
         prices = await getTokenPricesInAsset({
           tokens: allocations.map((a, i) => ({
             token: a.token,
@@ -1666,7 +1816,7 @@ function registerStrategyTemplateCommands(strategy2) {
       if (stateStr === "Executed") {
         console.log();
         console.log(chalk4.dim("Rebalance:  sherwood strategy rebalance " + clone));
-        console.log(chalk4.dim("With new weights: sherwood strategy rebalance " + clone + " --new-weights 2500,2500,2000,1500,1500"));
+        console.log(chalk4.dim("Tighten slippage first: sherwood strategy rebalance " + clone + " --max-slippage 200"));
       }
       console.log();
     } catch (err) {
@@ -1675,7 +1825,7 @@ function registerStrategyTemplateCommands(strategy2) {
       process.exit(1);
     }
   });
-  strategy2.command("rebalance").description("Rebalance a portfolio strategy \u2014 sell all positions, re-buy at target weights (Portfolio only)").argument("<clone>", "Strategy clone address").option("--new-weights <list>", "Comma-separated new weights in bps (must sum to 10000). Updates weights before rebalancing.").option("--max-slippage <bps>", "New max slippage bps (used with --new-weights)").option("--dry-run", "Show what would happen without executing").action(async (cloneArg, opts) => {
+  strategy2.command("rebalance").description("Rebalance a portfolio strategy \u2014 trade each allocation back to its target weight (Portfolio only)").argument("<clone>", "Strategy clone address").option("--max-slippage <bps>", "Tighten max slippage bps before rebalancing (weights and routes are frozen at init \u2014 only a LOWER tolerance is accepted)").option("--dry-run", "Show what would happen without executing").action(async (cloneArg, opts) => {
     if (!isAddress4(cloneArg)) {
       console.error(chalk4.red("Invalid clone address"));
       process.exit(1);
@@ -1723,50 +1873,29 @@ function registerStrategyTemplateCommands(strategy2) {
           `  ${chalk4.bold(symbol.padEnd(8))} ${weightPct.padEnd(8)} bal: ${formatUnits5(balance, decimals)}`
         );
       }
-      let newWeightsBps;
-      if (opts.newWeights) {
-        newWeightsBps = opts.newWeights.split(",").map((w) => Number(w.trim()));
-        if (newWeightsBps.length !== allocations.length) {
-          console.error(chalk4.red(`--new-weights must have ${allocations.length} values (one per token)`));
-          process.exit(1);
-        }
-        const weightSum = newWeightsBps.reduce((a, b) => a + b, 0);
-        if (weightSum !== 1e4) {
-          console.error(chalk4.red(`Weights must sum to 10000, got ${weightSum}`));
-          process.exit(1);
-        }
-        console.log();
-        console.log(chalk4.bold("New Target Weights"));
-        console.log(chalk4.dim("\u2500".repeat(50)));
-        for (let i = 0; i < allocations.length; i++) {
-          const [, symbol] = tokenData[i];
-          const oldPct = (Number(allocations[i].targetWeightBps) / 100).toFixed(1);
-          const newPct = (newWeightsBps[i] / 100).toFixed(1);
-          const arrow = oldPct !== newPct ? chalk4.yellow("\u2192") : chalk4.dim("\u2192");
-          console.log(`  ${chalk4.bold(symbol.padEnd(8))} ${oldPct}% ${arrow} ${newPct}%`);
-        }
+      const newMaxSlippageBps = opts.maxSlippage ? Number(opts.maxSlippage) : void 0;
+      if (newMaxSlippageBps !== void 0 && (!Number.isInteger(newMaxSlippageBps) || newMaxSlippageBps <= 0)) {
+        console.error(chalk4.red(`--max-slippage must be a positive integer bps, got '${opts.maxSlippage}'`));
+        process.exit(1);
       }
       if (opts.dryRun) {
         console.log();
         console.log(chalk4.yellow("Dry run \u2014 no transactions sent."));
         console.log(chalk4.dim("The rebalance would:"));
-        console.log(chalk4.dim("  1. Sell all current token positions back to " + assetSymbol));
-        console.log(chalk4.dim("  2. Re-buy at " + (newWeightsBps ? "new" : "current") + " target weights"));
+        if (newMaxSlippageBps !== void 0) {
+          console.log(chalk4.dim("  0. Tighten max slippage to " + newMaxSlippageBps + " bps"));
+        }
+        console.log(chalk4.dim("  1. Price every allocation off its bound push feed"));
+        console.log(chalk4.dim(`  2. Trade each slot's drift back to its target weight, via ${assetSymbol}`));
         console.log();
         return;
       }
-      if (newWeightsBps) {
-        const maxSlip = Number(opts.maxSlippage || "0");
-        const swapData = await publicClient.readContract({
-          address: clone,
-          abi: PORTFOLIO_STRATEGY_ABI,
-          functionName: "getSwapExtraData"
-        });
-        const updateSpinner = ora3("Updating target weights...").start();
+      if (newMaxSlippageBps !== void 0) {
+        const updateSpinner = ora3("Tightening max slippage...").start();
         try {
           const innerData = encodeAbiParameters3(
             [{ type: "uint256[]" }, { type: "uint256" }, { type: "bytes[]" }],
-            [newWeightsBps.map((w) => BigInt(w)), BigInt(maxSlip), swapData]
+            [[], BigInt(newMaxSlippageBps), []]
           );
           const updateHash = await writeContractWithRetry({
             account,
@@ -1778,25 +1907,25 @@ function registerStrategyTemplateCommands(strategy2) {
           });
           const receipt = await waitForReceipt(updateHash);
           if (receipt.status === "reverted") throw new Error("updateParams reverted");
-          updateSpinner.succeed("Target weights updated");
+          updateSpinner.succeed(`Max slippage tightened to ${newMaxSlippageBps} bps`);
           console.log(chalk4.dim(`  Tx: ${getExplorerUrl(updateHash)}`));
         } catch (err) {
-          updateSpinner.fail("Failed to update weights");
+          updateSpinner.fail("Failed to tighten slippage");
           console.error(chalk4.red(formatContractError(err)));
           process.exit(1);
         }
       }
-      const rebalanceSpinner = ora3("Rebalancing portfolio (sell all \u2192 re-buy at targets)...").start();
+      const rebalanceSpinner = ora3("Rebalancing portfolio (trading each slot's drift)...").start();
       try {
         const rebalanceHash = await writeContractWithRetry({
           account,
           chain,
           address: clone,
           abi: PORTFOLIO_STRATEGY_ABI,
-          functionName: "rebalance"
+          functionName: "rebalanceDelta"
         });
         const receipt = await waitForReceipt(rebalanceHash);
-        if (receipt.status === "reverted") throw new Error("rebalance() reverted on-chain");
+        if (receipt.status === "reverted") throw new Error("rebalanceDelta() reverted on-chain");
         rebalanceSpinner.succeed("Portfolio rebalanced");
         console.log(chalk4.dim(`  Tx: ${getExplorerUrl(rebalanceHash)}`));
       } catch (err) {
@@ -1945,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-KMDAMLXW.js");
+        const { createVeniceProvisionAttestation, getEasScanUrl } = await import("./eas-DV3Z7AT3.js");
         const attestation = await createVeniceProvisionAttestation(account.address);
         if (attestation) {
           console.log(chalk5.dim(`  Attested: ${getEasScanUrl(attestation.uid)}`));
@@ -2301,10 +2430,10 @@ ${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-KMDAMLXW.js");
+        const { createVeniceInferenceAttestation, getEasScanUrl } = await import("./eas-DV3Z7AT3.js");
         const { keccak256: keccak2562, toHex, isAddress: isAddr } = await import("viem");
         const { getChainContracts: getChainContracts2 } = await import("./config-ZGFS4I7K.js");
-        const { getChain: getActiveChain } = await import("./network-FEHRFDPJ.js");
+        const { getChain: getActiveChain } = await import("./network-7445KSCF.js");
         const vaultRecipient = opts.vault && isAddr(opts.vault) ? opts.vault : getChainContracts2(getActiveChain().id).vault;
         const promptHash = keccak2562(toHex(userContent)).slice(0, 18);
         const attestation = await createVeniceInferenceAttestation(
@@ -2602,7 +2731,7 @@ function registerAllowanceCommands(program2) {
 }
 
 // src/commands/proposal.ts
-import { isAddress as isAddress7, encodeFunctionData as encodeFunctionData3, parseUnits as parseUnits8 } from "viem";
+import { isAddress as isAddress7, encodeFunctionData as encodeFunctionData3, formatUnits as formatUnits8, parseUnits as parseUnits8 } from "viem";
 import chalk8 from "chalk";
 import ora6 from "ora";
 import { readFileSync as readFileSync2 } from "fs";
@@ -3300,8 +3429,8 @@ function printSimulationResult(result, callType) {
 }
 async function sendSimulationAlert(subdomain, proposalId, vault, execResult, settleResult) {
   try {
-    const xmtp = await import("./xmtp-KW73BGVO.js");
-    const { getAccount: getAccount2 } = await import("./client-3SE632Q2.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");
@@ -3410,47 +3539,12 @@ function parseCallsFile(path) {
     value: BigInt(c.value || "0")
   }));
 }
-function parseSandboxCallsFile(path) {
-  const raw = readFileSync2(path, "utf-8");
-  const parsed = JSON.parse(raw);
-  if (!Array.isArray(parsed)) {
-    console.error(chalk8.red("  sandbox calls file must be a JSON array of {target, data} objects"));
-    process.exit(1);
+function parseWoodAmount(raw, flag) {
+  const s = String(raw ?? "").trim();
+  if (!/^\d+(\.\d+)?$/.test(s)) {
+    throw new Error(`${flag} must be a non-negative decimal WOOD amount, got "${s}".`);
   }
-  return parsed.map((c, i) => {
-    if (!c || typeof c !== "object") {
-      console.error(chalk8.red(`  sandbox.calls[${i}] must be an object`));
-      process.exit(1);
-    }
-    const rec = c;
-    if (rec.value !== void 0 && rec.value !== null) {
-      console.error(
-        chalk8.red(
-          `  sandbox.calls[${i}] must be (address,bytes) only \u2014 ICallSandbox.Call has no value field.`
-        )
-      );
-      process.exit(1);
-    }
-    if (typeof rec.target !== "string" || !isAddress7(rec.target)) {
-      console.error(chalk8.red(`  sandbox.calls[${i}].target must be a 0x-prefixed address`));
-      process.exit(1);
-    }
-    if (typeof rec.data !== "string" || !/^0x[0-9a-fA-F]*$/.test(rec.data)) {
-      console.error(chalk8.red(`  sandbox.calls[${i}].data must be a 0x-prefixed hex string`));
-      process.exit(1);
-    }
-    return { target: rec.target, data: rec.data };
-  });
-}
-function parseSandboxTokens(list) {
-  if (list === void 0 || list.trim().length === 0) return [];
-  return list.split(",").map((x) => x.trim()).filter((x) => x.length > 0).map((a, i) => {
-    if (!isAddress7(a)) {
-      console.error(chalk8.red(`  --sandbox-tokens[${i}] is not a 0x-prefixed address: ${a}`));
-      process.exit(1);
-    }
-    return a;
-  });
+  return parseUnits8(s, 18);
 }
 var GUARDIAN_REGISTRY_ABI = [
   {
@@ -3488,7 +3582,10 @@ var GUARDIAN_REGISTRY_ABI = [
     inputs: [
       { name: "governor", type: "address" },
       { name: "proposalId", type: "uint256" },
-      { name: "support", type: "uint8" }
+      { name: "support", type: "uint8" },
+      // The approver's declaration: WOOD it puts behind this proposal,
+      // clamped to its free budget by ExposureLedger. Ignored on a Block.
+      { name: "lockWood", type: "uint256" }
     ],
     outputs: [],
     stateMutability: "nonpayable"
@@ -3746,171 +3843,6 @@ function registerProposalCommands(program2) {
       process.exit(1);
     }
   });
-  proposal.command("create-sandbox").description("Submit a strategy proposal with a CallSandbox payload (ICallSandbox.Call is (address,bytes) only \u2014 no value)").requiredOption("--vault <address>", "Vault address the proposal targets").requiredOption("--name <name>", "Strategy name").requiredOption("--description <text>", "Strategy rationale and risk summary").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").requiredOption(
-    "--sandbox-calls <path>",
-    "Path to JSON file of ICallSandbox.Call[] \u2014 [{target, data}, ...]. A value field is refused."
-  ).requiredOption(
-    "--sandbox-funding <amount>",
-    "Vault-asset amount the sandbox is funded with (decimals resolved from the asset). Must be > 0 and <= --max-capital."
-  ).option("--sandbox-tokens <list>", "Comma-separated declared non-asset token addresses the payload may hold").option("--strategy <address>", "Live-NAV strategy clone address (default: none \u2014 queue-only)").option(
-    "--max-capital <amount>",
-    "REQUIRED. Ceiling on what the execute batch may deploy, in vault-asset units."
-  ).option(
-    "--max-drawdown-bps <bps>",
-    "Declared loss allowance in bps of --max-capital (0-10000, default 2000 = 20%)."
-  ).option("--execute-caps <list>", "Comma-separated per-execute-call outflow caps in asset units").option("--settle-caps <list>", "Comma-separated per-settlement-call outflow caps in asset units").option("--metadata-uri <uri>", "Override \u2014 skip IPFS upload and use this URI directly").action(async (opts) => {
-    try {
-      const vault = opts.vault;
-      if (!isAddress7(vault)) {
-        console.error(chalk8.red(`Invalid vault address: ${opts.vault}`));
-        process.exit(1);
-      }
-      const strategyDuration = parseDuration(opts.duration);
-      const executeCalls = parseCallsFile(opts.executeCalls);
-      const settleCalls = parseCallsFile(opts.settleCalls);
-      const sandboxCalls = parseSandboxCallsFile(opts.sandboxCalls);
-      const declaredTokens = parseSandboxTokens(opts.sandboxTokens);
-      const ZERO_STRATEGY = "0x0000000000000000000000000000000000000000";
-      let strategy2 = ZERO_STRATEGY;
-      if (opts.strategy) {
-        if (!isAddress7(opts.strategy)) {
-          console.error(chalk8.red(`Invalid strategy address: ${opts.strategy}`));
-          process.exit(1);
-        }
-        strategy2 = opts.strategy;
-      }
-      const envelope = await resolveRiskEnvelope(opts, vault);
-      const asset = await getAssetAddress();
-      const decimals = await getPublicClient().readContract({
-        address: asset,
-        abi: ERC20_ABI,
-        functionName: "decimals"
-      });
-      const funding = parseUnits8(String(opts.sandboxFunding), decimals);
-      const executeCallCaps = resolveCaps(
-        opts.executeCaps,
-        executeCalls.length,
-        envelope.maxCapital,
-        "--execute-caps"
-      );
-      const settleCallCaps = resolveCaps(
-        opts.settleCaps,
-        settleCalls.length,
-        0n,
-        "--settle-caps"
-      );
-      const buildAction = async (metadataURI2) => encodeProposeWithSandbox(
-        {
-          vault,
-          governor: await getGovernorOf(vault),
-          strategy: strategy2,
-          metadataURI: metadataURI2,
-          strategyDuration,
-          envelope,
-          executeCalls,
-          executeCallCaps,
-          settlementCalls: settleCalls,
-          settlementCallCaps: settleCallCaps,
-          sandbox: { funding, calls: sandboxCalls, declaredTokens }
-        },
-        getChain().id
-      );
-      if (isCalldataOnly()) {
-        if (!opts.metadataUri) {
-          console.error(
-            chalk8.red(
-              "--calldata-only requires --metadata-uri (IPFS metadata upload needs a signing wallet)"
-            )
-          );
-          process.exit(1);
-        }
-        try {
-          emitCalldata(await buildAction(opts.metadataUri));
-        } catch (err) {
-          console.error(chalk8.red(err instanceof Error ? err.message : String(err)));
-          process.exit(1);
-        }
-        return;
-      }
-      let metadataURI = opts.metadataUri || "";
-      if (!metadataURI) {
-        const spinner2 = ora6({ text: W3("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: {},
-            links: {}
-          };
-          const proposalMeta = {
-            ...metadata,
-            proposer: account.address,
-            vault,
-            strategyDuration: Number(strategyDuration),
-            sandbox: true,
-            createdAt: Math.floor(Date.now() / 1e3)
-          };
-          metadataURI = await uploadMetadata(proposalMeta);
-          spinner2.succeed(G3(`Metadata pinned: ${DIM3(metadataURI)}`));
-        } catch (err) {
-          spinner2.warn(chalk8.yellow("IPFS upload failed \u2014 using inline metadata"));
-          const json = JSON.stringify({ name: opts.name, description: opts.description, vault, sandbox: true });
-          metadataURI = `data:application/json;base64,${Buffer.from(json).toString("base64")}`;
-        }
-      }
-      console.log();
-      console.log(LABEL3("  \u25C6 Sandbox Proposal Summary"));
-      SEP3();
-      console.log(W3(`  Name:             ${BOLD3(opts.name)}`));
-      console.log(W3(`  Vault:            ${G3(vault)}`));
-      console.log(W3(`  Duration:         ${formatDurationShort(strategyDuration)}`));
-      console.log(W3(`  Calls:            ${executeCalls.length} execute + ${settleCalls.length} settle + ${sandboxCalls.length} sandbox`));
-      console.log(W3(`  Sandbox funding:  ${opts.sandboxFunding}`));
-      console.log(W3(`  Metadata:         ${DIM3(metadataURI.length > 50 ? metadataURI.slice(0, 50) + "..." : metadataURI)}`));
-      SEP3();
-      const spinner = ora6({ text: W3("Submitting sandbox proposal..."), color: "green" }).start();
-      let action;
-      try {
-        action = await buildAction(metadataURI);
-      } catch (err) {
-        spinner.fail(err instanceof Error ? err.message : String(err));
-        process.exit(1);
-      }
-      const tx = action.txs[0];
-      const hash = await sendTxWithRetry({
-        account: getAccount(),
-        chain: getChain(),
-        to: tx.to,
-        data: tx.data,
-        value: 0n
-      });
-      const receipt = await waitForReceipt(hash);
-      let proposalId = parseProposalIdFromLogs(receipt.logs);
-      if (proposalId === void 0) {
-        try {
-          proposalId = await proposalCount(vault);
-        } catch {
-          proposalId = 0n;
-        }
-      }
-      spinner.succeed(G3("Sandbox proposal submitted"));
-      console.log();
-      console.log(LABEL3("  \u25C6 Sandbox Proposal Created"));
-      SEP3();
-      console.log(W3(`  Proposal ID:  ${G3(`#${proposalId}`)}`));
-      console.log(W3(`  Tx:           ${DIM3(getExplorerUrl(receipt.transactionHash))}`));
-      SEP3();
-      console.log();
-    } catch (err) {
-      console.error(chalk8.red(`
-  \u2716 ${formatContractError(err)}`));
-      process.exit(1);
-    }
-  });
   proposal.command("list").description("List a vault's proposals (per-vault governor \u2014 IDs are scoped to the vault)").requiredOption("--vault <address>", "Vault whose proposals to list").option("--state <filter>", "Filter by state: draft, pending, approved, executed, settled, all", "all").action(async (opts) => {
     const spinner = ora6("Loading proposals...").start();
     try {
@@ -3943,7 +3875,7 @@ function registerProposalCommands(program2) {
       console.log(BOLD3(`Proposals (${proposals.length})`));
       console.log(DIM3("\u2500".repeat(90)));
       console.log(
-        DIM3("  ID  ") + DIM3("Agent".padEnd(14)) + DIM3("State".padEnd(12)) + DIM3("Fee".padEnd(8)) + DIM3("Votes (For/Against)".padEnd(22)) + DIM3("Duration".padEnd(10)) + DIM3("Created")
+        DIM3("  ID  ") + DIM3("Agent".padEnd(14)) + DIM3("State".padEnd(12)) + DIM3("Fee".padEnd(8)) + DIM3("Against/Votable".padEnd(22)) + DIM3("Duration".padEnd(10)) + DIM3("Created")
       );
       console.log(DIM3("\u2500".repeat(90)));
       for (const p of proposals) {
@@ -3951,7 +3883,7 @@ function registerProposalCommands(program2) {
         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 dur = formatDurationShort(p.strategyDuration);
-        const votes = `${formatShares(p.votesFor)}/${formatShares(p.votesAgainst)}`;
+        const votes = `${formatShares(p.votesAgainst)}/${formatShares(p.votableSupply)}`;
         const fee = `${Number(p.performanceFeeBps) / 100}%`;
         console.log(
           `  ${String(p.id).padEnd(4)}${agent.padEnd(14)}${state.padEnd(12)}${fee.padEnd(8)}${votes.padEnd(22)}${dur.padEnd(10)}${created}`
@@ -3977,11 +3909,9 @@ function registerProposalCommands(program2) {
       }
       const p = await getProposal(vault, id);
       const state = await getProposalState(vault, id);
-      const params = await getGovernorParams(vault);
       spinner.stop();
       const stateLabel = PROPOSAL_STATES[state] || "Unknown";
-      const totalVotes = p.votesFor + p.votesAgainst;
-      const quorumNeeded = totalVotes > 0n ? `${Number(params.vetoThresholdBps) / 100}%` : "\u2014";
+      const vetoBar = p.votableSupply > 0n ? p.votableSupply * p.vetoThresholdBps / 10000n || 1n : null;
       console.log();
       console.log(LABEL3(`  \u25C6 Proposal #${p.id}`));
       SEP3();
@@ -4009,10 +3939,11 @@ function registerProposalCommands(program2) {
       console.log(W3(`  Executed At:      ${formatTimestamp(p.executedAt)}`));
       console.log();
       console.log(LABEL3("  Votes"));
-      console.log(W3(`  For:              ${formatShares(p.votesFor)}`));
       console.log(W3(`  Against:          ${formatShares(p.votesAgainst)}`));
-      console.log(W3(`  Abstain:          ${formatShares(p.votesAbstain)}`));
-      console.log(W3(`  Veto Threshold:   ${quorumNeeded}`));
+      console.log(W3(`  Votable Supply:   ${formatShares(p.votableSupply)}`));
+      console.log(W3(
+        `  Veto Threshold:   ${vetoBar === null ? DIM3("\u2014 (no votable supply \u2014 veto check skipped)") : `${Number(p.vetoThresholdBps) / 100}% (${formatShares(vetoBar)})`}`
+      ));
       if (state === PROPOSAL_STATE.Executed || state === PROPOSAL_STATE.Settled) {
         try {
           const cap = await getCapitalSnapshot(vault, id);
@@ -4099,15 +4030,19 @@ function registerProposalCommands(program2) {
       process.exit(1);
     }
   });
-  proposal.command("review-vote").description("Cast a guardian review vote (Approve or Block) on a live review").requiredOption("--id <proposalId>", "Proposal ID").requiredOption("--vault <address>", "Vault the proposal belongs to (per-vault governor)").requiredOption("--support <approve|block>", "Guardian review vote: approve or block").action(async (opts) => {
+  proposal.command("review-vote").description("Cast a guardian review vote (Approve or Block) on a live review").requiredOption("--id <proposalId>", "Proposal ID").requiredOption("--vault <address>", "Vault the proposal belongs to (per-vault governor)").requiredOption("--support <approve|block>", "Guardian review vote: approve or block").requiredOption(
+    "--lock-wood <wood>",
+    "WOOD you declare behind an Approve (decimal WOOD). Clamped to your free budget by ExposureLedger; ignored on a Block."
+  ).action(async (opts) => {
     try {
       const proposalId = parseBigIntArg(opts.id, "proposal ID");
       const vault = parseVaultOption(opts.vault);
       const vote2 = parseGuardianReviewVote(String(opts.support));
+      const lockWood = parseWoodAmount(opts.lockWood, "--lock-wood");
       const chainId = getChain().id;
       const governor = await getGovernorOf(vault);
       if (isCalldataOnly()) {
-        emitCalldata(encodeVoteOnProposal({ governor, proposalId, vote: vote2 }, chainId));
+        emitCalldata(encodeVoteOnProposal({ governor, proposalId, vote: vote2, lockWood }, chainId));
         return;
       }
       const account = getAccount();
@@ -4168,6 +4103,9 @@ function registerProposalCommands(program2) {
       SEP3();
       if (vote2 === "Approve") {
         console.log(chalk8.yellow.bold("  \u26A0  UNDERWRITING"));
+        console.log(chalk8.yellow(
+          `  Declared lock:      ${formatUnits8(lockWood, 18)} WOOD`
+        ));
         console.log(chalk8.yellow(
           "  Approve books this proposal's coverage against YOUR own slashable"
         ));
@@ -4185,7 +4123,7 @@ function registerProposalCommands(program2) {
         ));
         SEP3();
       }
-      const action = encodeVoteOnProposal({ governor, proposalId, vote: vote2 }, chainId);
+      const action = encodeVoteOnProposal({ governor, proposalId, vote: vote2, lockWood }, chainId);
       const tx = action.txs[0];
       const voteSpinner = ora6({ text: W3("Submitting review vote..."), color: "green" }).start();
       const hash = await sendTxWithRetry({
@@ -4776,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;
@@ -4851,7 +4848,7 @@ function registerProposalCommands(program2) {
 }
 
 // src/commands/queue.ts
-import { parseUnits as parseUnits9, formatUnits as formatUnits8, isAddress as isAddress8, parseEventLogs } from "viem";
+import { parseUnits as parseUnits9, formatUnits as formatUnits9, isAddress as isAddress8, parseEventLogs } from "viem";
 import chalk9 from "chalk";
 import ora7 from "ora";
 var WETH_ABI = [
@@ -5040,7 +5037,7 @@ function registerQueueCommands(program2) {
           );
           if (ethBalance < shortfall + minGas) {
             throw new Error(
-              `Insufficient ETH on ${getChain().name}. Have ${formatUnits8(ethBalance, 18)} ETH, need ${formatUnits8(shortfall, 18)} to wrap + ~${formatUnits8(minGas, 18)} for gas.`
+              `Insufficient ETH on ${getChain().name}. Have ${formatUnits9(ethBalance, 18)} ETH, need ${formatUnits9(shortfall, 18)} to wrap + ~${formatUnits9(minGas, 18)} for gas.`
             );
           }
           spinner.text = "Wrapping ETH \u2192 WETH...";
@@ -8051,9 +8048,9 @@ try {
 } catch {
 }
 var require2 = createRequire(import.meta.url);
-var CLI_VERSION = "0.86.1";
+var CLI_VERSION = "0.87.1";
 async function loadXmtp() {
-  return import("./xmtp-KW73BGVO.js");
+  return import("./xmtp-72IRK7JL.js");
 }
 async function loadCron() {
   return import("./cron-E3UAZF5B.js");
@@ -8099,7 +8096,7 @@ program.name("sherwood").description("CLI for agent-managed onchain vaults").ver
 }).addOption(
   new Option(
     "--chain <network>",
-    "Target network (default: robinhood-fork, chain 9994663 \u2014 where the product lives; robinhood-testnet is chain 46630)"
+    "Target network (default: robinhood-fork, chain 9994663 \u2014 where the product lives; robinhood-testnet is chain 46630 and still runs a PRE-V1 stack this CLI cannot talk to)"
   ).choices(VALID_NETWORKS).default(DEFAULT_NETWORK)
 ).option(
   "--calldata-only",
@@ -8724,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-ATWV2O7Y.js");
+      const { lookupAgentIdByWallet } = await import("./identity-M4TXM7EX.js");
       const resolved = await lookupAgentIdByWallet(agentWallet);
       if (resolved === null) {
         spinner.fail("Agent wallet does not own an ERC-8004 identity NFT");
@@ -9408,7 +9405,7 @@ vaultCmd.command("redeem").description("Redeem vault shares for the underlying a
 `));
     process.exit(1);
   }
-  const sharesDisplay = formatUnits9(shares, shareDecimals);
+  const sharesDisplay = formatUnits10(shares, shareDecimals);
   const spinner = ora9(`Redeeming ${sharesDisplay} shares...`).start();
   try {
     const { hash, assetsOut } = await redeem(
@@ -9417,7 +9414,7 @@ vaultCmd.command("redeem").description("Redeem vault shares for the underlying a
     );
     spinner.succeed(`Redeemed: ${hash}`);
     console.log(chalk17.dim(`  ${getExplorerUrl(hash)}`));
-    console.log(`  Assets received: ${formatUnits9(assetsOut, assetDecimals)}`);
+    console.log(`  Assets received: ${formatUnits10(assetsOut, assetDecimals)}`);
   } catch (err) {
     spinner.fail("Redeem failed");
     console.error(chalk17.red(formatContractError(err)));
@@ -9427,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-BMOHHVUN.js");
+  const { listProviders } = await import("./providers-6UZKDFQD.js");
   for (const info of listProviders()) {
     console.log(`
 ${info.name} (${info.type})`);
@@ -9437,7 +9434,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-ETZSKQDI.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(() => {
@@ -9447,7 +9444,7 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-HVRZ6AJM.js");
+var { registerSessionCommands } = await import("./session-45NQAHFI.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
@@ -9456,11 +9453,11 @@ registerProposalCommands(program);
 registerQueueCommands(program);
 registerGovernorCommands(program);
 registerGuardianCommands(program);
-var { registerResearchCommands } = await import("./research-W74PNYPO.js");
+var { registerResearchCommands } = await import("./research-44GHYE4H.js");
 registerResearchCommands(program);
-var { registerAgentCommands } = await import("./agent-TBLC3WNJ.js");
+var { registerAgentCommands } = await import("./agent-FCGZL4GF.js");
 registerAgentCommands(program);
-var { registerTradeCommands } = await import("./trade-EOQY72L7.js");
+var { registerTradeCommands } = await import("./trade-FO52SP62.js");
 registerTradeCommands(program);
 registerGridCommand(program);
 var configCmd = program.command("config");