@sherwoodagent/cli 0.17.3 → 0.18.1

package/dist/{chat-MQPTP4QO.js → chat-7CB4YGGP.js}

@@ -2,11 +2,11 @@ import {
   getTextRecord,
   resolveSyndicate,
   setTextRecord
-} from "./chunk-PRX5GLSN.js";
+} from "./chunk-ARD44YTT.js";
 import "./chunk-TPE6ZTUI.js";
 import {
   getAccount
-} from "./chunk-N65F7HRF.js";
+} from "./chunk-L24NGLKY.js";
 import "./chunk-MJMWA4LY.js";
 import {
   cacheGroupId,
@@ -17,7 +17,7 @@ import {
 import chalk from "chalk";
 import ora from "ora";
 async function loadXmtp() {
-  return import("./xmtp-MJ53JW2W.js");
+  return import("./xmtp-ATRMY76G.js");
 }
 function formatTimestamp(date) {
   return `${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}`;
@@ -352,4 +352,4 @@ function registerChatCommands(program) {
 export {
   registerChatCommands
 };
-//# sourceMappingURL=chat-MQPTP4QO.js.map
+//# sourceMappingURL=chat-7CB4YGGP.js.map

package/dist/{chunk-EMDEQLUU.js → chunk-5ZC2A7UP.js}

@@ -6,7 +6,7 @@ import {
   getAccount,
   getPublicClient,
   getWalletClient
-} from "./chunk-N65F7HRF.js";
+} from "./chunk-L24NGLKY.js";
 import {
   getChain
 } from "./chunk-MJMWA4LY.js";
@@ -455,4 +455,4 @@ export {
   vetoProposal,
   setProtocolFeeBps
 };
-//# sourceMappingURL=chunk-EMDEQLUU.js.map
+//# sourceMappingURL=chunk-5ZC2A7UP.js.map

package/dist/{chunk-PRX5GLSN.js → chunk-ARD44YTT.js}

@@ -11,7 +11,7 @@ import {
   getAccount,
   getPublicClient,
   getWalletClient
-} from "./chunk-N65F7HRF.js";
+} from "./chunk-L24NGLKY.js";
 import {
   getChain
 } from "./chunk-MJMWA4LY.js";
@@ -329,4 +329,4 @@ export {
   setTextRecord,
   getTextRecord
 };
-//# sourceMappingURL=chunk-PRX5GLSN.js.map
+//# sourceMappingURL=chunk-ARD44YTT.js.map

package/dist/{chunk-KYABEFLH.js → chunk-FR4LYDPJ.js}

@@ -7,7 +7,7 @@ import {
   getAccount,
   getPublicClient,
   getWalletClient
-} from "./chunk-N65F7HRF.js";
+} from "./chunk-L24NGLKY.js";
 import {
   getChain,
   getChainConfig,
@@ -288,4 +288,4 @@ export {
   queryApprovals,
   queryJoinRequests
 };
-//# sourceMappingURL=chunk-KYABEFLH.js.map
+//# sourceMappingURL=chunk-FR4LYDPJ.js.map

package/dist/chunk-L24NGLKY.js

@@ -0,0 +1,124 @@
+import {
+  getChain,
+  getRpcUrl
+} from "./chunk-MJMWA4LY.js";
+import {
+  loadConfig
+} from "./chunk-TWX6FSCM.js";
+
+// src/lib/client.ts
+import { createPublicClient, createWalletClient, http } from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+var _publicClient = null;
+var _walletClient = null;
+function getPrivateKey() {
+  const config = loadConfig();
+  if (config.privateKey) {
+    const k = config.privateKey;
+    return k.startsWith("0x") ? k : `0x${k}`;
+  }
+  const env = process.env.PRIVATE_KEY;
+  if (env) {
+    return env.startsWith("0x") ? env : `0x${env}`;
+  }
+  throw new Error(
+    "Private key not found. Run 'sherwood config set --private-key <key>' or set PRIVATE_KEY env var."
+  );
+}
+function getPublicClient() {
+  const chain = getChain();
+  if (_publicClient && _publicClient.chain?.id !== chain.id) {
+    _publicClient = null;
+  }
+  if (!_publicClient) {
+    _publicClient = createPublicClient({
+      chain,
+      transport: http(getRpcUrl())
+    });
+  }
+  return _publicClient;
+}
+function getWalletClient() {
+  const chain = getChain();
+  if (_walletClient && _walletClient.chain?.id !== chain.id) {
+    _walletClient = null;
+  }
+  if (!_walletClient) {
+    const account = privateKeyToAccount(getPrivateKey());
+    _walletClient = createWalletClient({
+      account,
+      chain,
+      transport: http(getRpcUrl())
+    });
+  }
+  return _walletClient;
+}
+function getAccount() {
+  return privateKeyToAccount(getPrivateKey());
+}
+async function estimateFeesWithBuffer() {
+  const client = getPublicClient();
+  const { maxFeePerGas, maxPriorityFeePerGas } = await client.estimateFeesPerGas();
+  return {
+    maxFeePerGas: maxFeePerGas * 120n / 100n,
+    maxPriorityFeePerGas: maxPriorityFeePerGas * 120n / 100n
+  };
+}
+var MAX_RETRIES = 3;
+var GAS_BUMP_NUMERATOR = 110n;
+var GAS_BUMP_DENOMINATOR = 100n;
+function isUnderpricedError(msg) {
+  return msg.includes("replacement transaction underpriced");
+}
+function isNonceStaleError(msg) {
+  return msg.includes("nonce too low") || msg.includes("NONCE_EXPIRED");
+}
+function isRetryableError(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return isUnderpricedError(msg) || isNonceStaleError(msg);
+}
+function bumpFees(fees) {
+  return {
+    maxFeePerGas: fees.maxFeePerGas * GAS_BUMP_NUMERATOR / GAS_BUMP_DENOMINATOR,
+    maxPriorityFeePerGas: fees.maxPriorityFeePerGas * GAS_BUMP_NUMERATOR / GAS_BUMP_DENOMINATOR
+  };
+}
+async function withRetry(send, txParams) {
+  const client = getPublicClient();
+  const account = getAccount();
+  let fees = await estimateFeesWithBuffer();
+  let nonce = await client.getTransactionCount({ address: account.address, blockTag: "pending" });
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      return await send({ ...txParams, ...fees, nonce });
+    } catch (err) {
+      if (attempt >= MAX_RETRIES || !isRetryableError(err)) throw err;
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(`  Retry ${attempt + 1}/${MAX_RETRIES}: ${isNonceStaleError(msg) ? "refreshing nonce" : "bumping gas"}...`);
+      if (isNonceStaleError(msg)) {
+        nonce = await client.getTransactionCount({ address: account.address, blockTag: "pending" });
+      } else {
+        fees = bumpFees(fees);
+      }
+    }
+  }
+  throw new Error("withRetry: exhausted retries");
+}
+async function sendTxWithRetry(txParams) {
+  const wallet = getWalletClient();
+  return withRetry((p) => wallet.sendTransaction(p), txParams);
+}
+async function writeContractWithRetry(txParams) {
+  const wallet = getWalletClient();
+  return withRetry((p) => wallet.writeContract(p), txParams);
+}
+
+export {
+  getPublicClient,
+  getWalletClient,
+  getAccount,
+  estimateFeesWithBuffer,
+  sendTxWithRetry,
+  writeContractWithRetry
+};
+//# sourceMappingURL=chunk-L24NGLKY.js.map

