@sherwoodagent/cli 0.89.2 → 0.89.3

package/dist/index.js

@@ -15,14 +15,14 @@ import {
   checkApiKeyValid,
   listModels,
   provisionApiKey
-} from "./chunk-JLOROS5V.js";
+} from "./chunk-74QYNLJE.js";
 import {
   createFund,
   getActiveFunds,
   getFund,
   subdomainExists,
   updateMetadata
-} from "./chunk-VD65GJOY.js";
+} from "./chunk-DQZJULNP.js";
 import {
   FORK_UNOBSERVABLE_REASON,
   LIGHTER_API_PROFILES,
@@ -54,8 +54,8 @@ import {
   removeDepositor,
   setAgentFeeBps,
   setVaultAddress
-} from "./chunk-OYP35TFK.js";
-import "./chunk-TGWTRG3V.js";
+} from "./chunk-WAF3JU5J.js";
+import "./chunk-NJNK6GTJ.js";
 import {
   CL_DEFAULTS,
   DEFAULT_FEE_TIER,
@@ -89,7 +89,7 @@ import {
   selectBestFeeTier,
   twapTickFromCumulatives,
   v3SingleHopExtraData
-} from "./chunk-MIW4CBSU.js";
+} from "./chunk-6KXITNND.js";
 import {
   DEFAULT_ISSUING_CHAIN_ID,
   STRATEGY_FACTORY_ABI,
@@ -123,7 +123,7 @@ import {
   registerIdentityCommands,
   stripVidTag,
   verifyVidTag
-} from "./chunk-H6AJMPLT.js";
+} from "./chunk-UCULHATO.js";
 import {
   fetchMetadata,
   mergeFundMetadata,
@@ -138,13 +138,13 @@ import {
   queryJoinRequests,
   revokeJoinRequest,
   stripReferrerPrefix
-} from "./chunk-QEX2TWJV.js";
+} from "./chunk-2SIUEMPV.js";
 import {
   resolveFund,
   resolveVaultFund,
   searchFundAcrossChains,
   setTextRecord
-} from "./chunk-LVGYGXAV.js";
+} from "./chunk-KPTKX226.js";
 import {
   PROPOSAL_STATE,
   PROPOSAL_STATES,
@@ -183,7 +183,7 @@ import {
   setVotingPeriod,
   settleProposal,
   vote
-} from "./chunk-TWJXGEBZ.js";
+} from "./chunk-5XMQQ4LX.js";
 import {
   LIGHTER_DEFAULT_API_KEY_INDEX,
   LIGHTER_MAX_DEPOSIT,
@@ -206,7 +206,7 @@ import {
 } from "./chunk-TCUSM4V7.js";
 import {
   addLaunchpadTemplateOptions
-} from "./chunk-VVCSD2M6.js";
+} from "./chunk-KXUA5BEH.js";
 import {
   CLAIM_SETTLE_BUFFER_SECONDS,
   DEFAULT_DEADLINE_MARGIN_SECONDS,
@@ -247,7 +247,7 @@ import {
   sendTxWithRetry,
   waitForReceipt,
   writeContractWithRetry
-} from "./chunk-Z53JZORT.js";
+} from "./chunk-I7NYU4JB.js";
 import {
   DEFAULT_NETWORK,
   VALID_NETWORKS,
@@ -1984,7 +1984,7 @@ function registerStrategyProposeCommands(strategy2) {
           }
         }
         if (templateKey === "lighter-perp") {
-          const { runLighterProposePreflight } = await import("./lighter-preflight-7J3IO27F.js");
+          const { runLighterProposePreflight } = await import("./lighter-preflight-TSLSSYWI.js");
           await runLighterProposePreflight(vault, opts, maxDrawdownBps);
         }
       } catch (err) {
@@ -1992,7 +1992,7 @@ function registerStrategyProposeCommands(strategy2) {
         process.exit(1);
       }
       if (!opts.agent) opts.agent = proposer;
-      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-6HCXMRIA.js");
+      const { parseDuration: parseDuration3, getGovernorOf: getGovernorOf2 } = await import("./governor-53PNPDCZ.js");
       const strategyDuration2 = parseDuration3(opts.duration);
       const chainId = getChain().id;
       try {
@@ -2110,7 +2110,7 @@ function registerStrategyProposeCommands(strategy2) {
         }
       }
       if (templateKey === "lighter-perp") {
-        const { runLighterProposePreflight } = await import("./lighter-preflight-7J3IO27F.js");
+        const { runLighterProposePreflight } = await import("./lighter-preflight-TSLSSYWI.js");
         await runLighterProposePreflight(vault, opts, maxDrawdownBps);
       }
       preflightSpinner.succeed("Preflight OK");
@@ -2227,9 +2227,9 @@ function registerStrategyProposeCommands(strategy2) {
       console.error(chalk4.red("Missing --name or --duration. Use --write-calls to skip proposal submission."));
       process.exit(1);
     }
-    const { propose: propose2 } = await import("./governor-6HCXMRIA.js");
+    const { propose: propose2 } = await import("./governor-53PNPDCZ.js");
     const { pinJSON } = await import("./ipfs-M56BLMCW.js");
-    const { parseDuration: parseDuration2 } = await import("./governor-6HCXMRIA.js");
+    const { parseDuration: parseDuration2 } = await import("./governor-53PNPDCZ.js");
     const strategyDuration = parseDuration2(opts.duration);
     const metaSpinner = ora2("Pinning metadata to IPFS...").start();
     let metadataURI;
@@ -2261,7 +2261,7 @@ function registerStrategyProposeCommands(strategy2) {
       metadataURI = `data:application/json;base64,${Buffer.from(inline).toString("base64")}`;
     }
     try {
-      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-NLMVWYDF.js");
+      const { getAgentFeeBps: getAgentFeeBps2 } = await import("./vault-TQWUWBSG.js");
       const feeBps = await getAgentFeeBps2(vault);
       console.log(
         chalk4.yellow(
@@ -2312,7 +2312,7 @@ function registerStrategyProposeCommands(strategy2) {
       console.log(chalk4.yellow(`     asset.approve(${clone}, <repaymentAmount>)`));
     }
     if (templateKey === "lighter-perp") {
-      const { lighterNextSteps } = await import("./lighter-preflight-7J3IO27F.js");
+      const { lighterNextSteps } = await import("./lighter-preflight-TSLSSYWI.js");
       console.log();
       for (const line of lighterNextSteps(clone)) console.log(chalk4.yellow(line));
     }
@@ -2584,7 +2584,7 @@ function registerStrategyTemplateCommands(strategy2) {
       let prices = [];
       let priceSource = null;
       try {
-        const { getTokenPricesInAsset } = await import("./price-4FGWEPKX.js");
+        const { getTokenPricesInAsset } = await import("./price-QKOARHS4.js");
         prices = await getTokenPricesInAsset({
           tokens: allocations.map((a, i) => ({
             token: a.token,
@@ -3001,7 +3001,7 @@ function registerVeniceCommands(program2) {
       console.log(chalk6.dim(`  Key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`));
       console.log(chalk6.dim("  Saved to ~/.sherwood/config.json"));
       try {
-        const { createVeniceProvisionAttestation, getEasScanUrl } = await import("./eas-F6KOWI4W.js");
+        const { createVeniceProvisionAttestation, getEasScanUrl } = await import("./eas-YTAAJSLU.js");
         const attestation = await createVeniceProvisionAttestation(account.address);
         if (attestation) {
           console.log(chalk6.dim(`  Attested: ${getEasScanUrl(attestation.uid)}`));
@@ -3357,7 +3357,7 @@ ${opts.prompt}`;
         console.log(chalk6.dim(`Model: ${result.model} | Tokens: ${result.usage.promptTokens} in, ${result.usage.completionTokens} out, ${result.usage.totalTokens} total`));
       }
       try {
-        const { createVeniceInferenceAttestation, getEasScanUrl } = await import("./eas-F6KOWI4W.js");
+        const { createVeniceInferenceAttestation, getEasScanUrl } = await import("./eas-YTAAJSLU.js");
         const { keccak256: keccak2562, toHex, isAddress: isAddr } = await import("viem");
         const { getChainContracts: getChainContracts2 } = await import("./config-UZ2GIXAO.js");
         const { getChain: getActiveChain } = await import("./network-EZ5X2BF7.js");
@@ -4356,8 +4356,8 @@ function printSimulationResult(result, callType) {
 }
 async function sendSimulationAlert(subdomain, proposalId, vault, execResult, settleResult) {
   try {
-    const xmtp = await import("./xmtp-H5GTOJ43.js");
-    const { getAccount: getAccount2 } = await import("./client-DA434B67.js");
+    const xmtp = await import("./xmtp-EOMKXRTB.js");
+    const { getAccount: getAccount2 } = await import("./client-3BFK7TNL.js");
     const group = await xmtp.getGroup("", subdomain);
     const allRisks = [...execResult.risks, ...settleResult?.risks ?? []];
     const criticals = allRisks.filter((r) => r.level === "critical");
@@ -5858,6 +5858,20 @@ var VAULT_QUEUE_ABI = [
     inputs: [],
     outputs: [{ name: "", type: "address" }]
   },
+  {
+    name: "redemptionsLocked",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "", type: "bool" }]
+  },
+  {
+    name: "depositsLocked",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "", type: "bool" }]
+  },
   {
     type: "event",
     name: "DepositRequested",
@@ -5938,6 +5952,103 @@ var QUEUE_ABI = [
   }
 ];
 var KIND_LABELS = ["Redeem", "Deposit"];
+var KIND_REDEEM = 0;
+var NEVER_STAMPS = /* @__PURE__ */ new Set([
+  PROPOSAL_STATE.Rejected,
+  PROPOSAL_STATE.Expired,
+  PROPOSAL_STATE.Cancelled,
+  PROPOSAL_STATE.Settled
+]);
+function classifyRequest(args) {
+  const { request: r, stamped, proposalState } = args;
+  if (r.claimed) return { kind: "claimed" };
+  if (r.cancelled) return { kind: "cancelled" };
+  if (r.kind === KIND_REDEEM) {
+    if (!stamped) {
+      if (proposalState !== void 0 && NEVER_STAMPS.has(proposalState)) {
+        return { kind: "stranded", pid: r.pid, state: PROPOSAL_STATES[proposalState] ?? `state ${proposalState}` };
+      }
+      return { kind: "waiting", pid: r.pid };
+    }
+    return args.redemptionsLocked ? { kind: "locked" } : { kind: "claimable" };
+  }
+  return args.depositsLocked ? { kind: "locked" } : { kind: "claimable" };
+}
+function formatRequestStatus(status) {
+  switch (status.kind) {
+    case "claimed":
+      return "claimed";
+    case "cancelled":
+      return "cancelled";
+    case "claimable":
+      return "claimable";
+    case "waiting":
+      return `waiting for pid ${status.pid} to settle`;
+    case "stranded":
+      return `stranded (pid ${status.pid} ended ${status.state} \u2014 cancel it)`;
+    case "locked":
+      return "waiting for vault to unlock";
+  }
+}
+function claimRefusal(status, vault, id) {
+  const cancelCmd = `sherwood queue cancel --vault ${vault} --id ${id}`;
+  switch (status.kind) {
+    case "claimable":
+      return void 0;
+    case "claimed":
+      return `Request #${id} has already been claimed.`;
+    case "cancelled":
+      return `Request #${id} was cancelled \u2014 its escrow was already returned.`;
+    case "stranded":
+      return `Request #${id} is stranded: pid ${status.pid} ended ${status.state} without settling, so no claim price will ever be stamped (claim would revert NotSettled).
+Get the shares back with:
+  ${cancelCmd}
+then redeem directly.`;
+    case "waiting":
+      return `Request #${id} is waiting for pid ${status.pid} to settle \u2014 no claim price is stamped yet (claim would revert NotSettled). Retry after it settles.
+If pid ${status.pid} ends Rejected/Expired/Cancelled instead, run:
+  ${cancelCmd}`;
+    case "locked":
+      return `Request #${id} cannot be claimed while the vault is locked by an open proposal (claim would revert VaultLocked). Retry once it settles.`;
+  }
+}
+async function loadRequestStatuses(vault, queue, requests) {
+  const client = getPublicClient();
+  const [redemptionsLocked, depositsLocked] = await Promise.all([
+    client.readContract({ address: vault, abi: VAULT_QUEUE_ABI, functionName: "redemptionsLocked" }),
+    client.readContract({ address: vault, abi: VAULT_QUEUE_ABI, functionName: "depositsLocked" })
+  ]);
+  const pids = [
+    ...new Set(
+      requests.filter((r) => r.kind === KIND_REDEEM && !r.claimed && !r.cancelled).map((r) => r.pid)
+    )
+  ];
+  const stampedByPid = /* @__PURE__ */ new Map();
+  const stateByPid = /* @__PURE__ */ new Map();
+  await Promise.all(
+    pids.map(async (pid) => {
+      const sp = await client.readContract({
+        address: queue,
+        abi: QUEUE_ABI,
+        functionName: "getSettlePrice",
+        args: [pid]
+      });
+      stampedByPid.set(pid, sp.stamped);
+      if (!sp.stamped) {
+        stateByPid.set(pid, await getProposalState(vault, pid).catch(() => void 0));
+      }
+    })
+  );
+  return requests.map(
+    (request) => classifyRequest({
+      request,
+      stamped: stampedByPid.get(request.pid) ?? false,
+      proposalState: stateByPid.get(request.pid),
+      redemptionsLocked,
+      depositsLocked
+    })
+  );
+}
 function resolveVaultAddress(opt) {
   if (!opt || !isAddress10(opt)) {
     console.error(chalk10.red(`Invalid or missing --vault address: ${opt ?? "(none)"}`));
@@ -6097,9 +6208,17 @@ function registerQueueCommands(program2) {
     const vault = resolveVaultAddress(opts.vault);
     const account = getAccount();
     const id = BigInt(opts.id);
-    const spinner = ora7(`Claiming request #${id}...`).start();
+    const spinner = ora7(`Checking request #${id}...`).start();
     try {
       const queueAddr = await getQueueAddress(vault);
+      const [status] = await loadRequestStatuses(vault, queueAddr, [await readRequest(queueAddr, id)]);
+      const refusal = claimRefusal(status, vault, id);
+      if (refusal) {
+        spinner.fail(`Not claimable: ${formatRequestStatus(status)}`);
+        console.error(chalk10.yellow(refusal));
+        process.exit(1);
+      }
+      spinner.text = `Claiming request #${id}...`;
       const hash = await writeContractWithRetry({
         account,
         chain: getChain(),
@@ -6164,20 +6283,21 @@ function registerQueueCommands(program2) {
         return;
       }
       const requests = await Promise.all(ids.map((id) => readRequest(queueAddr, id)));
+      const statuses = await loadRequestStatuses(vault, queueAddr, requests);
       spinner.stop();
       console.log();
       console.log(chalk10.bold(`Queue requests (${ids.length}) \u2014 ${account.address}`));
-      console.log(chalk10.dim("\u2500".repeat(72)));
+      console.log(chalk10.dim("\u2500".repeat(100)));
       console.log(
         chalk10.dim(
-          `  ${"id".padEnd(6)}${"kind".padEnd(9)}${"amount".padEnd(26)}${"pid".padEnd(6)}${"claimed".padEnd(9)}cancelled`
+          `  ${"id".padEnd(6)}${"kind".padEnd(9)}${"amount".padEnd(26)}${"pid".padEnd(6)}${"claimed".padEnd(9)}${"cancelled".padEnd(11)}status`
         )
       );
       ids.forEach((id, i) => {
         const r = requests[i];
         const label = KIND_LABELS[r.kind] ?? `kind ${r.kind}`;
         console.log(
-          `  ${String(id).padEnd(6)}${label.padEnd(9)}${String(r.amount).padEnd(26)}${String(r.pid).padEnd(6)}${String(r.claimed).padEnd(9)}${r.cancelled}`
+          `  ${String(id).padEnd(6)}${label.padEnd(9)}${String(r.amount).padEnd(26)}${String(r.pid).padEnd(6)}${String(r.claimed).padEnd(9)}${String(r.cancelled).padEnd(11)}${formatRequestStatus(statuses[i])}`
         );
       });
       console.log();
@@ -9969,9 +10089,9 @@ try {
 } catch {
 }
 var require2 = createRequire(import.meta.url);
-var CLI_VERSION = "0.89.2";
+var CLI_VERSION = "0.89.3";
 async function loadXmtp() {
-  return import("./xmtp-H5GTOJ43.js");
+  return import("./xmtp-EOMKXRTB.js");
 }
 async function loadCron() {
   return import("./cron-E3UAZF5B.js");
@@ -10642,7 +10762,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-2JEZE7DV.js");
+      const { lookupAgentIdByWallet } = await import("./identity-462SMK5H.js");
       const resolved = await lookupAgentIdByWallet(agentWallet);
       if (resolved === null) {
         spinner.fail("Agent wallet does not own an ERC-8004 identity NFT");
@@ -11345,7 +11465,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-XEEFKITN.js");
+  const { listProviders } = await import("./providers-22A42FKP.js");
   for (const info2 of listProviders()) {
     console.log(`
 ${info2.name} (${info2.type})`);
@@ -11355,7 +11475,7 @@ ${info2.name} (${info2.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-QVDOCCJN.js");
+  const { registerChatCommands } = await import("./chat-EVRY5BV3.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Vault chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
@@ -11365,7 +11485,7 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-775NKMGH.js");
+var { registerSessionCommands } = await import("./session-27X337LQ.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
@@ -11374,15 +11494,15 @@ registerProposalCommands(program);
 registerQueueCommands(program);
 registerGovernorCommands(program);
 registerGuardianCommands(program);
-var { registerResearchCommands } = await import("./research-CJOSSD4U.js");
+var { registerResearchCommands } = await import("./research-3L3BTHWY.js");
 registerResearchCommands(program);
-var { registerAgentCommands } = await import("./agent-K5ZKUS47.js");
+var { registerAgentCommands } = await import("./agent-QU2OSWS4.js");
 registerAgentCommands(program);
-var { registerTradeCommands } = await import("./trade-PCK3LONN.js");
+var { registerTradeCommands } = await import("./trade-6Q7VCDEA.js");
 registerTradeCommands(program);
 registerGridCommand(program);
 registerLighterCommands(program);
-var { registerLaunchpadCommands } = await import("./launchpad-XM4546BO.js");
+var { registerLaunchpadCommands } = await import("./launchpad-LHMBN4TV.js");
 registerLaunchpadCommands(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 vault 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").option("--anthropic-api-key <key>", "Anthropic Claude API key (for LLM judge)").option("--xmtp-group <subdomain:groupId>", "Cache an XMTP group ID for a vault (e.g. my-vault:abc123)").action((opts) => {