@agether/sdk 2.17.3 → 2.18.1

package/dist/cli.js

@@ -30,57 +30,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/utils/retry.ts
-function isRetriable(error) {
-  const msg = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-  return RETRIABLE_PATTERNS.some((p) => msg.includes(p.toLowerCase()));
-}
-async function withRetry(fn, options = {}) {
-  const {
-    maxRetries = 3,
-    baseDelay = 1e3,
-    maxDelay = 15e3,
-    onRetry
-  } = options;
-  let lastError;
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (error) {
-      lastError = error instanceof Error ? error : new Error(String(error));
-      if (attempt >= maxRetries || !isRetriable(error)) {
-        throw lastError;
-      }
-      const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
-      const jitter = delay * (0.5 + Math.random() * 0.5);
-      onRetry?.(attempt, lastError);
-      await new Promise((resolve) => setTimeout(resolve, jitter));
-    }
-  }
-  throw lastError;
-}
-var RETRIABLE_PATTERNS;
-var init_retry = __esm({
-  "src/utils/retry.ts"() {
-    "use strict";
-    RETRIABLE_PATTERNS = [
-      "ECONNRESET",
-      "ECONNREFUSED",
-      "ENOTFOUND",
-      "ETIMEDOUT",
-      "fetch failed",
-      "network error",
-      "socket hang up",
-      "rate limit",
-      "429",
-      "502",
-      "503",
-      "504",
-      "timeout"
-    ];
-  }
-});
-
 // src/types/index.ts
 var AgetherError;
 var init_types = __esm({
@@ -320,33 +269,19 @@ var init_config = __esm({
   }
 });
 
-// src/clients/MorphoClient.ts
-var MorphoClient_exports = {};
-__export(MorphoClient_exports, {
-  MorphoClient: () => MorphoClient
-});
-var import_ethers, import_axios, MORPHO_API_URL, MODE_SINGLE, MODE_BATCH, morphoIface, erc20Iface, MorphoClient;
-var init_MorphoClient = __esm({
-  "src/clients/MorphoClient.ts"() {
+// src/clients/AgentAccountClient.ts
+var import_ethers, MODE_SINGLE, MODE_BATCH, AgentAccountClient;
+var init_AgentAccountClient = __esm({
+  "src/clients/AgentAccountClient.ts"() {
     "use strict";
     import_ethers = require("ethers");
-    import_axios = __toESM(require("axios"));
-    init_retry();
     init_types();
     init_abis();
     init_config();
-    MORPHO_API_URL = "https://api.morpho.org/graphql";
     MODE_SINGLE = "0x0000000000000000000000000000000000000000000000000000000000000000";
     MODE_BATCH = "0x0100000000000000000000000000000000000000000000000000000000000000";
-    morphoIface = new import_ethers.ethers.Interface(MORPHO_BLUE_ABI);
-    erc20Iface = new import_ethers.ethers.Interface(ERC20_ABI);
-    MorphoClient = class _MorphoClient {
+    AgentAccountClient = class {
       constructor(config) {
-        /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
-        this._marketCache = /* @__PURE__ */ new Map();
-        /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
-        this._tokenCache = /* @__PURE__ */ new Map();
-        this._discoveredAt = 0;
         if (!config.agentId) {
           throw new AgetherError(
             "agentId is required. Use AgetherClient.register() first to get an agentId.",
@@ -381,13 +316,10 @@ var init_MorphoClient = __esm({
         }
         const addrs = { ...defaultCfg.contracts, ...config.contracts };
         this.agether4337Factory = new import_ethers.Contract(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-        this.morphoBlue = new import_ethers.Contract(addrs.morphoBlue, MORPHO_BLUE_ABI, this.provider);
         this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
       }
-      // ════════════════════════════════════════════════════════
-      //  Account Management
-      // ════════════════════════════════════════════════════════
-      /** Resolve the AgentAccount address (cached, with retry for flaky RPCs). */
+      // ─── Account Management ───────────────────────────────────────────────
+      /** Resolve the AgentAccount (Safe) address. Cached after first call. */
       async getAccountAddress() {
         if (this._accountAddress) return this._accountAddress;
         const MAX_RETRIES = 3;
@@ -413,26 +345,279 @@ var init_MorphoClient = __esm({
       getAgentId() {
         return this.agentId;
       }
-      /**
-       * Get the EOA wallet address (synchronous, best-effort).
-       *
-       * For the `privateKey` path this always works. For the `signer` path
-       * it works if the signer exposes `.address` synchronously (e.g. ethers.Wallet).
-       * If the address has not been resolved yet, throws — call `getSignerAddress()` first.
-       */
+      /** Get the EOA wallet address (synchronous). */
       getWalletAddress() {
         if (this._eoaAddress) return this._eoaAddress;
         const signer = this._signer;
         if (signer.address && typeof signer.address === "string") {
-          const addr = signer.address;
-          this._eoaAddress = addr;
-          return addr;
+          this._eoaAddress = signer.address;
+          return signer.address;
         }
         throw new AgetherError(
-          "EOA address not yet resolved. Call getSignerAddress() (async) first, or use a signer that exposes .address synchronously.",
-          "ADDRESS_NOT_RESOLVED"
+          "EOA address not available synchronously. Call getSignerAddress() first.",
+          "NO_EOA_ADDRESS"
+        );
+      }
+      /** Get EOA wallet address (async, works for all signer types). */
+      async getSignerAddress() {
+        if (this._eoaAddress) return this._eoaAddress;
+        const addr = await this._signer.getAddress();
+        this._eoaAddress = addr;
+        return addr;
+      }
+      // ─── Safe7579 Execution ───────────────────────────────────────────────
+      /** Pack two uint128 values into a single bytes32. */
+      _packUint128(hi, lo) {
+        return import_ethers.ethers.zeroPadValue(import_ethers.ethers.toBeHex(hi << 128n | lo), 32);
+      }
+      /**
+       * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
+       */
+      async _submitUserOp(callData) {
+        const sender = await this.getAccountAddress();
+        const validatorAddr = this.config.contracts.erc8004ValidationModule;
+        const nonceKey = BigInt(validatorAddr) << 32n;
+        const nonce = await this.entryPoint.getNonce(sender, nonceKey);
+        const feeData = await this.provider.getFeeData();
+        const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers.ethers.parseUnits("0.5", "gwei");
+        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers.ethers.parseUnits("0.1", "gwei");
+        const verificationGasLimit = 500000n;
+        const callGasLimit = 800000n;
+        const preVerificationGas = 100000n;
+        const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
+        const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+        const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
+        const accountBalance = await this.provider.getBalance(sender);
+        if (accountBalance < requiredPrefund) {
+          const topUp = requiredPrefund - accountBalance;
+          const topUpWithBuffer = topUp * 120n / 100n;
+          const eoaBalance = await this.provider.getBalance(
+            this._eoaAddress ?? await this._signer.getAddress()
+          );
+          if (eoaBalance < topUpWithBuffer) {
+            const needed = import_ethers.ethers.formatEther(topUpWithBuffer);
+            throw new AgetherError(
+              `Insufficient ETH for gas. Need ~${needed} ETH in EOA.`,
+              "INSUFFICIENT_GAS"
+            );
+          }
+          const tx = await this._signer.sendTransaction({ to: sender, value: topUpWithBuffer });
+          await tx.wait();
+        }
+        const packedUserOp = {
+          sender,
+          nonce,
+          initCode: "0x",
+          callData,
+          accountGasLimits,
+          preVerificationGas,
+          gasFees,
+          paymasterAndData: "0x",
+          signature: "0x"
+        };
+        const entryPointAddr = await this.entryPoint.getAddress();
+        const chainId = (await this.provider.getNetwork()).chainId;
+        const userOpHash = import_ethers.ethers.keccak256(
+          import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+            ["bytes32", "address", "uint256"],
+            [
+              import_ethers.ethers.keccak256(
+                import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+                  [
+                    "address",
+                    "uint256",
+                    "bytes32",
+                    "bytes32",
+                    "bytes32",
+                    "uint256",
+                    "bytes32",
+                    "bytes32"
+                  ],
+                  [
+                    packedUserOp.sender,
+                    packedUserOp.nonce,
+                    import_ethers.ethers.keccak256(packedUserOp.initCode),
+                    import_ethers.ethers.keccak256(packedUserOp.callData),
+                    packedUserOp.accountGasLimits,
+                    packedUserOp.preVerificationGas,
+                    packedUserOp.gasFees,
+                    import_ethers.ethers.keccak256(packedUserOp.paymasterAndData)
+                  ]
+                )
+              ),
+              entryPointAddr,
+              chainId
+            ]
+          )
+        );
+        const signature = await this._signer.signMessage(import_ethers.ethers.getBytes(userOpHash));
+        packedUserOp.signature = signature;
+        const handleOpsTx = await this.entryPoint.handleOps(
+          [
+            [
+              packedUserOp.sender,
+              packedUserOp.nonce,
+              packedUserOp.initCode,
+              packedUserOp.callData,
+              packedUserOp.accountGasLimits,
+              packedUserOp.preVerificationGas,
+              packedUserOp.gasFees,
+              packedUserOp.paymasterAndData,
+              packedUserOp.signature
+            ]
+          ],
+          this._eoaAddress ?? await this._signer.getAddress()
+        );
+        const receipt = await handleOpsTx.wait();
+        const epIface = new import_ethers.ethers.Interface(ENTRYPOINT_V07_ABI);
+        for (const log of receipt.logs) {
+          try {
+            const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
+            if (parsed?.name === "UserOperationEvent") {
+              if (!parsed.args.success) {
+                let revertMsg = "UserOp inner execution reverted";
+                for (const rLog of receipt.logs) {
+                  try {
+                    const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
+                    if (rParsed?.name === "UserOperationRevertReason") {
+                      const reason = rParsed.args.revertReason;
+                      try {
+                        if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
+                          const decoded = import_ethers.ethers.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
+                          revertMsg = `UserOp reverted: ${decoded[0]}`;
+                        } else {
+                          revertMsg = `UserOp reverted with data: ${reason}`;
+                        }
+                      } catch {
+                        revertMsg = `UserOp reverted with data: ${reason}`;
+                      }
+                      break;
+                    }
+                  } catch {
+                    continue;
+                  }
+                }
+                throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+              }
+            }
+          } catch (e) {
+            if (e instanceof AgetherError) throw e;
+            continue;
+          }
+        }
+        return receipt;
+      }
+      /**
+       * Execute a single call via Safe7579 account through ERC-4337 UserOp.
+       */
+      async executeSingle(target, data, value = 0n) {
+        const valueHex = import_ethers.ethers.zeroPadValue(import_ethers.ethers.toBeHex(value), 32);
+        const executionCalldata = import_ethers.ethers.concat([target, valueHex, data]);
+        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
+        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE, executionCalldata]);
+        return this._submitUserOp(callData);
+      }
+      /**
+       * Execute multiple calls via Safe7579 account in one atomic batch.
+       */
+      async executeBatch(targets, values, datas) {
+        const executions = targets.map((t, i) => [t, values[i], datas[i]]);
+        const executionCalldata = import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+          ["(address,uint256,bytes)[]"],
+          [executions]
         );
+        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
+        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_BATCH, executionCalldata]);
+        return this._submitUserOp(callData);
+      }
+    };
+  }
+});
+
+// src/utils/retry.ts
+function isRetriable(error) {
+  const msg = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+  return RETRIABLE_PATTERNS.some((p) => msg.includes(p.toLowerCase()));
+}
+async function withRetry(fn, options = {}) {
+  const {
+    maxRetries = 3,
+    baseDelay = 1e3,
+    maxDelay = 15e3,
+    onRetry
+  } = options;
+  let lastError;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+      if (attempt >= maxRetries || !isRetriable(error)) {
+        throw lastError;
+      }
+      const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
+      const jitter = delay * (0.5 + Math.random() * 0.5);
+      onRetry?.(attempt, lastError);
+      await new Promise((resolve) => setTimeout(resolve, jitter));
+    }
+  }
+  throw lastError;
+}
+var RETRIABLE_PATTERNS;
+var init_retry = __esm({
+  "src/utils/retry.ts"() {
+    "use strict";
+    RETRIABLE_PATTERNS = [
+      "ECONNRESET",
+      "ECONNREFUSED",
+      "ENOTFOUND",
+      "ETIMEDOUT",
+      "fetch failed",
+      "network error",
+      "socket hang up",
+      "rate limit",
+      "429",
+      "502",
+      "503",
+      "504",
+      "timeout"
+    ];
+  }
+});
+
+// src/clients/MorphoClient.ts
+var MorphoClient_exports = {};
+__export(MorphoClient_exports, {
+  MorphoClient: () => MorphoClient
+});
+var import_ethers2, import_axios, MORPHO_API_URL, morphoIface, erc20Iface, MorphoClient;
+var init_MorphoClient = __esm({
+  "src/clients/MorphoClient.ts"() {
+    "use strict";
+    import_ethers2 = require("ethers");
+    init_AgentAccountClient();
+    import_axios = __toESM(require("axios"));
+    init_retry();
+    init_types();
+    init_abis();
+    MORPHO_API_URL = "https://api.morpho.org/graphql";
+    morphoIface = new import_ethers2.ethers.Interface(MORPHO_BLUE_ABI);
+    erc20Iface = new import_ethers2.ethers.Interface(ERC20_ABI);
+    MorphoClient = class _MorphoClient extends AgentAccountClient {
+      constructor(config) {
+        super(config);
+        // Cached state
+        /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
+        this._marketCache = /* @__PURE__ */ new Map();
+        /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
+        this._tokenCache = /* @__PURE__ */ new Map();
+        this._discoveredAt = 0;
+        const addrs = { ...this.config.contracts, ...config.contracts };
+        this.morphoBlue = new import_ethers2.Contract(addrs.morphoBlue, MORPHO_BLUE_ABI, this.provider);
       }
+      // ════════════════════════════════════════════════════════
+      //  Account Management
+      // ════════════════════════════════════════════════════════
       /**
        * Resolve the EOA signer address (async, works with all signer types).
        * Result is cached after the first call.
@@ -489,7 +674,7 @@ var init_MorphoClient = __esm({
           this._discoveredMarkets = items.map((m) => ({
             uniqueKey: m.uniqueKey,
             loanAsset: m.loanAsset,
-            collateralAsset: m.collateralAsset ?? { address: import_ethers.ethers.ZeroAddress, symbol: "N/A", decimals: 0 },
+            collateralAsset: m.collateralAsset ?? { address: import_ethers2.ethers.ZeroAddress, symbol: "N/A", decimals: 0 },
             oracle: m.oracleAddress,
             irm: m.irmAddress,
             lltv: BigInt(m.lltv),
@@ -506,7 +691,7 @@ var init_MorphoClient = __esm({
               irm: mi.irm,
               lltv: mi.lltv
             });
-            if (mi.collateralAsset.address !== import_ethers.ethers.ZeroAddress) {
+            if (mi.collateralAsset.address !== import_ethers2.ethers.ZeroAddress) {
               this._tokenCache.set(mi.collateralAsset.symbol.toUpperCase(), {
                 address: mi.collateralAsset.address,
                 symbol: mi.collateralAsset.symbol,
@@ -518,7 +703,7 @@ var init_MorphoClient = __esm({
                 decimals: mi.collateralAsset.decimals
               });
             }
-            if (mi.loanAsset.address !== import_ethers.ethers.ZeroAddress) {
+            if (mi.loanAsset.address !== import_ethers2.ethers.ZeroAddress) {
               this._tokenCache.set(mi.loanAsset.symbol.toUpperCase(), {
                 address: mi.loanAsset.address,
                 symbol: mi.loanAsset.symbol,
@@ -688,7 +873,7 @@ var init_MorphoClient = __esm({
                 const totalBorrowShares = BigInt(mkt.totalBorrowShares);
                 const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
                 debt = totalBorrowShares > 0n ? (borrowShares * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
-                totalDebtFloat += parseFloat(import_ethers.ethers.formatUnits(debt, loanDecimals));
+                totalDebtFloat += parseFloat(import_ethers2.ethers.formatUnits(debt, loanDecimals));
               } catch (e) {
                 console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
               }
@@ -697,17 +882,17 @@ var init_MorphoClient = __esm({
               marketId: m.uniqueKey,
               collateralToken: m.collateralAsset.symbol,
               loanToken: m.loanAsset.symbol,
-              collateral: import_ethers.ethers.formatUnits(collateral, m.collateralAsset.decimals),
+              collateral: import_ethers2.ethers.formatUnits(collateral, m.collateralAsset.decimals),
               borrowShares: borrowShares.toString(),
               supplyShares: supplyShares.toString(),
-              debt: import_ethers.ethers.formatUnits(debt, loanDecimals)
+              debt: import_ethers2.ethers.formatUnits(debt, loanDecimals)
             });
           }
         } catch (e) {
           console.warn("[agether] marketPositions API failed, falling back to market scan:", e instanceof Error ? e.message : e);
           const markets = await this.getMarkets();
           for (const m of markets) {
-            if (!m.collateralAsset || m.collateralAsset.address === import_ethers.ethers.ZeroAddress) continue;
+            if (!m.collateralAsset || m.collateralAsset.address === import_ethers2.ethers.ZeroAddress) continue;
             try {
               const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
               if (pos.collateral === 0n && pos.borrowShares === 0n && pos.supplyShares === 0n) continue;
@@ -719,7 +904,7 @@ var init_MorphoClient = __esm({
                   const totalBorrowShares = BigInt(mkt.totalBorrowShares);
                   const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
                   debt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
-                  totalDebtFloat += parseFloat(import_ethers.ethers.formatUnits(debt, loanDecimals));
+                  totalDebtFloat += parseFloat(import_ethers2.ethers.formatUnits(debt, loanDecimals));
                 } catch (e2) {
                   console.warn(`[agether] debt calc failed:`, e2 instanceof Error ? e2.message : e2);
                 }
@@ -728,10 +913,10 @@ var init_MorphoClient = __esm({
                 marketId: m.uniqueKey,
                 collateralToken: m.collateralAsset.symbol,
                 loanToken: m.loanAsset.symbol,
-                collateral: import_ethers.ethers.formatUnits(pos.collateral, m.collateralAsset.decimals),
+                collateral: import_ethers2.ethers.formatUnits(pos.collateral, m.collateralAsset.decimals),
                 borrowShares: pos.borrowShares.toString(),
                 supplyShares: pos.supplyShares.toString(),
-                debt: import_ethers.ethers.formatUnits(debt, loanDecimals)
+                debt: import_ethers2.ethers.formatUnits(debt, loanDecimals)
               });
             } catch (e2) {
               console.warn(`[agether] position read failed:`, e2 instanceof Error ? e2.message : e2);
@@ -757,7 +942,7 @@ var init_MorphoClient = __esm({
       async getTokenBalance(symbolOrAddress) {
         const acctAddr = await this.getAccountAddress();
         const tokenInfo = await this._resolveToken(symbolOrAddress);
-        const token = new import_ethers.Contract(tokenInfo.address, ERC20_ABI, this.provider);
+        const token = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.provider);
         return token.balanceOf(acctAddr);
       }
       /**
@@ -767,7 +952,7 @@ var init_MorphoClient = __esm({
        */
       async getUsdcBalance() {
         const acctAddr = await this.getAccountAddress();
-        const usdc = new import_ethers.Contract(this.config.contracts.usdc, ERC20_ABI, this.provider);
+        const usdc = new import_ethers2.Contract(this.config.contracts.usdc, ERC20_ABI, this.provider);
         return usdc.balanceOf(acctAddr);
       }
       /**
@@ -787,7 +972,7 @@ var init_MorphoClient = __esm({
         let totalAdditional = 0n;
         const byMarket = [];
         for (const m of markets) {
-          if (!m.collateralAsset || m.collateralAsset.address === import_ethers.ethers.ZeroAddress) continue;
+          if (!m.collateralAsset || m.collateralAsset.address === import_ethers2.ethers.ZeroAddress) continue;
           try {
             const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
             if (pos.collateral === 0n) continue;
@@ -797,7 +982,7 @@ var init_MorphoClient = __esm({
             const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
             let collateralValueInLoan;
             try {
-              const oracleContract = new import_ethers.Contract(m.oracle, [
+              const oracleContract = new import_ethers2.Contract(m.oracle, [
                 "function price() view returns (uint256)"
               ], this.provider);
               const oraclePrice = await oracleContract.price();
@@ -903,7 +1088,7 @@ var init_MorphoClient = __esm({
             const sym = loanTokenSymbolOrAddress.toUpperCase();
             items = items.filter((m) => m.loanAsset?.symbol?.toUpperCase() === sym);
           }
-          return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers.ethers.ZeroAddress).map((m) => {
+          return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers2.ethers.ZeroAddress).map((m) => {
             const loanDecimals = m.loanAsset?.decimals ?? 18;
             return {
               collateralToken: m.collateralAsset.symbol,
@@ -964,7 +1149,7 @@ var init_MorphoClient = __esm({
             { maxRetries: 3, onRetry: (n, e) => console.warn(`[agether] Morpho API retry ${n}:`, e.message) }
           );
           let items = resp.data?.data?.markets?.items ?? [];
-          items = items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers.ethers.ZeroAddress);
+          items = items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers2.ethers.ZeroAddress);
           const searchUpper = search.toUpperCase();
           if (options?.asCollateral) {
             items = items.filter((m) => m.collateralAsset?.symbol?.toUpperCase() === searchUpper);
@@ -1020,10 +1205,10 @@ var init_MorphoClient = __esm({
           if (ethBalance > 0n) {
             results.push({
               symbol: "ETH",
-              address: import_ethers.ethers.ZeroAddress,
+              address: import_ethers2.ethers.ZeroAddress,
               decimals: 18,
               balance: ethBalance,
-              balanceFormatted: import_ethers.ethers.formatEther(ethBalance)
+              balanceFormatted: import_ethers2.ethers.formatEther(ethBalance)
             });
           }
         } catch {
@@ -1034,7 +1219,7 @@ var init_MorphoClient = __esm({
           const batch = tokenEntries.slice(i, i + batchSize);
           const checks = batch.map(async (info) => {
             try {
-              const token = new import_ethers.Contract(info.address, ERC20_ABI, this.provider);
+              const token = new import_ethers2.Contract(info.address, ERC20_ABI, this.provider);
               const balance = await token.balanceOf(acctAddr);
               if (balance > 0n) {
                 return {
@@ -1042,7 +1227,7 @@ var init_MorphoClient = __esm({
                   address: info.address,
                   decimals: info.decimals,
                   balance,
-                  balanceFormatted: import_ethers.ethers.formatUnits(balance, info.decimals)
+                  balanceFormatted: import_ethers2.ethers.formatUnits(balance, info.decimals)
                 };
               }
             } catch {
@@ -1074,7 +1259,7 @@ var init_MorphoClient = __esm({
           try {
             const balance = await this.getTokenBalance(collateralSymbol);
             const info = await this._resolveToken(collateralSymbol);
-            tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: import_ethers.ethers.formatUnits(balance, info.decimals) }];
+            tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: import_ethers2.ethers.formatUnits(balance, info.decimals) }];
           } catch {
           }
         } else {
@@ -1153,13 +1338,13 @@ var init_MorphoClient = __esm({
         } else {
           try {
             const params = await this.findMarketForCollateral(collateralSymbol);
-            const loanDecimals = await this._getLoanTokenDecimals(params);
-            const oracleContract = new import_ethers.Contract(params.oracle, [
+            const loanDecimals = market.loanDecimals;
+            const oracleContract = new import_ethers2.Contract(params.oracle, [
               "function price() view returns (uint256)"
             ], this.provider);
             const oraclePrice = await oracleContract.price();
             const ORACLE_PRICE_SCALE = 10n ** 36n;
-            const amountWei = import_ethers.ethers.parseUnits(amount, colInfo.decimals);
+            const amountWei = import_ethers2.ethers.parseUnits(amount, colInfo.decimals);
             const valueInLoan = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
             collateralValueUsd = Number(valueInLoan) / 10 ** loanDecimals;
           } catch (e) {
@@ -1210,14 +1395,14 @@ var init_MorphoClient = __esm({
         }
         const loanDecimals = await this._getLoanTokenDecimals(params);
         const loanTokenAddr = params.loanToken;
-        const parsedAmount = import_ethers.ethers.parseUnits(amount, loanDecimals);
-        const marketId = import_ethers.ethers.keccak256(
-          import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+        const parsedAmount = import_ethers2.ethers.parseUnits(amount, loanDecimals);
+        const marketId = import_ethers2.ethers.keccak256(
+          import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
             ["address", "address", "address", "address", "uint256"],
             [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
           )
         );
-        const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+        const loanContract = new import_ethers2.Contract(loanTokenAddr, ERC20_ABI, this._signer);
         const acctBalance = await loanContract.balanceOf(acctAddr);
         if (acctBalance < parsedAmount) {
           const shortfall = parsedAmount - acctBalance;
@@ -1226,7 +1411,7 @@ var init_MorphoClient = __esm({
             const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
             const loanSymbol = loanInfo?.symbol ?? "loan token";
             throw new AgetherError(
-              `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
+              `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
               "INSUFFICIENT_BALANCE"
             );
           }
@@ -1246,7 +1431,7 @@ var init_MorphoClient = __esm({
             "0x"
           ])
         ];
-        const receipt = await this.batch(targets, values, datas);
+        const receipt = await this.executeBatch(targets, values, datas);
         return {
           tx: receipt.hash,
           amount,
@@ -1282,8 +1467,8 @@ var init_MorphoClient = __esm({
           params = p;
         }
         const loanDecimals = await this._getLoanTokenDecimals(params);
-        const marketId = import_ethers.ethers.keccak256(
-          import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+        const marketId = import_ethers2.ethers.keccak256(
+          import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
             ["address", "address", "address", "address", "uint256"],
             [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
           )
@@ -1296,7 +1481,7 @@ var init_MorphoClient = __esm({
           withdrawAssets = 0n;
           if (withdrawShares === 0n) throw new AgetherError("No supply position to withdraw", "NO_SUPPLY");
         } else {
-          withdrawAssets = import_ethers.ethers.parseUnits(amount, loanDecimals);
+          withdrawAssets = import_ethers2.ethers.parseUnits(amount, loanDecimals);
           withdrawShares = 0n;
         }
         const data = morphoIface.encodeFunctionData("withdraw", [
@@ -1306,7 +1491,7 @@ var init_MorphoClient = __esm({
           acctAddr,
           dest
         ]);
-        const receipt = await this.exec(morphoAddr, data);
+        const receipt = await this.executeSingle(morphoAddr, data);
         let remainingSupply = "0";
         try {
           const pos = await this.morphoBlue.position(marketId, acctAddr);
@@ -1314,7 +1499,7 @@ var init_MorphoClient = __esm({
           const totalSupplyAssets = BigInt(mkt.totalSupplyAssets);
           const totalSupplyShares = BigInt(mkt.totalSupplyShares);
           const currentAssets = totalSupplyShares > 0n ? BigInt(pos.supplyShares) * totalSupplyAssets / totalSupplyShares : 0n;
-          remainingSupply = import_ethers.ethers.formatUnits(currentAssets, loanDecimals);
+          remainingSupply = import_ethers2.ethers.formatUnits(currentAssets, loanDecimals);
         } catch (e) {
           console.warn("[agether] failed to read remaining supply:", e instanceof Error ? e.message : e);
         }
@@ -1379,9 +1564,9 @@ var init_MorphoClient = __esm({
             loanToken: p.market.loanAsset.symbol,
             collateralToken: p.market.collateralAsset?.symbol ?? "none",
             supplyShares: p.state.supplyShares,
-            suppliedAssets: import_ethers.ethers.formatUnits(currentAssets, p.market.loanAsset.decimals),
-            netDeposited: import_ethers.ethers.formatUnits(netDeposited, p.market.loanAsset.decimals),
-            earnedYield: import_ethers.ethers.formatUnits(earnedYield, p.market.loanAsset.decimals),
+            suppliedAssets: import_ethers2.ethers.formatUnits(currentAssets, p.market.loanAsset.decimals),
+            netDeposited: import_ethers2.ethers.formatUnits(netDeposited, p.market.loanAsset.decimals),
+            earnedYield: import_ethers2.ethers.formatUnits(earnedYield, p.market.loanAsset.decimals),
             supplyApy: p.market.state?.supplyApy ?? 0
           });
         }
@@ -1409,8 +1594,8 @@ var init_MorphoClient = __esm({
         );
         const params = await this.findMarketForCollateral(pos.collateralToken, pos.loanToken);
         const loanDecimals = await this._getLoanTokenDecimals(params);
-        const parsedAmount = import_ethers.ethers.parseUnits(amount, loanDecimals);
-        const availableYield = import_ethers.ethers.parseUnits(pos.earnedYield, loanDecimals);
+        const parsedAmount = import_ethers2.ethers.parseUnits(amount, loanDecimals);
+        const availableYield = import_ethers2.ethers.parseUnits(pos.earnedYield, loanDecimals);
         if (parsedAmount > availableYield) {
           const loanSymbol = pos.loanToken;
           throw new AgetherError(
@@ -1425,7 +1610,7 @@ var init_MorphoClient = __esm({
           acctAddr,
           recipient
         ]);
-        const receipt = await this.exec(morphoAddr, data);
+        const receipt = await this.executeSingle(morphoAddr, data);
         let remainingYield = "0";
         let remainingSupply = "0";
         try {
@@ -1460,16 +1645,16 @@ var init_MorphoClient = __esm({
         const acctAddr = await this.getAccountAddress();
         const colInfo = await this._resolveToken(tokenSymbol);
         const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
-        const weiAmount = import_ethers.ethers.parseUnits(amount, colInfo.decimals);
+        const weiAmount = import_ethers2.ethers.parseUnits(amount, colInfo.decimals);
         const morphoAddr = this.config.contracts.morphoBlue;
-        const colToken = new import_ethers.Contract(colInfo.address, ERC20_ABI, this._signer);
+        const colToken = new import_ethers2.Contract(colInfo.address, ERC20_ABI, this._signer);
         const acctBalance = await colToken.balanceOf(acctAddr);
         if (acctBalance < weiAmount) {
           const shortfall = weiAmount - acctBalance;
           const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
           if (eoaBalance < shortfall) {
             throw new AgetherError(
-              `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+              `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
               "INSUFFICIENT_BALANCE"
             );
           }
@@ -1488,7 +1673,7 @@ var init_MorphoClient = __esm({
             "0x"
           ])
         ];
-        const receipt = await this.batch(targets, values, datas);
+        const receipt = await this.executeBatch(targets, values, datas);
         return {
           tx: receipt.hash,
           collateralToken: tokenSymbol,
@@ -1521,10 +1706,10 @@ var init_MorphoClient = __esm({
           usedToken = symbol;
         }
         const loanDecimals = await this._getLoanTokenDecimals(params);
-        const parsedAmount = import_ethers.ethers.parseUnits(amount, loanDecimals);
+        const parsedAmount = import_ethers2.ethers.parseUnits(amount, loanDecimals);
         try {
-          const marketId = import_ethers.ethers.keccak256(
-            import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+          const marketId = import_ethers2.ethers.keccak256(
+            import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
               ["address", "address", "address", "address", "uint256"],
               [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
             )
@@ -1536,7 +1721,7 @@ var init_MorphoClient = __esm({
               "NO_COLLATERAL"
             );
           }
-          const oracleContract = new import_ethers.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+          const oracleContract = new import_ethers2.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
           const oraclePrice = await oracleContract.price();
           const collateralValueInLoan = BigInt(pos.collateral) * oraclePrice / 10n ** 36n;
           const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
@@ -1549,8 +1734,8 @@ var init_MorphoClient = __esm({
             const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
             const loanSymbol = loanInfo?.symbol ?? "loan token";
             const colInfo = await this._resolveToken(usedToken);
-            const maxFormatted = import_ethers.ethers.formatUnits(maxAdditional, loanDecimals);
-            const colFormatted = import_ethers.ethers.formatUnits(pos.collateral, colInfo.decimals);
+            const maxFormatted = import_ethers2.ethers.formatUnits(maxAdditional, loanDecimals);
+            const colFormatted = import_ethers2.ethers.formatUnits(pos.collateral, colInfo.decimals);
             throw new AgetherError(
               `Borrow of ${amount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
               "EXCEEDS_MAX_LTV"
@@ -1567,7 +1752,7 @@ var init_MorphoClient = __esm({
           acctAddr,
           acctAddr
         ]);
-        const receipt = await this.exec(morphoAddr, data);
+        const receipt = await this.executeSingle(morphoAddr, data);
         return {
           tx: receipt.hash,
           amount,
@@ -1597,19 +1782,19 @@ var init_MorphoClient = __esm({
         const colInfo = await this._resolveToken(tokenSymbol);
         const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
         const loanDecimals = await this._getLoanTokenDecimals(params);
-        const colWei = import_ethers.ethers.parseUnits(collateralAmount, colInfo.decimals);
-        const borrowWei = import_ethers.ethers.parseUnits(borrowAmount, loanDecimals);
+        const colWei = import_ethers2.ethers.parseUnits(collateralAmount, colInfo.decimals);
+        const borrowWei = import_ethers2.ethers.parseUnits(borrowAmount, loanDecimals);
         const morphoAddr = this.config.contracts.morphoBlue;
         try {
-          const marketId = import_ethers.ethers.keccak256(
-            import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+          const marketId = import_ethers2.ethers.keccak256(
+            import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
               ["address", "address", "address", "address", "uint256"],
               [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
             )
           );
           const pos = await this.morphoBlue.position(marketId, acctAddr);
           const totalCollateral = BigInt(pos.collateral) + colWei;
-          const oracleContract = new import_ethers.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+          const oracleContract = new import_ethers2.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
           const oraclePrice = await oracleContract.price();
           const collateralValueInLoan = totalCollateral * oraclePrice / 10n ** 36n;
           const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
@@ -1621,9 +1806,9 @@ var init_MorphoClient = __esm({
           if (borrowWei > maxAdditional) {
             const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
             const loanSymbol = loanInfo?.symbol ?? "loan token";
-            const maxFormatted = import_ethers.ethers.formatUnits(maxAdditional, loanDecimals);
+            const maxFormatted = import_ethers2.ethers.formatUnits(maxAdditional, loanDecimals);
             throw new AgetherError(
-              `Borrow of ${borrowAmount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (total collateral: ${import_ethers.ethers.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
+              `Borrow of ${borrowAmount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (total collateral: ${import_ethers2.ethers.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
               "EXCEEDS_MAX_LTV"
             );
           }
@@ -1631,14 +1816,14 @@ var init_MorphoClient = __esm({
           if (e instanceof AgetherError) throw e;
           console.warn("[agether] depositAndBorrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
         }
-        const colToken = new import_ethers.Contract(colInfo.address, ERC20_ABI, this._signer);
+        const colToken = new import_ethers2.Contract(colInfo.address, ERC20_ABI, this._signer);
         const acctBalance = await colToken.balanceOf(acctAddr);
         if (acctBalance < colWei) {
           const shortfall = colWei - acctBalance;
           const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
           if (eoaBalance < shortfall) {
             throw new AgetherError(
-              `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+              `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
               "INSUFFICIENT_BALANCE"
             );
           }
@@ -1664,7 +1849,7 @@ var init_MorphoClient = __esm({
             acctAddr
           ])
         ];
-        const receipt = await this.batch(targets, values, datas);
+        const receipt = await this.executeBatch(targets, values, datas);
         return {
           tx: receipt.hash,
           collateralToken: tokenSymbol,
@@ -1696,8 +1881,8 @@ var init_MorphoClient = __esm({
           const { params: p } = await this._findActiveMarket();
           params = p;
         }
-        const loanTokenAddr = params.loanToken;
         const loanDecimals = await this._getLoanTokenDecimals(params);
+        const loanTokenAddr = params.loanToken;
         let repayAssets;
         let repayShares;
         let approveAmount;
@@ -1714,9 +1899,9 @@ var init_MorphoClient = __esm({
             const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
             const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
             const estimated = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
-            approveAmount = estimated > 0n ? estimated : import_ethers.ethers.parseUnits("1", loanDecimals);
+            approveAmount = estimated > 0n ? estimated : import_ethers2.ethers.parseUnits("1", loanDecimals);
           } else {
-            const marketId = import_ethers.ethers.keccak256(import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+            const marketId = import_ethers2.ethers.keccak256(import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
               ["address", "address", "address", "address", "uint256"],
               [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
             ));
@@ -1726,14 +1911,14 @@ var init_MorphoClient = __esm({
             const onChainMkt = await this.morphoBlue.market(marketId);
             const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
             const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
-            approveAmount = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : import_ethers.ethers.parseUnits("1", loanDecimals);
+            approveAmount = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : import_ethers2.ethers.parseUnits("1", loanDecimals);
           }
         } else {
-          repayAssets = import_ethers.ethers.parseUnits(amount, loanDecimals);
+          repayAssets = import_ethers2.ethers.parseUnits(amount, loanDecimals);
           repayShares = 0n;
           approveAmount = repayAssets;
         }
-        const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+        const loanContract = new import_ethers2.Contract(loanTokenAddr, ERC20_ABI, this._signer);
         const acctBalance = await loanContract.balanceOf(acctAddr);
         const checkAmount = repayShares > 0n && repayAssets === 0n ? approveAmount * 1005n / 1000n : approveAmount;
         if (acctBalance < checkAmount) {
@@ -1752,7 +1937,7 @@ var init_MorphoClient = __esm({
               const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
               const loanSymbol = loanInfo?.symbol ?? "loan token";
               throw new AgetherError(
-                `Insufficient ${loanSymbol} for repay. Need ~${import_ethers.ethers.formatUnits(checkAmount, loanDecimals)}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
+                `Insufficient ${loanSymbol} for repay. Need ~${import_ethers2.ethers.formatUnits(checkAmount, loanDecimals)}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
                 "INSUFFICIENT_BALANCE"
               );
             }
@@ -1774,7 +1959,7 @@ var init_MorphoClient = __esm({
             "0x"
           ])
         ];
-        const receipt = await this.batch(targets, values, datas);
+        const receipt = await this.executeBatch(targets, values, datas);
         let remainingDebt = "0";
         try {
           const markets = await this.getMarkets(true);
@@ -1789,7 +1974,7 @@ var init_MorphoClient = __esm({
               const totalAssets = BigInt(onChainMkt.totalBorrowAssets);
               const totalShares = BigInt(onChainMkt.totalBorrowShares);
               const debtWei = totalShares > 0n ? shares * totalAssets / totalShares : 0n;
-              remainingDebt = import_ethers.ethers.formatUnits(debtWei, loanDecimals);
+              remainingDebt = import_ethers2.ethers.formatUnits(debtWei, loanDecimals);
             }
           }
         } catch (e) {
@@ -1961,7 +2146,7 @@ var init_MorphoClient = __esm({
           weiAmount = pos.collateral;
           if (weiAmount === 0n) throw new AgetherError("No collateral to withdraw", "NO_COLLATERAL");
         } else {
-          weiAmount = import_ethers.ethers.parseUnits(amount, colInfo.decimals);
+          weiAmount = import_ethers2.ethers.parseUnits(amount, colInfo.decimals);
         }
         let hasDustDebt = false;
         let dustBorrowShares = 0n;
@@ -1976,10 +2161,10 @@ var init_MorphoClient = __esm({
               const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
               const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
               const estimated = totalBorrowShares > 0n ? dustBorrowShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
-              dustApproveAmount = estimated > 0n ? estimated : import_ethers.ethers.parseUnits("1", loanDecimals);
+              dustApproveAmount = estimated > 0n ? estimated : import_ethers2.ethers.parseUnits("1", loanDecimals);
               const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
               const loanSymbol = loanInfo?.symbol ?? "loan token";
-              console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${import_ethers.ethers.formatUnits(dustApproveAmount, loanDecimals)} ${loanSymbol} \u2014 auto-repaying before withdraw`);
+              console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${import_ethers2.ethers.formatUnits(dustApproveAmount, loanDecimals)} ${loanSymbol} \u2014 auto-repaying before withdraw`);
             }
           } catch (e) {
             console.warn("[agether] failed to check borrow shares before withdraw:", e instanceof Error ? e.message : e);
@@ -1993,7 +2178,7 @@ var init_MorphoClient = __esm({
         ]);
         let receipt;
         if (hasDustDebt) {
-          const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+          const loanContract = new import_ethers2.Contract(loanTokenAddr, ERC20_ABI, this._signer);
           const acctBalance = await loanContract.balanceOf(acctAddr);
           if (acctBalance < dustApproveAmount) {
             const shortfall = dustApproveAmount - acctBalance;
@@ -2001,7 +2186,7 @@ var init_MorphoClient = __esm({
             if (eoaBalance >= shortfall) {
               const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
               const loanSymbol = loanInfo?.symbol ?? "loan token";
-              console.log(`[agether] transferring ${import_ethers.ethers.formatUnits(shortfall, loanDecimals)} ${loanSymbol} from EOA \u2192 AgentAccount for dust repay`);
+              console.log(`[agether] transferring ${import_ethers2.ethers.formatUnits(shortfall, loanDecimals)} ${loanSymbol} from EOA \u2192 AgentAccount for dust repay`);
               const transferTx = await loanContract.transfer(acctAddr, shortfall);
               await transferTx.wait();
               this._refreshSigner();
@@ -2020,15 +2205,15 @@ var init_MorphoClient = __esm({
             ]),
             withdrawData
           ];
-          receipt = await this.batch(targets, values, datas);
+          receipt = await this.executeBatch(targets, values, datas);
         } else {
-          receipt = await this.exec(morphoAddr, withdrawData);
+          receipt = await this.executeSingle(morphoAddr, withdrawData);
         }
         let remainingCollateral = "0";
         try {
           if (market) {
             const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
-            remainingCollateral = import_ethers.ethers.formatUnits(pos.collateral, colInfo.decimals);
+            remainingCollateral = import_ethers2.ethers.formatUnits(pos.collateral, colInfo.decimals);
           }
         } catch (e) {
           console.warn("[agether] failed to read remaining collateral after withdraw:", e instanceof Error ? e.message : e);
@@ -2036,7 +2221,7 @@ var init_MorphoClient = __esm({
         return {
           tx: receipt.hash,
           token: tokenSymbol,
-          amount: amount === "all" ? import_ethers.ethers.formatUnits(weiAmount, colInfo.decimals) : amount,
+          amount: amount === "all" ? import_ethers2.ethers.formatUnits(weiAmount, colInfo.decimals) : amount,
           remainingCollateral,
           destination: dest
         };
@@ -2060,138 +2245,98 @@ var init_MorphoClient = __esm({
       _refreshSigner() {
         if (this._useExternalSigner) {
           const addrs = this.config.contracts;
-          this.agether4337Factory = new import_ethers.Contract(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-          this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+          this.agether4337Factory = new import_ethers2.Contract(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.entryPoint = new import_ethers2.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
         } else {
-          this.provider = new import_ethers.ethers.JsonRpcProvider(this._rpcUrl);
-          const wallet = new import_ethers.ethers.Wallet(this._privateKey, this.provider);
+          this.provider = new import_ethers2.ethers.JsonRpcProvider(this._rpcUrl);
+          const wallet = new import_ethers2.ethers.Wallet(this._privateKey, this.provider);
           this._signer = wallet;
           this._eoaAddress = wallet.address;
           const addrs = this.config.contracts;
-          this.agether4337Factory = new import_ethers.Contract(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-          this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+          this.agether4337Factory = new import_ethers2.Contract(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.entryPoint = new import_ethers2.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
         }
       }
       // ────────────────────────────────────────────────────────────
       //  ERC-4337 UserOp helpers (Safe + Safe7579 + EntryPoint v0.7)
       // ────────────────────────────────────────────────────────────
       /**
-       * Pack two uint128 values into a single bytes32:
-       *   bytes32 = (hi << 128) | lo
+       * Repay all debt and withdraw all collateral in one atomic batch.
+       * Full position exit: approve + repay(shares) + withdrawCollateral → 1 UserOp.
        */
-      _packUint128(hi, lo) {
-        return import_ethers.ethers.zeroPadValue(import_ethers.ethers.toBeHex(hi << 128n | lo), 32);
-      }
-      /**
-       * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
-       *
-       * @param callData – the ABI-encoded calldata for the Safe7579 account
-       *   (e.g. `execute(mode, executionCalldata)`)
-       * @returns the transaction receipt of the handleOps call
-       */
-      async _submitUserOp(callData) {
-        const sender = await this.getAccountAddress();
-        const validatorAddr = this.config.contracts.erc8004ValidationModule;
-        const nonceKey = BigInt(validatorAddr) << 32n;
-        const nonce = await this.entryPoint.getNonce(sender, nonceKey);
-        const feeData = await this.provider.getFeeData();
-        const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers.ethers.parseUnits("0.5", "gwei");
-        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers.ethers.parseUnits("0.1", "gwei");
-        const verificationGasLimit = 500000n;
-        const callGasLimit = 800000n;
-        const preVerificationGas = 100000n;
-        const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
-        const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
-        const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
-        const accountBalance = await this.provider.getBalance(sender);
-        if (accountBalance < requiredPrefund) {
-          const topUp = requiredPrefund - accountBalance;
-          const topUpWithBuffer = topUp * 120n / 100n;
-          const fundTx = await this._signer.sendTransaction({
-            to: sender,
-            value: topUpWithBuffer
-          });
-          await fundTx.wait();
-          this._refreshSigner();
-        }
-        const userOp = {
-          sender,
-          nonce,
-          initCode: "0x",
-          callData,
-          accountGasLimits,
-          preVerificationGas,
-          gasFees,
-          paymasterAndData: "0x",
-          signature: "0x"
-          // placeholder — replaced after signing
-        };
-        const userOpHash = await this.entryPoint.getUserOpHash(userOp);
-        const signature = await this._signer.signMessage(import_ethers.ethers.getBytes(userOpHash));
-        userOp.signature = signature;
-        const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
-        const receipt = await tx.wait();
-        this._refreshSigner();
-        const epIface = new import_ethers.ethers.Interface(ENTRYPOINT_V07_ABI);
-        for (const log of receipt.logs) {
-          try {
-            const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
-            if (parsed?.name === "UserOperationEvent" && !parsed.args.success) {
-              let revertMsg = "UserOp inner execution reverted";
-              for (const rLog of receipt.logs) {
-                try {
-                  const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
-                  if (rParsed?.name === "UserOperationRevertReason") {
-                    const reason = rParsed.args.revertReason;
-                    try {
-                      if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
-                        const decoded = import_ethers.ethers.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
-                        revertMsg = `UserOp reverted: ${decoded[0]}`;
-                      } else {
-                        revertMsg = `UserOp reverted with data: ${reason}`;
-                      }
-                    } catch {
-                      revertMsg = `UserOp reverted with data: ${reason}`;
-                    }
-                    break;
-                  }
-                } catch {
-                  continue;
-                }
-              }
-              throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+      async repayAndWithdraw(tokenSymbol, loanTokenSymbol, toEoa = true) {
+        const acctAddr = await this.getAccountAddress();
+        const morphoAddr = this.config.contracts.morphoBlue;
+        let params;
+        let colSymbol;
+        if (tokenSymbol) {
+          params = await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
+          colSymbol = tokenSymbol;
+        } else {
+          const active = await this._findActiveMarket();
+          params = active.params;
+          colSymbol = active.symbol;
+        }
+        const colInfo = await this._resolveToken(colSymbol);
+        const dest = toEoa ? await this.getSignerAddress() : acctAddr;
+        const marketId = import_ethers2.ethers.keccak256(import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
+          ["address", "address", "address", "address", "uint256"],
+          [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+        ));
+        const pos = await this.morphoBlue.position(marketId, acctAddr);
+        const borrowShares = BigInt(pos.borrowShares);
+        const collateralAmount = BigInt(pos.collateral);
+        if (collateralAmount === 0n) {
+          throw new AgetherError("No collateral to withdraw", "NO_COLLATERAL");
+        }
+        const targets = [];
+        const values = [];
+        const datas = [];
+        if (borrowShares > 0n) {
+          const onChainMkt = await this.morphoBlue.market(marketId);
+          const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
+          const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
+          const estimatedDebt = totalBorrowShares > 0n ? borrowShares * totalBorrowAssets / totalBorrowShares + 100n : 0n;
+          const loanContract = new import_ethers2.Contract(params.loanToken, ERC20_ABI, this._signer);
+          const acctBalance = await loanContract.balanceOf(acctAddr);
+          if (acctBalance < estimatedDebt) {
+            const shortfall = estimatedDebt - acctBalance;
+            const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
+            if (eoaBalance >= shortfall) {
+              const transferTx = await loanContract.transfer(acctAddr, shortfall);
+              await transferTx.wait();
+              this._refreshSigner();
             }
-          } catch (e) {
-            if (e instanceof AgetherError) throw e;
-            continue;
           }
+          targets.push(params.loanToken);
+          values.push(0n);
+          datas.push(erc20Iface.encodeFunctionData("approve", [morphoAddr, estimatedDebt]));
+          targets.push(morphoAddr);
+          values.push(0n);
+          datas.push(morphoIface.encodeFunctionData("repay", [
+            this._toTuple(params),
+            0n,
+            borrowShares,
+            acctAddr,
+            "0x"
+          ]));
         }
-        return receipt;
-      }
-      /**
-       * Execute a single call via Safe7579 account (ERC-7579 single mode)
-       * through an ERC-4337 UserOperation.
-       */
-      async exec(target, data, value = 0n) {
-        const valueHex = import_ethers.ethers.zeroPadValue(import_ethers.ethers.toBeHex(value), 32);
-        const executionCalldata = import_ethers.ethers.concat([target, valueHex, data]);
-        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
-        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE, executionCalldata]);
-        return this._submitUserOp(callData);
-      }
-      /**
-       * Execute multiple calls via Safe7579 account (ERC-7579 batch mode)
-       * through an ERC-4337 UserOperation.
-       */
-      async batch(targets, values, datas) {
-        const executions = targets.map((t, i) => [t, values[i], datas[i]]);
-        const executionCalldata = import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
-          ["(address,uint256,bytes)[]"],
-          [executions]
-        );
-        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
-        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_BATCH, executionCalldata]);
-        return this._submitUserOp(callData);
+        targets.push(morphoAddr);
+        values.push(0n);
+        datas.push(morphoIface.encodeFunctionData("withdrawCollateral", [
+          this._toTuple(params),
+          collateralAmount,
+          acctAddr,
+          dest
+        ]));
+        const receipt = await this.executeBatch(targets, values, datas);
+        return {
+          tx: receipt.hash,
+          repaid: borrowShares > 0n ? "all" : "0",
+          withdrawn: import_ethers2.ethers.formatUnits(collateralAmount, colInfo.decimals),
+          collateralToken: colSymbol,
+          loanToken: this._tokenCache.get(params.loanToken.toLowerCase())?.symbol ?? "unknown"
+        };
       }
       /** Convert MorphoMarketParams to Solidity tuple. */
       _toTuple(p) {
@@ -2242,7 +2387,7 @@ var init_MorphoClient = __esm({
         }
         const markets = await this.getMarkets();
         for (const m of markets) {
-          if (!m.collateralAsset || m.collateralAsset.address === import_ethers.ethers.ZeroAddress) continue;
+          if (!m.collateralAsset || m.collateralAsset.address === import_ethers2.ethers.ZeroAddress) continue;
           try {
             const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
             if (pos.collateral > 0n) {
@@ -2310,7 +2455,7 @@ var init_MorphoClient = __esm({
         }
         const markets = await this.getMarkets();
         for (const m of markets) {
-          if (!m.collateralAsset || m.collateralAsset.address === import_ethers.ethers.ZeroAddress) continue;
+          if (!m.collateralAsset || m.collateralAsset.address === import_ethers2.ethers.ZeroAddress) continue;
           try {
             const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
             if (BigInt(pos.supplyShares) > 0n) {
@@ -2471,17 +2616,17 @@ var AgetherClient_exports = {};
 __export(AgetherClient_exports, {
   AgetherClient: () => AgetherClient
 });
-var import_ethers2, import_axios2, MODE_SINGLE2, erc20Iface2, MORPHO_API_URL2, KNOWN_TOKENS, AgetherClient;
+var import_ethers3, import_axios2, MODE_SINGLE2, erc20Iface2, MORPHO_API_URL2, KNOWN_TOKENS, AgetherClient;
 var init_AgetherClient = __esm({
   "src/clients/AgetherClient.ts"() {
     "use strict";
-    import_ethers2 = require("ethers");
+    import_ethers3 = require("ethers");
     import_axios2 = __toESM(require("axios"));
     init_types();
     init_abis();
     init_config();
     MODE_SINGLE2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-    erc20Iface2 = new import_ethers2.ethers.Interface(ERC20_ABI);
+    erc20Iface2 = new import_ethers3.ethers.Interface(ERC20_ABI);
     MORPHO_API_URL2 = "https://api.morpho.org/graphql";
     KNOWN_TOKENS = {
       [8453 /* Base */]: {
@@ -2524,11 +2669,11 @@ var init_AgetherClient = __esm({
           this._eoaAddress = options.signer.address;
         }
         const c = options.config.contracts;
-        this.agether4337Factory = new import_ethers2.Contract(c.agether4337Factory, AGETHER_4337_FACTORY_ABI, options.signer);
-        this.identityRegistry = new import_ethers2.Contract(c.identityRegistry, IDENTITY_REGISTRY_ABI, options.signer);
-        this.agether8004Scorer = new import_ethers2.Contract(c.agether8004Scorer, AGETHER_8004_SCORER_ABI, provider);
-        this.validationModule = new import_ethers2.Contract(c.erc8004ValidationModule, AGETHER_8004_VALIDATION_MODULE_ABI, provider);
-        this.entryPoint = new import_ethers2.Contract(c.entryPoint, ENTRYPOINT_V07_ABI, options.signer);
+        this.agether4337Factory = new import_ethers3.Contract(c.agether4337Factory, AGETHER_4337_FACTORY_ABI, options.signer);
+        this.identityRegistry = new import_ethers3.Contract(c.identityRegistry, IDENTITY_REGISTRY_ABI, options.signer);
+        this.agether8004Scorer = new import_ethers3.Contract(c.agether8004Scorer, AGETHER_8004_SCORER_ABI, provider);
+        this.validationModule = new import_ethers3.Contract(c.erc8004ValidationModule, AGETHER_8004_VALIDATION_MODULE_ABI, provider);
+        this.entryPoint = new import_ethers3.Contract(c.entryPoint, ENTRYPOINT_V07_ABI, options.signer);
       }
       static fromPrivateKey(privateKey, agentIdOrChain, chainIdOrConfig) {
         let agentId;
@@ -2539,8 +2684,8 @@ var init_AgetherClient = __esm({
         } else {
           config = typeof agentIdOrChain === "number" ? getDefaultConfig(agentIdOrChain) : agentIdOrChain;
         }
-        const provider = new import_ethers2.ethers.JsonRpcProvider(config.rpcUrl);
-        const signer = new import_ethers2.ethers.Wallet(privateKey, provider);
+        const provider = new import_ethers3.ethers.JsonRpcProvider(config.rpcUrl);
+        const signer = new import_ethers3.ethers.Wallet(privateKey, provider);
         return new _AgetherClient({ config, signer, agentId, _privateKey: privateKey });
       }
       static async fromSigner(signer, agentIdOrChain, chainIdOrConfig) {
@@ -2713,7 +2858,7 @@ var init_AgetherClient = __esm({
         if (this.accountAddress) return this.accountAddress;
         const id = this._requireAgentId();
         const addr = await this.agether4337Factory.getAccount(id);
-        if (addr === import_ethers2.ethers.ZeroAddress) {
+        if (addr === import_ethers3.ethers.ZeroAddress) {
           throw new AgetherError(
             "No account found. Create one with createAccount() or register().",
             "NO_ACCOUNT"
@@ -2790,7 +2935,7 @@ var init_AgetherClient = __esm({
       async getBalances() {
         const provider = this.signer.provider;
         const eoaAddr = await this._getSignerAddress();
-        const usdc = new import_ethers2.Contract(this.config.contracts.usdc, ERC20_ABI, provider);
+        const usdc = new import_ethers3.Contract(this.config.contracts.usdc, ERC20_ABI, provider);
         const ethBal = await provider.getBalance(eoaAddr);
         const usdcBal = await usdc.balanceOf(eoaAddr);
         const knownTokens = {
@@ -2808,9 +2953,9 @@ var init_AgetherClient = __esm({
         const eoaCollateral = {};
         for (const [symbol, info] of Object.entries(knownTokens)) {
           try {
-            const token = new import_ethers2.Contract(info.address, ERC20_ABI, provider);
+            const token = new import_ethers3.Contract(info.address, ERC20_ABI, provider);
             const bal = await token.balanceOf(eoaAddr);
-            eoaCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+            eoaCollateral[symbol] = import_ethers3.ethers.formatUnits(bal, info.decimals);
           } catch (e) {
             console.warn(`[agether] EOA collateral fetch failed for ${symbol}:`, e instanceof Error ? e.message : e);
             eoaCollateral[symbol] = "0";
@@ -2819,8 +2964,8 @@ var init_AgetherClient = __esm({
         const result = {
           agentId: this.agentId !== void 0 ? this.agentId.toString() : "?",
           address: eoaAddr,
-          eth: import_ethers2.ethers.formatEther(ethBal),
-          usdc: import_ethers2.ethers.formatUnits(usdcBal, 6),
+          eth: import_ethers3.ethers.formatEther(ethBal),
+          usdc: import_ethers3.ethers.formatUnits(usdcBal, 6),
           collateral: eoaCollateral
         };
         try {
@@ -2830,9 +2975,9 @@ var init_AgetherClient = __esm({
           const acctCollateral = {};
           for (const [symbol, info] of Object.entries(knownTokens)) {
             try {
-              const token = new import_ethers2.Contract(info.address, ERC20_ABI, provider);
+              const token = new import_ethers3.Contract(info.address, ERC20_ABI, provider);
               const bal = await token.balanceOf(acctAddr);
-              acctCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+              acctCollateral[symbol] = import_ethers3.ethers.formatUnits(bal, info.decimals);
             } catch (e) {
               console.warn(`[agether] Account collateral fetch failed for ${symbol}:`, e instanceof Error ? e.message : e);
               acctCollateral[symbol] = "0";
@@ -2840,8 +2985,8 @@ var init_AgetherClient = __esm({
           }
           result.agentAccount = {
             address: acctAddr,
-            eth: import_ethers2.ethers.formatEther(acctEth),
-            usdc: import_ethers2.ethers.formatUnits(acctUsdc, 6),
+            eth: import_ethers3.ethers.formatEther(acctEth),
+            usdc: import_ethers3.ethers.formatUnits(acctUsdc, 6),
             collateral: acctCollateral
           };
         } catch (e) {
@@ -2866,7 +3011,7 @@ var init_AgetherClient = __esm({
         const acctAddr = await this.getAccountAddress();
         const eoaAddr = await this._getSignerAddress();
         const tokenInfo = await this._resolveToken(tokenSymbol);
-        const tokenContract = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.signer.provider);
+        const tokenContract = new import_ethers3.Contract(tokenInfo.address, ERC20_ABI, this.signer.provider);
         let weiAmount;
         if (amount === "all") {
           weiAmount = await tokenContract.balanceOf(acctAddr);
@@ -2874,11 +3019,11 @@ var init_AgetherClient = __esm({
             throw new AgetherError(`No ${tokenInfo.symbol} in Safe account`, "INSUFFICIENT_BALANCE");
           }
         } else {
-          weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
+          weiAmount = import_ethers3.ethers.parseUnits(amount, tokenInfo.decimals);
         }
         const data = erc20Iface2.encodeFunctionData("transfer", [eoaAddr, weiAmount]);
         const receipt = await this._exec(tokenInfo.address, data);
-        const actualAmount = amount === "all" ? import_ethers2.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
+        const actualAmount = amount === "all" ? import_ethers3.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
         return { tx: receipt.hash, token: tokenInfo.symbol, amount: actualAmount, destination: eoaAddr };
       }
       /**
@@ -2895,10 +3040,10 @@ var init_AgetherClient = __esm({
           weiAmount = await this.signer.provider.getBalance(acctAddr);
           if (weiAmount === 0n) throw new AgetherError("No ETH in Safe account", "INSUFFICIENT_BALANCE");
         } else {
-          weiAmount = import_ethers2.ethers.parseEther(amount);
+          weiAmount = import_ethers3.ethers.parseEther(amount);
         }
         const receipt = await this._exec(eoaAddr, "0x", weiAmount);
-        const actualAmount = amount === "all" ? import_ethers2.ethers.formatEther(weiAmount) : amount;
+        const actualAmount = amount === "all" ? import_ethers3.ethers.formatEther(weiAmount) : amount;
         return { tx: receipt.hash, token: "ETH", amount: actualAmount, destination: eoaAddr };
       }
       // ════════════════════════════════════════════════════════
@@ -2914,12 +3059,12 @@ var init_AgetherClient = __esm({
       async fundAccountToken(tokenSymbol, amount) {
         const acctAddr = await this.getAccountAddress();
         const tokenInfo = await this._resolveToken(tokenSymbol);
-        const tokenContract = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.signer);
-        const weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
+        const tokenContract = new import_ethers3.Contract(tokenInfo.address, ERC20_ABI, this.signer);
+        const weiAmount = import_ethers3.ethers.parseUnits(amount, tokenInfo.decimals);
         const eoaBalance = await tokenContract.balanceOf(await this._getSignerAddress());
         if (eoaBalance < weiAmount) {
           throw new AgetherError(
-            `Insufficient ${tokenInfo.symbol}. EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, tokenInfo.decimals)}, need ${amount}.`,
+            `Insufficient ${tokenInfo.symbol}. EOA has ${import_ethers3.ethers.formatUnits(eoaBalance, tokenInfo.decimals)}, need ${amount}.`,
             "INSUFFICIENT_BALANCE"
           );
         }
@@ -2944,13 +3089,13 @@ var init_AgetherClient = __esm({
       async transferToken(tokenSymbol, amount, to) {
         const acctAddr = await this.getAccountAddress();
         const tokenInfo = await this._resolveToken(tokenSymbol);
-        const tokenContract = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.signer.provider);
+        const tokenContract = new import_ethers3.Contract(tokenInfo.address, ERC20_ABI, this.signer.provider);
         let toAddr;
         if (to.address) {
           toAddr = to.address;
         } else if (to.agentId) {
           toAddr = await this.agether4337Factory.getAccount(BigInt(to.agentId));
-          if (toAddr === import_ethers2.ethers.ZeroAddress) {
+          if (toAddr === import_ethers3.ethers.ZeroAddress) {
             throw new AgetherError(`Agent ${to.agentId} has no account`, "NO_ACCOUNT");
           }
         } else {
@@ -2963,11 +3108,11 @@ var init_AgetherClient = __esm({
             throw new AgetherError(`No ${tokenInfo.symbol} in AgentAccount`, "INSUFFICIENT_BALANCE");
           }
         } else {
-          weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
+          weiAmount = import_ethers3.ethers.parseUnits(amount, tokenInfo.decimals);
         }
         const data = erc20Iface2.encodeFunctionData("transfer", [toAddr, weiAmount]);
         const receipt = await this._exec(tokenInfo.address, data);
-        const actualAmount = amount === "all" ? import_ethers2.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
+        const actualAmount = amount === "all" ? import_ethers3.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
         return { tx: receipt.hash, token: tokenInfo.symbol, amount: actualAmount, destination: toAddr };
       }
       /**
@@ -2984,7 +3129,7 @@ var init_AgetherClient = __esm({
           toAddr = to.address;
         } else if (to.agentId) {
           toAddr = await this.agether4337Factory.getAccount(BigInt(to.agentId));
-          if (toAddr === import_ethers2.ethers.ZeroAddress) {
+          if (toAddr === import_ethers3.ethers.ZeroAddress) {
             throw new AgetherError(`Agent ${to.agentId} has no account`, "NO_ACCOUNT");
           }
         } else {
@@ -2995,10 +3140,10 @@ var init_AgetherClient = __esm({
           weiAmount = await this.signer.provider.getBalance(acctAddr);
           if (weiAmount === 0n) throw new AgetherError("No ETH in AgentAccount", "INSUFFICIENT_BALANCE");
         } else {
-          weiAmount = import_ethers2.ethers.parseEther(amount);
+          weiAmount = import_ethers3.ethers.parseEther(amount);
         }
         const receipt = await this._exec(toAddr, "0x", weiAmount);
-        const actualAmount = amount === "all" ? import_ethers2.ethers.formatEther(weiAmount) : amount;
+        const actualAmount = amount === "all" ? import_ethers3.ethers.formatEther(weiAmount) : amount;
         return { tx: receipt.hash, token: "ETH", amount: actualAmount, destination: toAddr };
       }
       /**
@@ -3016,7 +3161,7 @@ var init_AgetherClient = __esm({
           spenderAddr = spender.address;
         } else if (spender.agentId) {
           spenderAddr = await this.agether4337Factory.getAccount(BigInt(spender.agentId));
-          if (spenderAddr === import_ethers2.ethers.ZeroAddress) {
+          if (spenderAddr === import_ethers3.ethers.ZeroAddress) {
             throw new AgetherError(`Agent ${spender.agentId} has no account`, "NO_ACCOUNT");
           }
         } else {
@@ -3024,9 +3169,9 @@ var init_AgetherClient = __esm({
         }
         let weiAmount;
         if (amount === "max") {
-          weiAmount = import_ethers2.ethers.MaxUint256;
+          weiAmount = import_ethers3.ethers.MaxUint256;
         } else {
-          weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
+          weiAmount = import_ethers3.ethers.parseUnits(amount, tokenInfo.decimals);
         }
         const data = erc20Iface2.encodeFunctionData("approve", [spenderAddr, weiAmount]);
         const receipt = await this._exec(tokenInfo.address, data);
@@ -3051,14 +3196,14 @@ var init_AgetherClient = __esm({
           targetAddr = target.address;
         } else if (target.agentId) {
           targetAddr = await this.agether4337Factory.getAccount(BigInt(target.agentId));
-          if (targetAddr === import_ethers2.ethers.ZeroAddress) {
+          if (targetAddr === import_ethers3.ethers.ZeroAddress) {
             throw new AgetherError("Target agent has no account", "NO_ACCOUNT");
           }
         } else {
           throw new AgetherError("Provide agentId or address", "INVALID_TARGET");
         }
-        const weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
-        const tokenContract = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.signer);
+        const weiAmount = import_ethers3.ethers.parseUnits(amount, tokenInfo.decimals);
+        const tokenContract = new import_ethers3.Contract(tokenInfo.address, ERC20_ABI, this.signer);
         const tx = await tokenContract.transfer(targetAddr, weiAmount);
         const receipt = await tx.wait();
         this._refreshSigner();
@@ -3074,7 +3219,7 @@ var init_AgetherClient = __esm({
       async isKyaRequired() {
         try {
           const registryAddr = await this.validationModule.validationRegistry();
-          return registryAddr !== import_ethers2.ethers.ZeroAddress;
+          return registryAddr !== import_ethers3.ethers.ZeroAddress;
         } catch {
           return false;
         }
@@ -3174,7 +3319,7 @@ var init_AgetherClient = __esm({
         if (cached) return cached;
         if (symbolOrAddress.startsWith("0x") && symbolOrAddress.length === 42) {
           try {
-            const token = new import_ethers2.Contract(
+            const token = new import_ethers3.Contract(
               symbolOrAddress,
               ["function decimals() view returns (uint8)", "function symbol() view returns (string)"],
               this.signer.provider
@@ -3249,17 +3394,17 @@ var init_AgetherClient = __esm({
        */
       _refreshSigner() {
         if (!this._useExternalSigner && this._privateKey) {
-          const provider = new import_ethers2.ethers.JsonRpcProvider(this._rpcUrl);
-          const wallet = new import_ethers2.ethers.Wallet(this._privateKey, provider);
+          const provider = new import_ethers3.ethers.JsonRpcProvider(this._rpcUrl);
+          const wallet = new import_ethers3.ethers.Wallet(this._privateKey, provider);
           this.signer = wallet;
           this._eoaAddress = wallet.address;
         }
         const c = this.config.contracts;
-        this.agether4337Factory = new import_ethers2.Contract(c.agether4337Factory, AGETHER_4337_FACTORY_ABI, this.signer);
-        this.identityRegistry = new import_ethers2.Contract(c.identityRegistry, IDENTITY_REGISTRY_ABI, this.signer);
-        this.agether8004Scorer = new import_ethers2.Contract(c.agether8004Scorer, AGETHER_8004_SCORER_ABI, this.signer.provider);
-        this.validationModule = new import_ethers2.Contract(c.erc8004ValidationModule, AGETHER_8004_VALIDATION_MODULE_ABI, this.signer.provider);
-        this.entryPoint = new import_ethers2.Contract(c.entryPoint, ENTRYPOINT_V07_ABI, this.signer);
+        this.agether4337Factory = new import_ethers3.Contract(c.agether4337Factory, AGETHER_4337_FACTORY_ABI, this.signer);
+        this.identityRegistry = new import_ethers3.Contract(c.identityRegistry, IDENTITY_REGISTRY_ABI, this.signer);
+        this.agether8004Scorer = new import_ethers3.Contract(c.agether8004Scorer, AGETHER_8004_SCORER_ABI, this.signer.provider);
+        this.validationModule = new import_ethers3.Contract(c.erc8004ValidationModule, AGETHER_8004_VALIDATION_MODULE_ABI, this.signer.provider);
+        this.entryPoint = new import_ethers3.Contract(c.entryPoint, ENTRYPOINT_V07_ABI, this.signer);
       }
       // ────────────────────────────────────────────────────────
       //  ERC-4337 UserOp helpers (Safe + Safe7579 + EntryPoint v0.7)
@@ -3269,7 +3414,7 @@ var init_AgetherClient = __esm({
        *   bytes32 = (hi << 128) | lo
        */
       _packUint128(hi, lo) {
-        return import_ethers2.ethers.zeroPadValue(import_ethers2.ethers.toBeHex(hi << 128n | lo), 32);
+        return import_ethers3.ethers.zeroPadValue(import_ethers3.ethers.toBeHex(hi << 128n | lo), 32);
       }
       /**
        * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
@@ -3281,8 +3426,8 @@ var init_AgetherClient = __esm({
         const nonceKey = BigInt(validatorAddr) << 32n;
         const nonce = await this.entryPoint.getNonce(sender, nonceKey);
         const feeData = await this.signer.provider.getFeeData();
-        const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers2.ethers.parseUnits("0.5", "gwei");
-        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers2.ethers.parseUnits("0.1", "gwei");
+        const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers3.ethers.parseUnits("0.5", "gwei");
+        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers3.ethers.parseUnits("0.1", "gwei");
         const verificationGasLimit = 500000n;
         const callGasLimit = 800000n;
         const preVerificationGas = 100000n;
@@ -3312,12 +3457,12 @@ var init_AgetherClient = __esm({
           signature: "0x"
         };
         const userOpHash = await this.entryPoint.getUserOpHash(userOp);
-        const signature = await this.signer.signMessage(import_ethers2.ethers.getBytes(userOpHash));
+        const signature = await this.signer.signMessage(import_ethers3.ethers.getBytes(userOpHash));
         userOp.signature = signature;
         const tx = await this.entryPoint.handleOps([userOp], eoaAddr);
         const receipt = await tx.wait();
         this._refreshSigner();
-        const epIface = new import_ethers2.ethers.Interface(ENTRYPOINT_V07_ABI);
+        const epIface = new import_ethers3.ethers.Interface(ENTRYPOINT_V07_ABI);
         for (const log of receipt.logs) {
           try {
             const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
@@ -3330,7 +3475,7 @@ var init_AgetherClient = __esm({
                     const reason = rParsed.args.revertReason;
                     try {
                       if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
-                        const decoded = import_ethers2.ethers.AbiCoder.defaultAbiCoder().decode(
+                        const decoded = import_ethers3.ethers.AbiCoder.defaultAbiCoder().decode(
                           ["string"],
                           "0x" + reason.slice(10)
                         );
@@ -3361,9 +3506,9 @@ var init_AgetherClient = __esm({
        * through an ERC-4337 UserOperation.
        */
       async _exec(target, data, value = 0n) {
-        const valueHex = import_ethers2.ethers.zeroPadValue(import_ethers2.ethers.toBeHex(value), 32);
-        const executionCalldata = import_ethers2.ethers.concat([target, valueHex, data]);
-        const safe7579Iface = new import_ethers2.ethers.Interface(SAFE7579_ACCOUNT_ABI);
+        const valueHex = import_ethers3.ethers.zeroPadValue(import_ethers3.ethers.toBeHex(value), 32);
+        const executionCalldata = import_ethers3.ethers.concat([target, valueHex, data]);
+        const safe7579Iface = new import_ethers3.ethers.Interface(SAFE7579_ACCOUNT_ABI);
         const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE2, executionCalldata]);
         return this._submitUserOp(callData);
       }
@@ -3737,7 +3882,7 @@ var init_X402Client = __esm({
 });
 
 // src/cli.ts
-var import_ethers3 = require("ethers");
+var import_ethers4 = require("ethers");
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var os = __toESM(require("os"));
@@ -3862,7 +4007,7 @@ async function cmdInit(privateKey, agentId, chain) {
   const rpcUrl = process.env.AGETHER_RPC_URL || CHAIN_RPC[chainId] || DEFAULT_RPC;
   let wallet;
   try {
-    wallet = new import_ethers3.ethers.Wallet(privateKey);
+    wallet = new import_ethers4.ethers.Wallet(privateKey);
   } catch {
     console.error("\u274C Invalid private key");
     process.exit(1);
@@ -3879,8 +4024,8 @@ async function cmdInit(privateKey, agentId, chain) {
 }
 async function cmdRegister(name) {
   const config = requireConfig();
-  const provider = new import_ethers3.ethers.JsonRpcProvider(config.rpcUrl);
-  const signer = new import_ethers3.ethers.Wallet(config.privateKey, provider);
+  const provider = new import_ethers4.ethers.JsonRpcProvider(config.rpcUrl);
+  const signer = new import_ethers4.ethers.Wallet(config.privateKey, provider);
   const agentName = name || `Agent-${signer.address.slice(0, 8)}`;
   console.log(`\u{1F916} Registering agent: ${agentName}
 `);
@@ -3903,7 +4048,7 @@ async function cmdRegister(name) {
     process.exit(1);
   }
   console.log("  [2/4] Registering on ERC-8004 IdentityRegistry...");
-  const agentRegistry = new import_ethers3.ethers.Contract(registryAddr, ERC8004_ABI, signer);
+  const agentRegistry = new import_ethers4.ethers.Contract(registryAddr, ERC8004_ABI, signer);
   let agentId;
   if (config.agentId && config.agentId !== "0") {
     agentId = BigInt(config.agentId);
@@ -3934,7 +4079,7 @@ async function cmdRegister(name) {
       const agentURI = `data:application/json;base64,${Buffer.from(registrationFile).toString("base64")}`;
       const tx = await agentRegistry["register(string)"](agentURI);
       const receipt = await waitForTx(tx);
-      const transferTopic = import_ethers3.ethers.id("Transfer(address,address,uint256)");
+      const transferTopic = import_ethers4.ethers.id("Transfer(address,address,uint256)");
       const transferLog = receipt.logs.find((log) => log.topics[0] === transferTopic);
       if (transferLog && transferLog.topics.length >= 4) {
         agentId = BigInt(transferLog.topics[3]);
@@ -3967,11 +4112,11 @@ async function cmdRegister(name) {
   if (chainId === 31337 || chainId === 1) {
     console.log("  [3/4] Minting test USDC (Hardhat fork)...");
     const deployerPk = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80";
-    const deployer = new import_ethers3.ethers.Wallet(deployerPk, provider);
+    const deployer = new import_ethers4.ethers.Wallet(deployerPk, provider);
     const usdcAddr = contracts.usdc;
     if (usdcAddr) {
       try {
-        const usdc = new import_ethers3.ethers.Contract(usdcAddr, MOCK_ERC20_ABI, deployer);
+        const usdc = new import_ethers4.ethers.Contract(usdcAddr, MOCK_ERC20_ABI, deployer);
         const tx = await usdc.mint(signer.address, BigInt(5e10));
         await waitForTx(tx);
         console.log("        \u2713 Minted $50,000 USDC");
@@ -3984,7 +4129,7 @@ async function cmdRegister(name) {
   }
   console.log("  [4/4] Creating Safe account...");
   if (factoryAddr) {
-    const factory = new import_ethers3.ethers.Contract(factoryAddr, ACCOUNT_FACTORY_ABI2, signer);
+    const factory = new import_ethers4.ethers.Contract(factoryAddr, ACCOUNT_FACTORY_ABI2, signer);
     try {
       const exists = await factory.accountExists(agentId);
       if (exists) {
@@ -4002,7 +4147,7 @@ async function cmdRegister(name) {
     }
   }
   if (validationAddr) {
-    const vr = new import_ethers3.ethers.Contract(validationAddr, VALIDATION_REGISTRY_ABI, provider);
+    const vr = new import_ethers4.ethers.Contract(validationAddr, VALIDATION_REGISTRY_ABI, provider);
     try {
       const approved = await vr.isAgentCodeApproved(agentId);
       console.log(`
@@ -4223,7 +4368,7 @@ async function cmdX402Call(url, method = "GET", body) {
   const config = requireConfig();
   console.log("\n\u{1F510} x402 Paid API Call\n");
   const x402 = await getX402Client(config);
-  console.log(`   Wallet: ${new import_ethers3.ethers.Wallet(config.privateKey).address}`);
+  console.log(`   Wallet: ${new import_ethers4.ethers.Wallet(config.privateKey).address}`);
   console.log(`
 \u{1F4E1} ${method} ${url}`);
   if (body) console.log(`\u{1F4E6} Body: ${body}`);