package/dist/chunk-L24NGLKY.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/client.ts"],"sourcesContent":["/**\n * viem client factory — resolves chain and RPC from the network module.\n * Private key is read from ~/.sherwood/config.json (set via `sherwood config set --private-key`),\n * with PRIVATE_KEY env var as fallback.\n */\n\n// dotenv loaded at entrypoint\nimport type { Hex } from \"viem\";\nimport { createPublicClient, createWalletClient, http } from \"viem\";\nimport { privateKeyToAccount } from \"viem/accounts\";\nimport { getChain, getRpcUrl } from \"./network.js\";\nimport { loadConfig } from \"./config.js\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nlet _publicClient: any = null;\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nlet _walletClient: any = null;\n\n/**\n * Resolve the private key: config → env → error.\n */\nfunction getPrivateKey(): `0x${string}` {\n  // 1. Config (~/.sherwood/config.json)\n  const config = loadConfig();\n  if (config.privateKey) {\n    const k = config.privateKey;\n    return (k.startsWith(\"0x\") ? k : `0x${k}`) as `0x${string}`;\n  }\n\n  // 2. Env var fallback\n  const env = process.env.PRIVATE_KEY;\n  if (env) {\n    return (env.startsWith(\"0x\") ? env : `0x${env}`) as `0x${string}`;\n  }\n\n  throw new Error(\n    \"Private key not found. Run 'sherwood config set --private-key <key>' or set PRIVATE_KEY env var.\",\n  );\n}\n\nexport function getPublicClient() {\n  const chain = getChain();\n  // Auto-invalidate if network changed since last creation\n  if (_publicClient && _publicClient.chain?.id !== chain.id) {\n    _publicClient = null;\n  }\n  if (!_publicClient) {\n    _publicClient = createPublicClient({\n      chain,\n      transport: http(getRpcUrl()),\n    });\n  }\n  return _publicClient as ReturnType<typeof createPublicClient>;\n}\n\nexport function getWalletClient() {\n  const chain = getChain();\n  // Auto-invalidate if network changed since last creation\n  if (_walletClient && _walletClient.chain?.id !== chain.id) {\n    _walletClient = null;\n  }\n  if (!_walletClient) {\n    const account = privateKeyToAccount(getPrivateKey());\n    _walletClient = createWalletClient({\n      account,\n      chain,\n      transport: http(getRpcUrl()),\n    });\n  }\n  return _walletClient as ReturnType<typeof createWalletClient>;\n}\n\n/**\n * Reset cached clients. Required for tests that call setNetwork()\n * after a client was already created.\n */\nexport function resetClients() {\n  _publicClient = null;\n  _walletClient = null;\n}\n\nexport function getAccount() {\n  return privateKeyToAccount(getPrivateKey());\n}\n\n/**\n * Estimate EIP-1559 fees with a 20% buffer to avoid stuck txs on Base gas spikes.\n */\nexport async function estimateFeesWithBuffer() {\n  const client = getPublicClient();\n  const { maxFeePerGas, maxPriorityFeePerGas } =\n    await client.estimateFeesPerGas();\n  return {\n    maxFeePerGas: (maxFeePerGas * 120n) / 100n,\n    maxPriorityFeePerGas: (maxPriorityFeePerGas * 120n) / 100n,\n  };\n}\n\n// ── Retry helpers for nonce collision / underpriced tx recovery ──\n//\n// Gas bump ceiling: base * 1.2 (buffer) * 1.1^3 (max retries) ≈ 1.6x base fee.\n\nconst MAX_RETRIES = 3;\nconst GAS_BUMP_NUMERATOR = 110n;\nconst GAS_BUMP_DENOMINATOR = 100n;\n\nfunction isUnderpricedError(msg: string): boolean {\n  return msg.includes(\"replacement transaction underpriced\");\n}\n\nfunction isNonceStaleError(msg: string): boolean {\n  return msg.includes(\"nonce too low\") || msg.includes(\"NONCE_EXPIRED\");\n}\n\nfunction isRetryableError(err: unknown): boolean {\n  const msg = err instanceof Error ? err.message : String(err);\n  return isUnderpricedError(msg) || isNonceStaleError(msg);\n}\n\nfunction bumpFees(fees: { maxFeePerGas: bigint; maxPriorityFeePerGas: bigint }) {\n  return {\n    maxFeePerGas: (fees.maxFeePerGas * GAS_BUMP_NUMERATOR) / GAS_BUMP_DENOMINATOR,\n    maxPriorityFeePerGas: (fees.maxPriorityFeePerGas * GAS_BUMP_NUMERATOR) / GAS_BUMP_DENOMINATOR,\n  };\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype TxSender = (params: any) => Promise<Hex>;\n\n/**\n * Shared retry loop: explicit nonce + EIP-1559 fee buffer + gas-bump on underpriced errors.\n * On \"nonce too low\" / \"NONCE_EXPIRED\", re-fetches nonce from pending state before retrying.\n */\nasync function withRetry(send: TxSender, txParams: Record<string, unknown>): Promise<Hex> {\n  const client = getPublicClient();\n  const account = getAccount();\n  let fees = await estimateFeesWithBuffer();\n  let nonce = await client.getTransactionCount({ address: account.address, blockTag: \"pending\" });\n\n  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {\n    try {\n      return await send({ ...txParams, ...fees, nonce });\n    } catch (err) {\n      if (attempt >= MAX_RETRIES || !isRetryableError(err)) throw err;\n\n      const msg = err instanceof Error ? err.message : String(err);\n      console.warn(`  Retry ${attempt + 1}/${MAX_RETRIES}: ${isNonceStaleError(msg) ? \"refreshing nonce\" : \"bumping gas\"}...`);\n\n      if (isNonceStaleError(msg)) {\n        // Fresh nonce = fresh tx, no replacement needed — only bump fees for underpriced errors\n        nonce = await client.getTransactionCount({ address: account.address, blockTag: \"pending\" });\n      } else {\n        fees = bumpFees(fees);\n      }\n    }\n  }\n  throw new Error(\"withRetry: exhausted retries\");\n}\n\n/**\n * Send a raw transaction with automatic gas-bump retry on nonce/underpriced errors.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function sendTxWithRetry(txParams: Record<string, any>): Promise<Hex> {\n  const wallet = getWalletClient();\n  return withRetry((p) => wallet.sendTransaction(p), txParams);\n}\n\n/**\n * Call writeContract with automatic gas-bump retry on nonce/underpriced errors.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function writeContractWithRetry(txParams: Record<string, any>): Promise<Hex> {\n  const wallet = getWalletClient();\n  return withRetry((p) => wallet.writeContract(p), txParams);\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-EDH6ICCT.js → chunk-Z2PNK3CC.js}

