@sherwoodagent/cli 0.25.2 → 0.25.3

package/dist/index.js

@@ -4,11 +4,13 @@ import {
   deposit,
   depositWithEthWrap,
   executeBatch,
+  getAssetAddress,
   getAssetDecimals,
   getBalance,
   getShareBalance,
   getVaultAddress,
   getVaultInfo,
+  getVaultOwner,
   isAgent,
   preflightDeposit,
   preflightRedeem,
@@ -19,7 +21,7 @@ import {
   resolveVaultSyndicate,
   setTextRecord,
   setVaultAddress
-} from "./chunk-G6LOQCM3.js";
+} from "./chunk-Y7LUFGIS.js";
 import {
   UniswapProvider,
   applySlippage,
@@ -30,7 +32,7 @@ import {
   getQuote,
   listModels,
   provisionApiKey
-} from "./chunk-L5RWZSET.js";
+} from "./chunk-4WG64CRK.js";
 import {
   PROPOSAL_STATE,
   PROPOSAL_STATES,
@@ -39,6 +41,7 @@ import {
   emergencyCancel,
   emergencySettle,
   executeProposal,
+  getActiveProposal,
   getCapitalSnapshot,
   getExecuteCalls,
   getGovernorAddress,
@@ -61,7 +64,7 @@ import {
   setVotingPeriod,
   settleProposal,
   vote
-} from "./chunk-2UP63CYI.js";
+} from "./chunk-H55III3L.js";
 import {
   fetchMetadata,
   uploadMetadata
@@ -75,7 +78,7 @@ import {
   queryJoinRequests,
   revokeAttestation,
   stripReferrerPrefix
-} from "./chunk-2SNPCWB4.js";
+} from "./chunk-6DWQIKGN.js";
 import {
   AERODROME,
   AGENT_REGISTRY,
@@ -96,7 +99,7 @@ import {
   UNISWAP,
   VENICE,
   VENICE_STAKING_ABI
-} from "./chunk-O7QIRMJO.js";
+} from "./chunk-ICUQY7TY.js";
 import {
   formatContractError,
   getAccount,
@@ -1296,9 +1299,9 @@ function registerStrategyTemplateCommands(strategy2) {
       console.error(chalk.red("Missing --name, --performance-fee, or --duration. Use --write-calls to skip proposal submission."));
       process.exit(1);
     }
-    const { propose: propose2 } = await import("./governor-3PINJ2X2.js");
+    const { propose: propose2 } = await import("./governor-CY3GXU44.js");
     const { pinJSON } = await import("./ipfs-22YLNQ2C.js");
-    const { parseDuration: parseDuration2 } = await import("./governor-3PINJ2X2.js");
+    const { parseDuration: parseDuration2 } = await import("./governor-CY3GXU44.js");
     const performanceFeeBps = BigInt(opts.performanceFee);
     if (performanceFeeBps < 0n || performanceFeeBps > 10000n) {
       console.error(chalk.red("--performance-fee must be 0-10000 (basis points)"));
@@ -1406,7 +1409,7 @@ function registerStrategyTemplateCommands(strategy2) {
       let prices = [];
       let priceSource = null;
       try {
-        const { getTokenPricesInAsset } = await import("./price-76BEXJDI.js");
+        const { getTokenPricesInAsset } = await import("./price-FOCSYKGJ.js");
         prices = await getTokenPricesInAsset({
           tokens: allocations.map((a, i) => ({
             token: a.token,
@@ -1953,7 +1956,7 @@ function registerVeniceCommands(program2) {
       console.log(chalk2.dim(`  Key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`));
       console.log(chalk2.dim("  Saved to ~/.sherwood/config.json"));
       try {
-        const { createVeniceProvisionAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-DGLNPNWX.js");
+        const { createVeniceProvisionAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-652I6ULB.js");
         const { uid } = await createVeniceProvisionAttestation(account.address);
         if (uid !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
           console.log(chalk2.dim(`  Attested: ${getEasScanUrl2(uid)}`));
@@ -2104,7 +2107,7 @@ ${opts.prompt}`;
         console.log(chalk2.dim(`Model: ${result.model} | Tokens: ${result.usage.promptTokens} in, ${result.usage.completionTokens} out, ${result.usage.totalTokens} total`));
       }
       try {
-        const { createVeniceInferenceAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-DGLNPNWX.js");
+        const { createVeniceInferenceAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-652I6ULB.js");
         const { keccak256, toHex, isAddress: isAddr } = await import("viem");
         const { getChainContracts: getChainContracts2 } = await import("./config-YXZKPSZB.js");
         const { getChain: getActiveChain } = await import("./network-QEMP3DSP.js");
@@ -2558,7 +2561,7 @@ function registerIdentityCommands(program2) {
 }
 
 // src/commands/proposal.ts
-import { isAddress as isAddress4 } from "viem";
+import { isAddress as isAddress4, encodeFunctionData as encodeFunctionData9 } from "viem";
 import chalk6 from "chalk";
 import ora5 from "ora";
 import { readFileSync as readFileSync2 } from "fs";
@@ -3236,7 +3239,7 @@ function printSimulationResult(result, callType) {
 }
 async function sendSimulationAlert(subdomain, proposalId, vault, execResult, settleResult) {
   try {
-    const xmtp = await import("./xmtp-64CYLVLO.js");
+    const xmtp = await import("./xmtp-K555NJPU.js");
     const { getAccount: getAccount2 } = await import("./client-CWQFYZ5Z.js");
     const group = await xmtp.getGroup("", subdomain);
     const allRisks = [...execResult.risks, ...settleResult?.risks ?? []];
@@ -3688,6 +3691,130 @@ function registerProposalCommands(program2) {
       process.exit(1);
     }
   });
+  proposal.command("unstick", { hidden: true }).description(
+    "Guardian-only: unstick a vault whose Executed proposal cannot settle (no funds moved)"
+  ).requiredOption("--id <proposalId>", "Proposal ID to unstick").option("--yes", "Skip the interactive confirmation").option(
+    "--dry-run",
+    "Check preconditions and print the fallback call without broadcasting"
+  ).action(async (opts) => {
+    try {
+      const proposalId = parseBigIntArg(opts.id, "proposal ID");
+      const account = getAccount();
+      const spinner = ora5("Loading proposal...").start();
+      const p = await getProposal(proposalId);
+      const state = await getProposalState(proposalId);
+      if (state !== PROPOSAL_STATE.Executed) {
+        spinner.fail(
+          `Proposal ${proposalId} is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 unstick only applies to Executed proposals.`
+        );
+        console.error(
+          DIM2(
+            "\n  Other states have their own recovery path:\n    Draft/Pending    \u2192 sherwood proposal cancel --id <id>\n    Approved         \u2192 sherwood proposal veto <id>\n    Expired          \u2192 vault is not locked, nothing to do\n    Settled          \u2192 already settled\n    Cancelled        \u2192 governor upgrade required (issue #177)\n"
+          )
+        );
+        process.exit(1);
+      }
+      const now = BigInt(Math.floor(Date.now() / 1e3));
+      const expiresAt = p.executedAt + p.strategyDuration;
+      if (p.executedAt === 0n || now < expiresAt) {
+        spinner.fail("Strategy duration has not elapsed yet.");
+        const remaining = expiresAt - now;
+        console.error(
+          DIM2(
+            `
+  Can unstick after: ${new Date(Number(expiresAt) * 1e3).toLocaleString()} (in ~${formatDurationShort(remaining)})
+`
+          )
+        );
+        process.exit(1);
+      }
+      const vault = p.vault;
+      const active = await getActiveProposal(vault);
+      if (active !== proposalId) {
+        spinner.fail(
+          `Vault ${vault} active proposal is ${active}, not ${proposalId} \u2014 nothing to unstick for this proposal.`
+        );
+        process.exit(1);
+      }
+      const vaultOwner = await getVaultOwner(vault);
+      if (account.address.toLowerCase() !== vaultOwner.toLowerCase()) {
+        spinner.fail("Only the vault owner can unstick a proposal.");
+        console.error(
+          DIM2(`
+  Vault owner: ${vaultOwner}
+  Your wallet: ${account.address}
+`)
+        );
+        process.exit(1);
+      }
+      const asset = await getAssetAddress();
+      const noopCalldata = encodeFunctionData9({
+        abi: ERC20_ABI,
+        functionName: "balanceOf",
+        args: [vault]
+      });
+      const fallbackCalls = [
+        { target: asset, data: noopCalldata, value: 0n }
+      ];
+      spinner.stop();
+      console.log();
+      console.log(BOLD2("Unstick plan"));
+      SEP2();
+      console.log(`  Proposal:     ${proposalId}`);
+      console.log(`  Vault:        ${vault}`);
+      console.log(`  Asset:        ${asset}`);
+      console.log(`  State:        ${PROPOSAL_STATES[state]} (duration elapsed)`);
+      console.log(`  Caller:       ${account.address} (vault owner \u2713)`);
+      console.log();
+      console.log(LABEL2("  Fallback call (no-op, cannot revert):"));
+      console.log(DIM2(`    target: ${asset}`));
+      console.log(DIM2(`    data:   ${noopCalldata}  // balanceOf(${vault})`));
+      console.log(DIM2("    value:  0"));
+      console.log();
+      console.log(
+        DIM2(
+          "  This calls emergencySettle(id, [noop]). The governor catches any revert\n  from the pre-committed settlement calls and runs the no-op instead. No\n  funds move. The proposal transitions to Settled and the vault unlocks.\n  LPs can then redeem via `sherwood vault redeem`."
+        )
+      );
+      console.log();
+      if (opts.dryRun) {
+        console.log(G2("  (dry-run) Preconditions OK \u2014 not broadcasting.\n"));
+        return;
+      }
+      if (!opts.yes) {
+        process.stdout.write(chalk6.yellow("  Proceed? [y/N] "));
+        const answer = await new Promise((resolve2) => {
+          process.stdin.resume();
+          process.stdin.setEncoding("utf-8");
+          process.stdin.once("data", (d) => resolve2(String(d).trim().toLowerCase()));
+        });
+        process.stdin.pause();
+        if (answer !== "y" && answer !== "yes") {
+          console.log(DIM2("  Cancelled.\n"));
+          return;
+        }
+      }
+      const send = ora5("Broadcasting emergencySettle...").start();
+      const hash = await emergencySettle(proposalId, fallbackCalls);
+      send.succeed(G2("Vault unstuck \u2014 proposal Settled"));
+      console.log(DIM2(`  ${getExplorerUrl(hash)}`));
+      const stillActive = await getActiveProposal(vault);
+      if (stillActive === 0n) {
+        console.log(G2("  redemptionsLocked cleared \u2713"));
+      } else {
+        console.log(
+          chalk6.yellow(
+            `  \u26A0 getActiveProposal(vault) still returns ${stillActive} \u2014 check manually.`
+          )
+        );
+      }
+      console.log();
+    } catch (err) {
+      console.error(chalk6.red(`
+  \u2716 ${formatContractError(err)}`));
+      process.exit(1);
+    }
+  });
   proposal.command("cancel").description("Cancel a proposal (proposer or vault owner)").requiredOption("--id <proposalId>", "Proposal ID").option("--emergency", "Emergency cancel (vault owner only, any non-settled state)").action(async (opts) => {
     try {
       const proposalId = parseBigIntArg(opts.id, "proposal ID");
@@ -3929,7 +4056,7 @@ try {
 var require2 = createRequire(import.meta.url);
 var { version: CLI_VERSION } = require2("../package.json");
 async function loadXmtp() {
-  return import("./xmtp-64CYLVLO.js");
+  return import("./xmtp-K555NJPU.js");
 }
 async function loadCron() {
   return import("./cron-EOULYO3R.js");
@@ -4954,7 +5081,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-MYRUIM54.js");
+  const { registerChatCommands } = await import("./chat-DRKUZCOY.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Syndicate chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
@@ -4964,16 +5091,16 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-6DJ4A2Q3.js");
+var { registerSessionCommands } = await import("./session-7HKFQ7JZ.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
 registerIdentityCommands(program);
 registerProposalCommands(program);
 registerGovernorCommands(program);
-var { registerResearchCommands } = await import("./research-FIX3U4LG.js");
+var { registerResearchCommands } = await import("./research-LJKYDBCL.js");
 registerResearchCommands(program);
-var { registerTradeCommands } = await import("./trade-MDVM4XFF.js");
+var { registerTradeCommands } = await import("./trade-4SOHHD5R.js");
 registerTradeCommands(program);
 var configCmd = program.command("config");
 configCmd.command("set").description("Save settings to ~/.sherwood/config.json (persists across sessions)").option("--private-key <key>", "Wallet private key (0x-prefixed)").option("--vault <address>", "Default SyndicateVault address").option("--rpc <url>", "Custom RPC URL for the active --chain network").option("--notify-to <id>", "Destination for cron summaries (Telegram chat ID, phone, etc.)").option("--uniswap-api-key <key>", "Uniswap Trading API key (from developers.uniswap.org)").option("--venice-api-key <key>", "Venice AI inference API key").action((opts) => {