@agether/sdk 2.12.2 → 2.14.0

package/dist/cli.js

@@ -290,8 +290,9 @@ var init_MorphoClient = __esm({
     erc20Iface = new import_ethers.ethers.Interface(ERC20_ABI);
     MorphoClient = class {
       constructor(config) {
+        /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
         this._marketCache = /* @__PURE__ */ new Map();
-        /** Dynamic token registry: symbol (uppercase) → { address, symbol, decimals } */
+        /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
         this._tokenCache = /* @__PURE__ */ new Map();
         this._discoveredAt = 0;
         if (!config.agentId) {
@@ -394,21 +395,23 @@ var init_MorphoClient = __esm({
       //  Market Discovery (Morpho GraphQL API)
       // ════════════════════════════════════════════════════════
       /**
-       * Fetch USDC borrow markets on Base from Morpho API.
-       * Caches results for 5 minutes.
+       * Fetch available markets on the current chain from Morpho API.
+       * Caches results for 5 minutes. Supports all loan tokens (not just USDC).
+       *
+       * @param forceRefresh - bypass cache TTL
+       * @param filter - optional filter by loan token and/or collateral token
        */
-      async getMarkets(forceRefresh = false) {
+      async getMarkets(forceRefresh = false, filter) {
         if (!forceRefresh && this._discoveredMarkets && Date.now() - this._discoveredAt < 3e5) {
-          return this._discoveredMarkets;
+          return filter ? this._applyMarketFilter(this._discoveredMarkets, filter) : this._discoveredMarkets;
         }
         const chainId = this.config.chainId;
-        const usdcAddr = this.config.contracts.usdc.toLowerCase();
         const query = `{
       markets(
-        first: 50
+        first: 500
         orderBy: SupplyAssetsUsd
         orderDirection: Desc
-        where: { chainId_in: [${chainId}], loanAssetAddress_in: ["${usdcAddr}"] }
+        where: { chainId_in: [${chainId}] }
       ) {
         items {
           uniqueKey
@@ -441,14 +444,14 @@ var init_MorphoClient = __esm({
           }));
           this._discoveredAt = Date.now();
           for (const mi of this._discoveredMarkets) {
+            this._marketCache.set(mi.uniqueKey.toLowerCase(), {
+              loanToken: mi.loanAsset.address,
+              collateralToken: mi.collateralAsset.address,
+              oracle: mi.oracle,
+              irm: mi.irm,
+              lltv: mi.lltv
+            });
             if (mi.collateralAsset.address !== import_ethers.ethers.ZeroAddress) {
-              this._marketCache.set(mi.collateralAsset.address.toLowerCase(), {
-                loanToken: mi.loanAsset.address,
-                collateralToken: mi.collateralAsset.address,
-                oracle: mi.oracle,
-                irm: mi.irm,
-                lltv: mi.lltv
-              });
               this._tokenCache.set(mi.collateralAsset.symbol.toUpperCase(), {
                 address: mi.collateralAsset.address,
                 symbol: mi.collateralAsset.symbol,
@@ -473,17 +476,24 @@ var init_MorphoClient = __esm({
               });
             }
           }
-          return this._discoveredMarkets;
+          return filter ? this._applyMarketFilter(this._discoveredMarkets, filter) : this._discoveredMarkets;
         } catch (e) {
           console.warn("[agether] getMarkets failed, using cache:", e instanceof Error ? e.message : e);
-          return this._discoveredMarkets ?? [];
+          const cached = this._discoveredMarkets ?? [];
+          return filter ? this._applyMarketFilter(cached, filter) : cached;
         }
       }
       /**
-       * Get MarketParams for a collateral token.
-       * Tries cache → API → onchain idToMarketParams.
+       * Get MarketParams for a collateral token (and optionally a specific loan token).
+       * Tries cache → API discovery.
+       *
+       * When `loanTokenSymbolOrAddress` is omitted, returns the most liquid market
+       * for that collateral (sorted by supply, typically the USDC market).
+       *
+       * @param collateralSymbolOrAddress - e.g. 'WETH', 'wstETH', or '0x4200...'
+       * @param loanTokenSymbolOrAddress - e.g. 'USDC', 'WETH', or '0x833589...' (optional)
        */
-      async findMarketForCollateral(collateralSymbolOrAddress) {
+      async findMarketForCollateral(collateralSymbolOrAddress, loanTokenSymbolOrAddress) {
         let colAddr;
         if (collateralSymbolOrAddress.startsWith("0x")) {
           colAddr = collateralSymbolOrAddress.toLowerCase();
@@ -495,13 +505,41 @@ var init_MorphoClient = __esm({
             colAddr = collateralSymbolOrAddress.toLowerCase();
           }
         }
-        const cached = this._marketCache.get(colAddr);
-        if (cached) return cached;
-        await this.getMarkets();
-        const fromApi = this._marketCache.get(colAddr);
-        if (fromApi) return fromApi;
+        let loanAddr;
+        if (loanTokenSymbolOrAddress) {
+          if (loanTokenSymbolOrAddress.startsWith("0x")) {
+            loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+          } else {
+            try {
+              const resolved = await this._resolveToken(loanTokenSymbolOrAddress);
+              loanAddr = resolved.address.toLowerCase();
+            } catch {
+              loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+            }
+          }
+        }
+        if (!this._discoveredMarkets) await this.getMarkets();
+        for (const m of this._discoveredMarkets ?? []) {
+          if (m.collateralAsset.address.toLowerCase() !== colAddr) continue;
+          if (loanAddr && m.loanAsset.address.toLowerCase() !== loanAddr) continue;
+          return {
+            loanToken: m.loanAsset.address,
+            collateralToken: m.collateralAsset.address,
+            oracle: m.oracle,
+            irm: m.irm,
+            lltv: m.lltv
+          };
+        }
+        if (!collateralSymbolOrAddress.startsWith("0x")) {
+          const searched = await this.searchMarkets(collateralSymbolOrAddress, { asCollateral: true });
+          for (const m of searched) {
+            if (loanAddr && m.loanAddress.toLowerCase() !== loanAddr) continue;
+            if (loanTokenSymbolOrAddress && !loanTokenSymbolOrAddress.startsWith("0x") && m.loanToken.toUpperCase() !== loanTokenSymbolOrAddress.toUpperCase()) continue;
+            return this.getMarketParams(m.marketId);
+          }
+        }
         throw new AgetherError(
-          `No Morpho market found for collateral ${collateralSymbolOrAddress}`,
+          `No Morpho market found for collateral ${collateralSymbolOrAddress}` + (loanTokenSymbolOrAddress ? ` with loan token ${loanTokenSymbolOrAddress}` : ""),
           "MARKET_NOT_FOUND"
         );
       }
@@ -536,12 +574,13 @@ var init_MorphoClient = __esm({
         const acctAddr = await this.getAccountAddress();
         const markets = await this.getMarkets();
         const positions = [];
-        let totalDebt = 0n;
+        let totalDebtFloat = 0;
         for (const m of markets) {
           if (!m.collateralAsset || m.collateralAsset.address === import_ethers.ethers.ZeroAddress) continue;
           try {
             const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
             if (pos.collateral === 0n && pos.borrowShares === 0n && pos.supplyShares === 0n) continue;
+            const loanDecimals = m.loanAsset.decimals;
             let debt = 0n;
             if (pos.borrowShares > 0n) {
               try {
@@ -549,7 +588,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;
-                totalDebt += debt;
+                totalDebtFloat += parseFloat(import_ethers.ethers.formatUnits(debt, loanDecimals));
               } catch (e) {
                 console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
               }
@@ -557,10 +596,11 @@ var init_MorphoClient = __esm({
             positions.push({
               marketId: m.uniqueKey,
               collateralToken: m.collateralAsset.symbol,
+              loanToken: m.loanAsset.symbol,
               collateral: import_ethers.ethers.formatUnits(pos.collateral, m.collateralAsset.decimals),
               borrowShares: pos.borrowShares.toString(),
               supplyShares: pos.supplyShares.toString(),
-              debt: import_ethers.ethers.formatUnits(debt, 6)
+              debt: import_ethers.ethers.formatUnits(debt, loanDecimals)
             });
           } catch (e) {
             console.warn(`[agether] position read failed for market:`, e instanceof Error ? e.message : e);
@@ -570,16 +610,28 @@ var init_MorphoClient = __esm({
         return {
           agentId: this.agentId,
           agentAccount: acctAddr,
-          totalDebt: import_ethers.ethers.formatUnits(totalDebt, 6),
+          totalDebt: totalDebtFloat.toFixed(6),
           positions
         };
       }
       // ════════════════════════════════════════════════════════
       //  Balance & Borrowing Capacity
       // ════════════════════════════════════════════════════════
+      /**
+       * Get the balance of any ERC-20 token in the AgentAccount.
+       * @param symbolOrAddress - token symbol (e.g. 'USDC', 'WETH') or address
+       * @returns balance in raw units
+       */
+      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);
+        return token.balanceOf(acctAddr);
+      }
       /**
        * Get the USDC balance of the AgentAccount.
        * @returns USDC balance in raw units (6 decimals)
+       * @deprecated Use `getTokenBalance('USDC')` instead.
        */
       async getUsdcBalance() {
         const acctAddr = await this.getAccountAddress();
@@ -587,7 +639,7 @@ var init_MorphoClient = __esm({
         return usdc.balanceOf(acctAddr);
       }
       /**
-       * Calculate the maximum additional USDC that can be borrowed
+       * Calculate the maximum additional loan token that can be borrowed
        * given the agent's current collateral and debt across all markets.
        *
        * For each market with collateral deposited:
@@ -595,7 +647,7 @@ var init_MorphoClient = __esm({
        *
        * Uses the Morpho oracle to price collateral → loan token.
        *
-       * @returns Maximum additional USDC borrowable (6 decimals)
+       * @returns Maximum additional borrowable per market (raw units in each market's loan token)
        */
       async getMaxBorrowable() {
         const acctAddr = await this.getAccountAddress();
@@ -628,6 +680,8 @@ var init_MorphoClient = __esm({
             totalAdditional += maxAdditional;
             byMarket.push({
               collateralToken: m.collateralAsset.symbol,
+              loanToken: m.loanAsset.symbol,
+              loanDecimals: m.loanAsset.decimals,
               maxAdditional,
               currentDebt,
               collateralValue: collateralValueInLoan
@@ -643,35 +697,50 @@ var init_MorphoClient = __esm({
       //  Market Rates & Yield Estimation
       // ════════════════════════════════════════════════════════
       /**
-       * Fetch current supply/borrow APY for a collateral market from Morpho GraphQL API.
+       * Fetch current supply/borrow APY for markets from Morpho GraphQL API.
        *
        * Note: On Morpho Blue, collateral does NOT earn yield directly. Supply APY
        * is what lenders earn; borrow APY is what borrowers pay.
+       *
+       * @param collateralSymbolOrAddress - filter by collateral token (optional)
+       * @param loanTokenSymbolOrAddress - filter by loan token (optional). Omit for all loan tokens.
        */
-      async getMarketRates(collateralSymbolOrAddress) {
+      async getMarketRates(collateralSymbolOrAddress, loanTokenSymbolOrAddress) {
         const chainId = this.config.chainId;
-        const usdcAddr = this.config.contracts.usdc.toLowerCase();
         let collateralFilter = "";
+        let loanFilter = "";
+        let searchTerm = "";
         if (collateralSymbolOrAddress) {
-          let colAddr;
           if (collateralSymbolOrAddress.startsWith("0x")) {
-            colAddr = collateralSymbolOrAddress.toLowerCase();
+            collateralFilter = `, collateralAssetAddress_in: ["${collateralSymbolOrAddress.toLowerCase()}"]`;
           } else {
-            try {
-              const resolved = await this._resolveToken(collateralSymbolOrAddress);
-              colAddr = resolved.address.toLowerCase();
-            } catch {
-              colAddr = collateralSymbolOrAddress.toLowerCase();
+            const cached = this._tokenCache.get(collateralSymbolOrAddress.toUpperCase());
+            if (cached) {
+              collateralFilter = `, collateralAssetAddress_in: ["${cached.address.toLowerCase()}"]`;
+            } else {
+              searchTerm = collateralSymbolOrAddress;
             }
           }
-          collateralFilter = `, collateralAssetAddress_in: ["${colAddr}"]`;
         }
+        if (loanTokenSymbolOrAddress) {
+          if (loanTokenSymbolOrAddress.startsWith("0x")) {
+            loanFilter = `, loanAssetAddress_in: ["${loanTokenSymbolOrAddress.toLowerCase()}"]`;
+          } else {
+            const cached = this._tokenCache.get(loanTokenSymbolOrAddress.toUpperCase());
+            if (cached) {
+              loanFilter = `, loanAssetAddress_in: ["${cached.address.toLowerCase()}"]`;
+            } else {
+              searchTerm = searchTerm || loanTokenSymbolOrAddress;
+            }
+          }
+        }
+        const searchClause = searchTerm ? `, search: "${searchTerm}"` : "";
         const query = `{
       markets(
-        first: 50
+        first: 100
         orderBy: SupplyAssetsUsd
         orderDirection: Desc
-        where: { chainId_in: [${chainId}], loanAssetAddress_in: ["${usdcAddr}"]${collateralFilter} }
+        where: { chainId_in: [${chainId}]${loanFilter}${collateralFilter}${searchClause} }
       ) {
         items {
           uniqueKey
@@ -690,23 +759,234 @@ var init_MorphoClient = __esm({
     }`;
         try {
           const resp = await import_axios.default.post(MORPHO_API_URL, { query }, { timeout: 1e4 });
-          const items = resp.data?.data?.markets?.items ?? [];
-          return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers.ethers.ZeroAddress).map((m) => ({
-            collateralToken: m.collateralAsset.symbol,
-            loanToken: m.loanAsset.symbol,
-            supplyApy: m.state?.supplyApy ? Number(m.state.supplyApy) : 0,
-            borrowApy: m.state?.borrowApy ? Number(m.state.borrowApy) : 0,
-            utilization: m.state?.utilization ? Number(m.state.utilization) : 0,
-            totalSupplyUsd: m.state?.supplyAssets ? Number(m.state.supplyAssets) / 1e6 : 0,
-            totalBorrowUsd: m.state?.borrowAssets ? Number(m.state.borrowAssets) / 1e6 : 0,
-            lltv: `${(Number(m.lltv) / 1e16).toFixed(0)}%`,
-            marketId: m.uniqueKey
-          }));
+          let items = resp.data?.data?.markets?.items ?? [];
+          if (searchTerm && collateralSymbolOrAddress && !collateralSymbolOrAddress.startsWith("0x")) {
+            const sym = collateralSymbolOrAddress.toUpperCase();
+            items = items.filter((m) => m.collateralAsset?.symbol?.toUpperCase() === sym);
+          }
+          if (searchTerm && loanTokenSymbolOrAddress && !loanTokenSymbolOrAddress.startsWith("0x")) {
+            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) => {
+            const loanDecimals = m.loanAsset?.decimals ?? 18;
+            return {
+              collateralToken: m.collateralAsset.symbol,
+              loanToken: m.loanAsset.symbol,
+              loanDecimals,
+              supplyApy: m.state?.supplyApy ? Number(m.state.supplyApy) : 0,
+              borrowApy: m.state?.borrowApy ? Number(m.state.borrowApy) : 0,
+              utilization: m.state?.utilization ? Number(m.state.utilization) : 0,
+              totalSupplyUsd: m.state?.supplyAssets ? Number(m.state.supplyAssets) / 10 ** loanDecimals : 0,
+              totalBorrowUsd: m.state?.borrowAssets ? Number(m.state.borrowAssets) / 10 ** loanDecimals : 0,
+              lltv: `${(Number(m.lltv) / 1e16).toFixed(0)}%`,
+              marketId: m.uniqueKey
+            };
+          });
         } catch (e) {
           console.warn("[agether] getMarketRates failed:", e instanceof Error ? e.message : e);
           return [];
         }
       }
+      // ════════════════════════════════════════════════════════
+      //  Market Search & Wallet Discovery
+      // ════════════════════════════════════════════════════════
+      /**
+       * Search Morpho markets by token name using the Morpho GraphQL API `search` field.
+       * No hardcoded token lists — uses Morpho's built-in fuzzy search.
+       *
+       * @param search - token name or symbol (e.g. 'WETH', 'staked ETH', 'ezETH')
+       * @param options.asCollateral - only return markets where the searched token is collateral
+       * @param options.asLoanToken - only return markets where the searched token is the loan asset
+       */
+      async searchMarkets(search, options) {
+        const chainId = this.config.chainId;
+        const query = `{
+      markets(
+        first: 100
+        orderBy: SupplyAssetsUsd
+        orderDirection: Desc
+        where: { chainId_in: [${chainId}], search: "${search}" }
+      ) {
+        items {
+          uniqueKey
+          lltv
+          loanAsset { address symbol decimals }
+          collateralAsset { address symbol decimals }
+          state {
+            borrowAssets
+            supplyAssets
+            utilization
+            supplyApy
+            borrowApy
+          }
+        }
+      }
+    }`;
+        try {
+          const resp = await import_axios.default.post(MORPHO_API_URL, { query }, { timeout: 1e4 });
+          let items = resp.data?.data?.markets?.items ?? [];
+          items = items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== import_ethers.ethers.ZeroAddress);
+          const searchUpper = search.toUpperCase();
+          if (options?.asCollateral) {
+            items = items.filter((m) => m.collateralAsset?.symbol?.toUpperCase() === searchUpper);
+          }
+          if (options?.asLoanToken) {
+            items = items.filter((m) => m.loanAsset?.symbol?.toUpperCase() === searchUpper);
+          }
+          return items.map((m) => {
+            const loanDecimals = m.loanAsset?.decimals ?? 18;
+            const collateralDecimals = m.collateralAsset?.decimals ?? 18;
+            return {
+              collateralToken: m.collateralAsset.symbol,
+              loanToken: m.loanAsset.symbol,
+              loanDecimals,
+              collateralDecimals,
+              supplyApy: m.state?.supplyApy ? Number(m.state.supplyApy) : 0,
+              borrowApy: m.state?.borrowApy ? Number(m.state.borrowApy) : 0,
+              utilization: m.state?.utilization ? Number(m.state.utilization) : 0,
+              totalSupplyUsd: m.state?.supplyAssets ? Number(m.state.supplyAssets) / 10 ** loanDecimals : 0,
+              totalBorrowUsd: m.state?.borrowAssets ? Number(m.state.borrowAssets) / 10 ** loanDecimals : 0,
+              lltv: `${(Number(m.lltv) / 1e16).toFixed(0)}%`,
+              marketId: m.uniqueKey,
+              collateralAddress: m.collateralAsset.address,
+              loanAddress: m.loanAsset.address
+            };
+          });
+        } catch (e) {
+          console.warn("[agether] searchMarkets failed:", e instanceof Error ? e.message : e);
+          return [];
+        }
+      }
+      /**
+       * Scan the AgentAccount wallet for all ERC-20 tokens that appear in Morpho
+       * markets on the current chain. Returns tokens where balance > 0.
+       *
+       * Uses the full market list (500 markets) to discover all relevant tokens,
+       * then checks on-chain balance for each unique token address.
+       *
+       * @returns Array of tokens with non-zero balance, sorted by balance descending.
+       */
+      async getWalletTokenBalances() {
+        const acctAddr = await this.getAccountAddress();
+        await this.getMarkets();
+        const uniqueTokens = /* @__PURE__ */ new Map();
+        for (const [key, info] of this._tokenCache.entries()) {
+          if (key.startsWith("0x") && !uniqueTokens.has(key)) {
+            uniqueTokens.set(key, info);
+          }
+        }
+        const results = [];
+        try {
+          const ethBalance = await this.provider.getBalance(acctAddr);
+          if (ethBalance > 0n) {
+            results.push({
+              symbol: "ETH",
+              address: import_ethers.ethers.ZeroAddress,
+              decimals: 18,
+              balance: ethBalance,
+              balanceFormatted: import_ethers.ethers.formatEther(ethBalance)
+            });
+          }
+        } catch {
+        }
+        const tokenEntries = Array.from(uniqueTokens.values());
+        const batchSize = 20;
+        for (let i = 0; i < tokenEntries.length; i += batchSize) {
+          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 balance = await token.balanceOf(acctAddr);
+              if (balance > 0n) {
+                return {
+                  symbol: info.symbol,
+                  address: info.address,
+                  decimals: info.decimals,
+                  balance,
+                  balanceFormatted: import_ethers.ethers.formatUnits(balance, info.decimals)
+                };
+              }
+            } catch {
+            }
+            return null;
+          });
+          const batchResults = await Promise.all(checks);
+          for (const r of batchResults) {
+            if (r) results.push(r);
+          }
+        }
+        results.sort((a, b) => b.balance > a.balance ? 1 : b.balance < a.balance ? -1 : 0);
+        return results;
+      }
+      /**
+       * Find borrowing opportunities for the agent.
+       *
+       * - If `collateralSymbol` is provided: find all markets where that token is collateral.
+       * - If omitted: scan wallet balances and find markets for each token the agent holds.
+       *
+       * Returns markets grouped by collateral token with APY, liquidity, and balance info.
+       *
+       * @param collateralSymbol - optional, e.g. 'WETH'. If omitted, scans wallet.
+       */
+      async findBorrowingOptions(collateralSymbol) {
+        let tokensToCheck;
+        if (collateralSymbol) {
+          tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: "N/A" }];
+          try {
+            const balance = await this.getTokenBalance(collateralSymbol);
+            const info = await this._resolveToken(collateralSymbol);
+            tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: import_ethers.ethers.formatUnits(balance, info.decimals) }];
+          } catch {
+          }
+        } else {
+          const walletTokens = await this.getWalletTokenBalances();
+          tokensToCheck = walletTokens.filter((t) => t.symbol !== "ETH").map((t) => ({ symbol: t.symbol, balanceFormatted: t.balanceFormatted }));
+          if (tokensToCheck.length === 0) {
+            return [];
+          }
+        }
+        const results = [];
+        for (const token of tokensToCheck) {
+          const markets = await this.searchMarkets(token.symbol, { asCollateral: true });
+          if (markets.length === 0) continue;
+          results.push({
+            collateralToken: token.symbol,
+            collateralBalance: token.balanceFormatted,
+            markets: markets.map((m) => ({
+              loanToken: m.loanToken,
+              borrowApy: `${(m.borrowApy * 100).toFixed(2)}%`,
+              supplyApy: `${(m.supplyApy * 100).toFixed(2)}%`,
+              lltv: m.lltv,
+              utilization: `${(m.utilization * 100).toFixed(1)}%`,
+              availableLiquidity: `$${(m.totalSupplyUsd - m.totalBorrowUsd).toFixed(0)}`,
+              marketId: m.marketId
+            }))
+          });
+        }
+        return results;
+      }
+      /**
+       * Find supply/lending opportunities for a specific loan token.
+       *
+       * "What can I supply to earn WETH?" → shows all markets where WETH is the loan token
+       * (user supplies WETH to earn yield from borrowers).
+       *
+       * @param loanTokenSymbol - e.g. 'USDC', 'WETH'
+       */
+      async findSupplyOptions(loanTokenSymbol) {
+        const markets = await this.searchMarkets(loanTokenSymbol, { asLoanToken: true });
+        return markets.map((m) => ({
+          collateralToken: m.collateralToken,
+          loanToken: m.loanToken,
+          supplyApy: `${(m.supplyApy * 100).toFixed(2)}%`,
+          borrowApy: `${(m.borrowApy * 100).toFixed(2)}%`,
+          lltv: m.lltv,
+          utilization: `${(m.utilization * 100).toFixed(1)}%`,
+          totalSupply: `$${m.totalSupplyUsd.toFixed(0)}`,
+          marketId: m.marketId
+        }));
+      }
       /**
        * Estimate theoretical yield for a given collateral amount over a period.
        *
@@ -735,14 +1015,15 @@ 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, [
               "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 valueInUsdc = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
-            collateralValueUsd = Number(valueInUsdc) / 1e6;
+            const valueInLoan = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
+            collateralValueUsd = Number(valueInLoan) / 10 ** loanDecimals;
           } catch (e) {
             console.warn("[agether] oracle price fetch for yield estimation failed:", e instanceof Error ? e.message : e);
             throw new AgetherError("Cannot determine collateral value. Provide ethPriceUsd.", "PRICE_UNAVAILABLE");
@@ -763,61 +1044,65 @@ var init_MorphoClient = __esm({
       //  Supply-Side (Lending) — earn yield by supplying USDC
       // ════════════════════════════════════════════════════════
       /**
-       * Supply USDC to a Morpho Blue market as a lender (earn yield).
+       * Supply loan token to a Morpho Blue market as a lender (earn yield).
        *
        * Unlike `supplyCollateral` (borrower-side), this is the **lender-side**:
-       * you deposit the loanToken (USDC) into the market's supply pool and earn
+       * you deposit the loanToken into the market's supply pool and earn
        * interest paid by borrowers.
        *
-       * @param usdcAmount - Amount of USDC to supply (e.g. '500')
+       * @param amount - Amount of loan token to supply (e.g. '500' for 500 USDC, '0.5' for 0.5 WETH)
        * @param collateralSymbol - Market collateral token to identify which market (e.g. 'WETH')
        *                           Optional — defaults to highest-APY market
+       * @param loanTokenSymbol - Loan token to filter market (e.g. 'USDC', 'WETH'). Optional.
        */
-      async supplyAsset(usdcAmount, collateralSymbol) {
+      async supplyAsset(amount, collateralSymbol, loanTokenSymbol) {
         const acctAddr = await this.getAccountAddress();
-        const amount = import_ethers.ethers.parseUnits(usdcAmount, 6);
         const morphoAddr = this.config.contracts.morphoBlue;
-        const usdcAddr = this.config.contracts.usdc;
         let params;
         let usedCollateral;
         if (collateralSymbol) {
-          params = await this.findMarketForCollateral(collateralSymbol);
+          params = await this.findMarketForCollateral(collateralSymbol, loanTokenSymbol);
           usedCollateral = collateralSymbol;
         } else {
-          const rates = await this.getMarketRates();
+          const rates = await this.getMarketRates(void 0, loanTokenSymbol);
           if (rates.length === 0) throw new AgetherError("No markets available", "NO_MARKETS");
           const best = rates.reduce((a, b) => a.supplyApy > b.supplyApy ? a : b);
-          params = await this.findMarketForCollateral(best.collateralToken);
+          params = await this.findMarketForCollateral(best.collateralToken, loanTokenSymbol);
           usedCollateral = best.collateralToken;
         }
+        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(
             ["address", "address", "address", "address", "uint256"],
             [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
           )
         );
-        const usdcContract = new import_ethers.Contract(usdcAddr, ERC20_ABI, this._signer);
-        const acctBalance = await usdcContract.balanceOf(acctAddr);
-        if (acctBalance < amount) {
-          const shortfall = amount - acctBalance;
-          const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+        const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+        const acctBalance = await loanContract.balanceOf(acctAddr);
+        if (acctBalance < parsedAmount) {
+          const shortfall = parsedAmount - acctBalance;
+          const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
           if (eoaBalance < shortfall) {
+            const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+            const loanSymbol = loanInfo?.symbol ?? "loan token";
             throw new AgetherError(
-              `Insufficient USDC. Need ${usdcAmount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, 6)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, 6)}.`,
+              `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
               "INSUFFICIENT_BALANCE"
             );
           }
-          const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+          const transferTx = await loanContract.transfer(acctAddr, shortfall);
           await transferTx.wait();
           this._refreshSigner();
         }
-        const targets = [usdcAddr, morphoAddr];
+        const targets = [loanTokenAddr, morphoAddr];
         const values = [0n, 0n];
         const datas = [
-          erc20Iface.encodeFunctionData("approve", [morphoAddr, amount]),
+          erc20Iface.encodeFunctionData("approve", [morphoAddr, parsedAmount]),
           morphoIface.encodeFunctionData("supply", [
             this._toTuple(params),
-            amount,
+            parsedAmount,
             0n,
             acctAddr,
             "0x"
@@ -826,7 +1111,7 @@ var init_MorphoClient = __esm({
         const receipt = await this.batch(targets, values, datas);
         return {
           tx: receipt.hash,
-          amount: usdcAmount,
+          amount,
           marketId,
           collateralToken: usedCollateral,
           agentAccount: acctAddr
@@ -839,17 +1124,26 @@ var init_MorphoClient = __esm({
        * @param collateralSymbol - Market collateral to identify which market
        * @param receiver - Destination address (defaults to EOA)
        */
-      async withdrawSupply(usdcAmount, collateralSymbol, receiver) {
+      /**
+       * Withdraw supplied loan token (+ earned interest) from a Morpho Blue market.
+       *
+       * @param amount - Amount to withdraw (e.g. '100' or 'all' for full position)
+       * @param collateralSymbol - Market collateral to identify which market
+       * @param receiver - Destination address (defaults to EOA)
+       * @param loanTokenSymbol - Loan token to filter market (optional)
+       */
+      async withdrawSupply(amount, collateralSymbol, receiver, loanTokenSymbol) {
         const acctAddr = await this.getAccountAddress();
         const morphoAddr = this.config.contracts.morphoBlue;
         const dest = receiver || await this.getSignerAddress();
         let params;
         if (collateralSymbol) {
-          params = await this.findMarketForCollateral(collateralSymbol);
+          params = await this.findMarketForCollateral(collateralSymbol, loanTokenSymbol);
         } else {
           const { params: p } = await this._findActiveSupplyMarket();
           params = p;
         }
+        const loanDecimals = await this._getLoanTokenDecimals(params);
         const marketId = import_ethers.ethers.keccak256(
           import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
             ["address", "address", "address", "address", "uint256"],
@@ -858,13 +1152,13 @@ var init_MorphoClient = __esm({
         );
         let withdrawAssets;
         let withdrawShares;
-        if (usdcAmount === "all") {
+        if (amount === "all") {
           const pos = await this.morphoBlue.position(marketId, acctAddr);
           withdrawShares = BigInt(pos.supplyShares);
           withdrawAssets = 0n;
           if (withdrawShares === 0n) throw new AgetherError("No supply position to withdraw", "NO_SUPPLY");
         } else {
-          withdrawAssets = import_ethers.ethers.parseUnits(usdcAmount, 6);
+          withdrawAssets = import_ethers.ethers.parseUnits(amount, loanDecimals);
           withdrawShares = 0n;
         }
         const data = morphoIface.encodeFunctionData("withdraw", [
@@ -882,13 +1176,13 @@ 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, 6);
+          remainingSupply = import_ethers.ethers.formatUnits(currentAssets, loanDecimals);
         } catch (e) {
           console.warn("[agether] failed to read remaining supply:", e instanceof Error ? e.message : e);
         }
         return {
           tx: receipt.hash,
-          amount: usdcAmount,
+          amount,
           remainingSupply,
           destination: dest
         };
@@ -961,14 +1255,13 @@ var init_MorphoClient = __esm({
        * Computes available yield, verifies the requested amount doesn't exceed it,
        * then withdraws from the supply position and sends directly to the recipient.
        *
-       * @param recipient - Address to receive the USDC
-       * @param usdcAmount - Amount to pay from yield (e.g. '5.50')
+       * @param recipient - Address to receive the loan token
+       * @param amount - Amount to pay from yield (e.g. '5.50')
        * @param collateralSymbol - Market collateral to identify which supply position
        */
-      async payFromYield(recipient, usdcAmount, collateralSymbol) {
+      async payFromYield(recipient, amount, collateralSymbol) {
         const acctAddr = await this.getAccountAddress();
         const morphoAddr = this.config.contracts.morphoBlue;
-        const amount = import_ethers.ethers.parseUnits(usdcAmount, 6);
         const positions = await this.getSupplyPositions(collateralSymbol);
         if (positions.length === 0) {
           throw new AgetherError("No supply position found", "NO_SUPPLY");
@@ -976,17 +1269,20 @@ var init_MorphoClient = __esm({
         const pos = positions.reduce(
           (a, b) => parseFloat(a.earnedYield) > parseFloat(b.earnedYield) ? a : b
         );
-        const availableYield = import_ethers.ethers.parseUnits(pos.earnedYield, 6);
-        if (amount > availableYield) {
+        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);
+        if (parsedAmount > availableYield) {
+          const loanSymbol = pos.loanToken;
           throw new AgetherError(
-            `Requested ${usdcAmount} USDC exceeds available yield of ${pos.earnedYield} USDC. Use withdrawSupply to withdraw principal.`,
+            `Requested ${amount} ${loanSymbol} exceeds available yield of ${pos.earnedYield} ${loanSymbol}. Use withdrawSupply to withdraw principal.`,
             "EXCEEDS_YIELD"
           );
         }
-        const params = await this.findMarketForCollateral(pos.collateralToken);
         const data = morphoIface.encodeFunctionData("withdraw", [
           this._toTuple(params),
-          amount,
+          parsedAmount,
           0n,
           acctAddr,
           recipient
@@ -1005,7 +1301,7 @@ var init_MorphoClient = __esm({
         }
         return {
           tx: receipt.hash,
-          yieldWithdrawn: usdcAmount,
+          yieldWithdrawn: amount,
           recipient,
           remainingYield,
           remainingSupply
@@ -1063,28 +1359,31 @@ var init_MorphoClient = __esm({
         };
       }
       /**
-       * Borrow USDC against existing collateral.
+       * Borrow loan token against existing collateral.
        *
        * AgentAccount.execute: Morpho.borrow(params, amount, 0, account, account)
        *
-       * @param usdcAmount - USDC amount (e.g. '100')
+       * @param amount - Loan token amount (e.g. '100' for 100 USDC, '0.5' for 0.5 WETH)
        * @param tokenSymbol - collateral symbol to identify which market (default: first with collateral)
+       * @param marketParams - explicit market params (optional)
+       * @param loanTokenSymbol - loan token to filter market (optional, e.g. 'USDC', 'WETH')
        */
-      async borrow(usdcAmount, tokenSymbol, marketParams) {
+      async borrow(amount, tokenSymbol, marketParams, loanTokenSymbol) {
         const acctAddr = await this.getAccountAddress();
-        const amount = import_ethers.ethers.parseUnits(usdcAmount, 6);
         const morphoAddr = this.config.contracts.morphoBlue;
         let params;
         let usedToken = tokenSymbol || "WETH";
         if (marketParams) {
           params = marketParams;
         } else if (tokenSymbol) {
-          params = await this.findMarketForCollateral(tokenSymbol);
+          params = await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
         } else {
           const { params: p, symbol } = await this._findActiveMarket();
           params = p;
           usedToken = symbol;
         }
+        const loanDecimals = await this._getLoanTokenDecimals(params);
+        const parsedAmount = import_ethers.ethers.parseUnits(amount, loanDecimals);
         try {
           const marketId = import_ethers.ethers.keccak256(
             import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
@@ -1108,11 +1407,14 @@ var init_MorphoClient = __esm({
           const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
           const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
           const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
-          if (amount > maxAdditional) {
-            const maxUsd = import_ethers.ethers.formatUnits(maxAdditional, 6);
-            const colFormatted = import_ethers.ethers.formatUnits(pos.collateral, 18);
+          if (parsedAmount > maxAdditional) {
+            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);
             throw new AgetherError(
-              `Borrow of $${usdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
+              `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"
             );
           }
@@ -1122,7 +1424,7 @@ var init_MorphoClient = __esm({
         }
         const data = morphoIface.encodeFunctionData("borrow", [
           this._toTuple(params),
-          amount,
+          parsedAmount,
           0n,
           acctAddr,
           acctAddr
@@ -1130,7 +1432,7 @@ var init_MorphoClient = __esm({
         const receipt = await this.exec(morphoAddr, data);
         return {
           tx: receipt.hash,
-          amount: usdcAmount,
+          amount,
           collateralToken: usedToken,
           agentAccount: acctAddr
         };
@@ -1138,17 +1440,27 @@ var init_MorphoClient = __esm({
       /**
        * Deposit collateral AND borrow USDC in one batched transaction.
        *
+      /**
+       * Deposit collateral AND borrow loan token in one batched transaction.
+       *
        * AgentAccount.executeBatch:
        *   [collateral.approve, Morpho.supplyCollateral, Morpho.borrow]
        *
        * The collateral must be transferred to AgentAccount first.
+       *
+       * @param tokenSymbol - collateral token symbol (e.g. 'WETH')
+       * @param collateralAmount - amount of collateral (e.g. '0.05')
+       * @param borrowAmount - amount of loan token to borrow (e.g. '100')
+       * @param marketParams - explicit market params (optional)
+       * @param loanTokenSymbol - loan token to filter market (optional)
        */
-      async depositAndBorrow(tokenSymbol, collateralAmount, borrowUsdcAmount, marketParams) {
+      async depositAndBorrow(tokenSymbol, collateralAmount, borrowAmount, marketParams, loanTokenSymbol) {
         const acctAddr = await this.getAccountAddress();
         const colInfo = await this._resolveToken(tokenSymbol);
-        const params = marketParams ?? await this.findMarketForCollateral(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(borrowUsdcAmount, 6);
+        const borrowWei = import_ethers.ethers.parseUnits(borrowAmount, loanDecimals);
         const morphoAddr = this.config.contracts.morphoBlue;
         try {
           const marketId = import_ethers.ethers.keccak256(
@@ -1169,9 +1481,11 @@ var init_MorphoClient = __esm({
           const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
           const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
           if (borrowWei > maxAdditional) {
-            const maxUsd = import_ethers.ethers.formatUnits(maxAdditional, 6);
+            const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
+            const loanSymbol = loanInfo?.symbol ?? "loan token";
+            const maxFormatted = import_ethers.ethers.formatUnits(maxAdditional, loanDecimals);
             throw new AgetherError(
-              `Borrow of $${borrowUsdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (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_ethers.ethers.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
               "EXCEEDS_MAX_LTV"
             );
           }
@@ -1217,36 +1531,42 @@ var init_MorphoClient = __esm({
           tx: receipt.hash,
           collateralToken: tokenSymbol,
           collateralAmount,
-          borrowAmount: borrowUsdcAmount,
+          borrowAmount,
           agentAccount: acctAddr
         };
       }
       /**
-       * Repay borrowed USDC from AgentAccount.
+       * Repay borrowed loan token from AgentAccount.
        *
        * AgentAccount.executeBatch:
-       *   [USDC.approve(MorphoBlue), Morpho.repay(params)]
+       *   [loanToken.approve(MorphoBlue), Morpho.repay(params)]
+       *
+       * @param amount - loan token amount to repay (e.g. '50' or 'all' for full repayment)
+       * @param tokenSymbol - collateral symbol to identify which market (optional)
+       * @param marketParams - explicit market params (optional)
+       * @param loanTokenSymbol - loan token to filter market (optional)
        */
-      async repay(usdcAmount, tokenSymbol, marketParams) {
+      async repay(amount, tokenSymbol, marketParams, loanTokenSymbol) {
         const acctAddr = await this.getAccountAddress();
         const morphoAddr = this.config.contracts.morphoBlue;
-        const usdcAddr = this.config.contracts.usdc;
         let params;
         if (marketParams) {
           params = marketParams;
         } else if (tokenSymbol) {
-          params = await this.findMarketForCollateral(tokenSymbol);
+          params = await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
         } else {
           const { params: p } = await this._findActiveMarket();
           params = p;
         }
+        const loanTokenAddr = params.loanToken;
+        const loanDecimals = await this._getLoanTokenDecimals(params);
         let repayAssets;
         let repayShares;
         let approveAmount;
-        if (usdcAmount === "all") {
+        if (amount === "all") {
           const markets = await this.getMarkets();
           const mkt = markets.find(
-            (m) => m.collateralAsset?.address.toLowerCase() === params.collateralToken.toLowerCase()
+            (m) => m.collateralAsset?.address.toLowerCase() === params.collateralToken.toLowerCase() && m.loanAsset?.address.toLowerCase() === params.loanToken.toLowerCase()
           );
           if (mkt) {
             const pos = await this.morphoBlue.position(mkt.uniqueKey, acctAddr);
@@ -1256,33 +1576,35 @@ 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", 6);
+            approveAmount = estimated > 0n ? estimated : import_ethers.ethers.parseUnits("1", loanDecimals);
           } else {
-            repayAssets = import_ethers.ethers.parseUnits("999999", 6);
+            repayAssets = import_ethers.ethers.parseUnits("999999", loanDecimals);
             repayShares = 0n;
             approveAmount = repayAssets;
           }
         } else {
-          repayAssets = import_ethers.ethers.parseUnits(usdcAmount, 6);
+          repayAssets = import_ethers.ethers.parseUnits(amount, loanDecimals);
           repayShares = 0n;
           approveAmount = repayAssets;
         }
-        const usdcContract = new import_ethers.Contract(usdcAddr, ERC20_ABI, this._signer);
-        const acctBalance = await usdcContract.balanceOf(acctAddr);
+        const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+        const acctBalance = await loanContract.balanceOf(acctAddr);
         if (acctBalance < approveAmount) {
           const shortfall = approveAmount - acctBalance;
-          const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+          const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
           if (eoaBalance < shortfall) {
+            const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+            const loanSymbol = loanInfo?.symbol ?? "loan token";
             throw new AgetherError(
-              `Insufficient USDC for repay. Need ${import_ethers.ethers.formatUnits(approveAmount, 6)} USDC, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, 6)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, 6)}.`,
+              `Insufficient ${loanSymbol} for repay. Need ${import_ethers.ethers.formatUnits(approveAmount, loanDecimals)}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, loanDecimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, loanDecimals)}.`,
               "INSUFFICIENT_BALANCE"
             );
           }
-          const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+          const transferTx = await loanContract.transfer(acctAddr, shortfall);
           await transferTx.wait();
           this._refreshSigner();
         }
-        const targets = [usdcAddr, morphoAddr];
+        const targets = [loanTokenAddr, morphoAddr];
         const values = [0n, 0n];
         const datas = [
           erc20Iface.encodeFunctionData("approve", [morphoAddr, approveAmount]),
@@ -1302,7 +1624,7 @@ var init_MorphoClient = __esm({
         } catch (e) {
           console.warn("[agether] failed to read remaining debt after repay:", e instanceof Error ? e.message : e);
         }
-        return { tx: receipt.hash, amount: usdcAmount, remainingDebt };
+        return { tx: receipt.hash, amount, remainingDebt };
       }
       /**
        * Withdraw collateral from Morpho Blue.
@@ -1316,12 +1638,13 @@ var init_MorphoClient = __esm({
         const colInfo = await this._resolveToken(tokenSymbol);
         const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
         const morphoAddr = this.config.contracts.morphoBlue;
-        const usdcAddr = this.config.contracts.usdc;
+        const loanTokenAddr = params.loanToken;
+        const loanDecimals = await this._getLoanTokenDecimals(params);
         const dest = receiver || await this.getSignerAddress();
         let weiAmount;
         const markets = await this.getMarkets();
         const market = markets.find(
-          (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase()
+          (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase() && m.loanAsset?.address.toLowerCase() === loanTokenAddr.toLowerCase()
         );
         if (amount === "all") {
           if (!market) throw new AgetherError("Market not found", "MARKET_NOT_FOUND");
@@ -1344,8 +1667,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", 6);
-              console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${import_ethers.ethers.formatUnits(dustApproveAmount, 6)} USDC \u2014 auto-repaying before withdraw`);
+              dustApproveAmount = estimated > 0n ? estimated : import_ethers.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`);
             }
           } catch (e) {
             console.warn("[agether] failed to check borrow shares before withdraw:", e instanceof Error ? e.message : e);
@@ -1359,19 +1684,21 @@ var init_MorphoClient = __esm({
         ]);
         let receipt;
         if (hasDustDebt) {
-          const usdcContract = new import_ethers.Contract(usdcAddr, ERC20_ABI, this._signer);
-          const acctBalance = await usdcContract.balanceOf(acctAddr);
+          const loanContract = new import_ethers.Contract(loanTokenAddr, ERC20_ABI, this._signer);
+          const acctBalance = await loanContract.balanceOf(acctAddr);
           if (acctBalance < dustApproveAmount) {
             const shortfall = dustApproveAmount - acctBalance;
-            const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+            const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
             if (eoaBalance >= shortfall) {
-              console.log(`[agether] transferring ${import_ethers.ethers.formatUnits(shortfall, 6)} USDC from EOA \u2192 AgentAccount for dust repay`);
-              const transferTx = await usdcContract.transfer(acctAddr, 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`);
+              const transferTx = await loanContract.transfer(acctAddr, shortfall);
               await transferTx.wait();
               this._refreshSigner();
             }
           }
-          const targets = [usdcAddr, morphoAddr, morphoAddr];
+          const targets = [loanTokenAddr, morphoAddr, morphoAddr];
           const values = [0n, 0n, 0n];
           const datas = [
             erc20Iface.encodeFunctionData("approve", [morphoAddr, dustApproveAmount]),
@@ -1616,6 +1943,37 @@ var init_MorphoClient = __esm({
         }
         throw new AgetherError("No active supply position found", "NO_SUPPLY");
       }
+      /**
+       * Resolve loan token decimals from market params.
+       * Uses the `_tokenCache` populated by `getMarkets()`.
+       */
+      async _getLoanTokenDecimals(params) {
+        const tokenInfo = this._tokenCache.get(params.loanToken.toLowerCase());
+        if (tokenInfo) return tokenInfo.decimals;
+        await this.getMarkets();
+        const fromApi = this._tokenCache.get(params.loanToken.toLowerCase());
+        return fromApi?.decimals ?? 18;
+      }
+      /**
+       * Apply client-side filter to discovered markets.
+       */
+      _applyMarketFilter(markets, filter) {
+        return markets.filter((m) => {
+          if (filter.loanToken) {
+            const loanAddr = filter.loanToken.toLowerCase();
+            if (m.loanAsset.address.toLowerCase() !== loanAddr && m.loanAsset.symbol.toUpperCase() !== filter.loanToken.toUpperCase()) {
+              return false;
+            }
+          }
+          if (filter.collateralToken) {
+            const colAddr = filter.collateralToken.toLowerCase();
+            if (m.collateralAsset.address.toLowerCase() !== colAddr && m.collateralAsset.symbol.toUpperCase() !== filter.collateralToken.toUpperCase()) {
+              return false;
+            }
+          }
+          return true;
+        });
+      }
       /**
        * Resolve a token symbol or address to { address, symbol, decimals }.
        *
@@ -1631,9 +1989,27 @@ var init_MorphoClient = __esm({
         await this.getMarkets();
         const fromApi = this._tokenCache.get(key);
         if (fromApi) return fromApi;
+        if (!symbolOrAddress.startsWith("0x")) {
+          const searchResults = await this.searchMarkets(symbolOrAddress);
+          const sym = symbolOrAddress.toUpperCase();
+          for (const m of searchResults) {
+            if (m.collateralToken.toUpperCase() === sym) {
+              const info = { address: m.collateralAddress, symbol: m.collateralToken, decimals: m.collateralDecimals };
+              this._tokenCache.set(sym, info);
+              this._tokenCache.set(m.collateralAddress.toLowerCase(), info);
+              return info;
+            }
+            if (m.loanToken.toUpperCase() === sym) {
+              const info = { address: m.loanAddress, symbol: m.loanToken, decimals: m.loanDecimals };
+              this._tokenCache.set(sym, info);
+              this._tokenCache.set(m.loanAddress.toLowerCase(), info);
+              return info;
+            }
+          }
+        }
         throw new AgetherError(
-          `Unknown token: ${symbolOrAddress}. No Morpho market found with this collateral.`,
-          "UNKNOWN_COLLATERAL"
+          `Unknown token: ${symbolOrAddress}. No Morpho market found with this token.`,
+          "UNKNOWN_TOKEN"
         );
       }
       /**
@@ -1839,25 +2215,21 @@ var init_AgetherClient = __esm({
         const acctAddr = await this.agether4337Factory.getAccount(agentId);
         this.accountAddress = acctAddr;
         if (!acctExists) {
-          try {
-            const updatedMeta = JSON.stringify({
-              type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
-              name: options?.name || "Unnamed Agent",
-              description: options?.description || "AI agent registered via @agether/sdk",
-              active: true,
-              wallet: `eip155:${this.config.chainId}:${acctAddr}`,
-              registrations: [{
-                agentId: Number(agentId),
-                agentRegistry: `eip155:${this.config.chainId}:${this.config.contracts.identityRegistry}`
-              }]
-            });
-            const finalURI = `data:application/json;base64,${Buffer.from(updatedMeta).toString("base64")}`;
-            const uriTx = await this.identityRegistry.setAgentURI(agentId, finalURI);
-            await uriTx.wait();
-            this._refreshSigner();
-          } catch (e) {
-            console.warn("[agether] setAgentURI failed (non-fatal):", e instanceof Error ? e.message : e);
-          }
+          const updatedMeta = JSON.stringify({
+            type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
+            name: options?.name || "Unnamed Agent",
+            description: options?.description || "AI agent registered via @agether/sdk",
+            active: true,
+            wallet: `eip155:${this.config.chainId}:${acctAddr}`,
+            registrations: [{
+              agentId: Number(agentId),
+              agentRegistry: `eip155:${this.config.chainId}:${this.config.contracts.identityRegistry}`
+            }]
+          });
+          const finalURI = `data:application/json;base64,${Buffer.from(updatedMeta).toString("base64")}`;
+          const uriTx = await this.identityRegistry.setAgentURI(agentId, finalURI);
+          await uriTx.wait();
+          this._refreshSigner();
         }
         const kyaRequired = await this.isKyaRequired();
         return {
@@ -1875,7 +2247,7 @@ var init_AgetherClient = __esm({
       async _mintNewIdentity(name, description) {
         const registrationFile = JSON.stringify({
           type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
-          name: name || "Unnamed Agent",
+          name: name || "Agether Agent",
           description: description || "AI agent registered via @agether/sdk",
           active: true,
           registrations: [{