@@ -1,6 +1,6 @@
 import {
   getAccount
-} from "./chunk-N65F7HRF.js";
+} from "./chunk-L24NGLKY.js";
 
 // src/providers/research/messari.ts
 import { base, baseSepolia } from "viem/chains";
@@ -436,4 +436,4 @@ export {
   NansenProvider,
   getResearchProvider
 };
-//# sourceMappingURL=chunk-EDH6ICCT.js.map
+//# sourceMappingURL=chunk-Z2PNK3CC.js.map

package/dist/{eas-Y7HS7FXK.js → eas-DOC4QKDF.js}

@@ -6,9 +6,9 @@ import {
   queryApprovals,
   queryJoinRequests,
   revokeAttestation
-} from "./chunk-KYABEFLH.js";
+} from "./chunk-FR4LYDPJ.js";
 import "./chunk-TPE6ZTUI.js";
-import "./chunk-N65F7HRF.js";
+import "./chunk-L24NGLKY.js";
 import "./chunk-MJMWA4LY.js";
 import "./chunk-TWX6FSCM.js";
 export {
@@ -20,4 +20,4 @@ export {
   queryJoinRequests,
   revokeAttestation
 };
-//# sourceMappingURL=eas-Y7HS7FXK.js.map
+//# sourceMappingURL=eas-DOC4QKDF.js.map

package/dist/{governor-UGIUQYPB.js → governor-E6AU3UWV.js}

@@ -34,9 +34,9 @@ import {
   settleProposal,
   vetoProposal,
   vote
-} from "./chunk-EMDEQLUU.js";
+} from "./chunk-5ZC2A7UP.js";
 import "./chunk-TPE6ZTUI.js";
-import "./chunk-N65F7HRF.js";
+import "./chunk-L24NGLKY.js";
 import "./chunk-MJMWA4LY.js";
 import "./chunk-TWX6FSCM.js";
 export {
@@ -76,4 +76,4 @@ export {
   vetoProposal,
   vote
 };
-//# sourceMappingURL=governor-UGIUQYPB.js.map
+//# sourceMappingURL=governor-E6AU3UWV.js.map