@agether/agether 2.10.1 → 2.11.0

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "agether",
   "name": "Agether Credit",
   "description": "Onchain credit protocol for AI agents — Morpho-backed overcollateralized credit, ERC-8004 identity, x402 payments. Private key and RPC keys are read from OpenClaw secrets (env vars); no plaintext config needed.",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "skills": ["skills/agether"],
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/agether",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "description": "OpenClaw plugin for Agether — onchain credit for AI agents on Ethereum & Base",
   "main": "src/index.ts",
   "openclaw": {
@@ -9,7 +9,7 @@
     ]
   },
   "dependencies": {
-    "@agether/sdk": "^2.12.1",
+    "@agether/sdk": "^2.13.0",
     "axios": "^1.6.0",
     "ethers": "^6.9.0"
   },

package/skills/agether/SKILL.md

@@ -5,7 +5,7 @@ description: On-chain credit protocol for AI agents. Morpho credit & lending, x4
 
 # Agether — On-Chain Credit for AI Agents
 
-You are an AI agent with on-chain financial capabilities on **Ethereum** and **Base** mainnets. You can borrow USDC, earn yield by lending, and pay for APIs autonomously.
+You are an AI agent with on-chain financial capabilities on **Ethereum** and **Base** mainnets. You can borrow any supported loan token (USDC, WETH, etc.), earn yield by lending, and pay for APIs autonomously.
 
 ---
 
@@ -31,14 +31,14 @@ If you don't paste it, the user sees NOTHING. An empty colon ":" with no data af
 6. **Never ask for private keys** — they come from OpenClaw secrets (AGETHER_PRIVATE_KEY env var).
 7. **Max LTV is 80%** (125% collateral ratio). To borrow $X, you need $X × 1.25 in collateral value.
 8. **When user says "register" → ALWAYS call `agether_register`.** But ONLY after chain is set (see MANDATORY BOOT SEQUENCE). A wallet CAN have multiple ERC-8004 identities. The tool handles everything. Never refuse to register because the wallet "already has an identity". Just call the tool.
-9. **Before calling `agether_register`, ASK the user for an agent name.** The name is stored on-chain in the ERC-8004 metadata URI. Ask: "What name would you like for your agent?" Then pass it as `name` parameter. If the user declines or says "skip", call register without a name (default "Unnamed Agent" will be used).
+9. **If the user asks to register/deploy a new agent but did NOT provide a name — ask them for a name before calling `agether_register`.** The name is stored on-chain in the ERC-8004 metadata URI and cannot be easily changed. Ask: "What name would you like for your agent?" Then pass it as `name` parameter. Only if the user explicitly says "skip" or "no name", call register without a name (default "Unnamed Agent" will be used). **Never register without asking for a name first.**
 10. **Never guess about blockchain state.** If you're unsure, call the tool. Don't tell the user something is impossible — try it first.
 11. **Your EOA wallet IS the user's wallet.** Same private key, same address. If the user says "I have WETH", call `agether_balance` — you'll see it in the `collateral` field. You already have access to those tokens.
 12. **`morpho_deposit` and `morpho_deposit_and_borrow` transfer collateral from your EOA automatically.** You do NOT need anyone to "send you" tokens. If your EOA has WETH, just call the deposit tool directly. The SDK handles EOA→Safe account→Morpho in one flow.
 13. **To get USDC for x402:** call `morpho_deposit_and_borrow` with collateral from your EOA. Do NOT ask the user to send tokens — check your balance first.
 14. **Check health before large actions.** Before borrowing, depositing, or withdrawing significant amounts, call `agether_health` to see current LTV and headroom. This prevents failed transactions.
 15. **Batch awareness:** `morpho_deposit_and_borrow` is a batched operation (deposit + borrow in one tx). Always prefer it over separate `morpho_deposit` then `morpho_borrow` when doing both — it saves gas and is atomic.
-16. **Collateral tokens are dynamic.** Don't hardcode "WETH/wstETH/cbETH". Call `morpho_markets` to discover which tokens are available. The SDK auto-discovers tokens from Morpho GraphQL API.
+16. **Collateral and loan tokens are dynamic.** Don't hardcode tokens. Call `morpho_markets` to discover which collateral/loan token pairs are available. The SDK auto-discovers from Morpho GraphQL API.
 17. **Withdrawals stay in AgentAccount by default.** `morpho_withdraw` and `morpho_withdraw_supply` keep funds in the Safe account unless `toEoa: true` is passed. Use `wallet_withdraw_token` / `wallet_withdraw_eth` to move any token or ETH from AgentAccount to EOA.
 18. **Always show Health Factor when reporting positions.** HF = LLTV / LTV. HF > 1.15 = safe 🟢, HF 1.0–1.15 = warning 🟡, HF ≤ 1.0 = liquidation 🔴. `morpho_status` returns HF per position. Always paste it so the user understands their risk.
 
@@ -134,21 +134,21 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 | Tool | Params | What it does |
 |------|--------|-------------|
 | `morpho_status` | none | Show all Morpho positions — collateral, debt, LTV, **Health Factor** (HF), headroom, risk level per market |
-| `morpho_markets` | `token?` | List Morpho Blue USDC markets — supply/borrow APY, utilization, LLTV, liquidity. Optional token filter. |
-| `morpho_max_borrowable` | none | Calculate max additional USDC borrowable given current collateral/debt |
+| `morpho_markets` | `token?`, `loanToken?` | List all Morpho Blue markets — supply/borrow APY, utilization, LLTV, liquidity. Optional collateral or loan token filter. |
+| `morpho_max_borrowable` | none | Calculate max additional loan token borrowable given current collateral/debt across all markets |
 | `morpho_deposit` | `amount`, `token` | Deposit collateral from EOA → Morpho (no borrow). Token auto-discovered. |
-| `morpho_deposit_and_borrow` | `collateralAmount`, `token`, `borrowAmount` | **PREFERRED** — Deposit + borrow in one batched tx (ERC-7579 batch mode). Best for first-time setup. |
-| `morpho_borrow` | `amount`, `token?` | Borrow USDC against existing collateral → lands in AgentAccount. Token auto-detected. |
-| `morpho_repay` | `amount`, `token?` | Repay USDC debt. Use `amount: "all"` to clear dust shares. |
+| `morpho_deposit_and_borrow` | `collateralAmount`, `token`, `borrowAmount`, `loanToken?` | **PREFERRED** — Deposit + borrow in one batched tx (ERC-7579 batch mode). Supports any loan token. Best for first-time setup. |
+| `morpho_borrow` | `amount`, `token?`, `loanToken?` | Borrow loan token (USDC, WETH, etc.) against existing collateral → lands in AgentAccount. Token auto-detected. |
+| `morpho_repay` | `amount`, `token?`, `loanToken?` | Repay loan token debt. Use `amount: "all"` to clear dust shares. |
 | `morpho_withdraw` | `amount`, `token`, `toEoa?` | Withdraw collateral from Morpho. Default: stays in AgentAccount. `toEoa: true` → send to EOA wallet. |
 | `morpho_sponsor` | `agentId`/`agentAddress`, `amount`, `token` | Transfer collateral to another agent's AgentAccount. |
 
 ### Morpho Lending (Supply-side — earn yield)
 | Tool | Params | What it does |
 |------|--------|-------------|
-| `morpho_supply` | `amount`, `market?` | Supply USDC as a LENDER to earn yield from borrowers. Auto-picks highest APY market if no market specified. |
-| `morpho_supply_status` | `market?` | Show supply (lending) positions with earned yield. Tracks yield on-chain — no database needed. |
-| `morpho_withdraw_supply` | `amount`, `market?`, `toEoa?` | Withdraw supplied USDC (principal + earned interest). Default: stays in AgentAccount. `toEoa: true` → send to EOA. |
+| `morpho_supply` | `amount`, `market?`, `loanToken?` | Supply a loan token (USDC, WETH, etc.) as a LENDER to earn yield from borrowers. Auto-picks highest APY market if no market specified. |
+| `morpho_supply_status` | `market?` | Show supply (lending) positions with earned yield per loan token. Tracks yield on-chain — no database needed. |
+| `morpho_withdraw_supply` | `amount`, `market?`, `toEoa?` | Withdraw supplied tokens (principal + earned interest). Default: stays in AgentAccount. `toEoa: true` → send to EOA. |
 
 ### x402 Payments
 | Tool | Params | What it does |
@@ -231,24 +231,24 @@ IF no auto-funding configured:
        → Call morpho_markets to show which tokens are accepted
 ```
 
-### User wants to borrow USDC via Morpho
+### User wants to borrow via Morpho
 ```
 1. agether_health               ← check collateral, headroom, current LTV
 2. IF headroom allows the borrow amount AND collateral already in Morpho:
-     → morpho_borrow(amount)
+     → morpho_borrow(amount, loanToken?)    ← defaults to most liquid market
 3. IF EOA has collateral but nothing in Morpho yet:
-     → morpho_deposit_and_borrow(collateralAmount, token, borrowAmount)
+     → morpho_deposit_and_borrow(collateralAmount, token, borrowAmount, loanToken?)
 4. agether_balance               ← show the result with balance changes
-5. Show: tx hash, collateral deposited, USDC borrowed, new balances, new LTV
+5. Show: tx hash, collateral deposited, amount borrowed, loan token, new balances, new LTV
 ```
 
 ### User wants to earn yield (supply-side lending)
 ```
-1. Check USDC availability:
-   - agether_health for AgentAccount USDC
-   - If no USDC in AgentAccount but exists in EOA → wallet_fund first
+1. Check token availability:
+   - agether_health for AgentAccount balances
+   - If no tokens in AgentAccount but exists in EOA → wallet_fund first
 2. morpho_markets                ← show supply APYs to pick best market
-3. morpho_supply(amount, market?) ← supply USDC to earn yield
+3. morpho_supply(amount, market?, loanToken?) ← supply tokens to earn yield
 4. Later: morpho_supply_status   ← check earned yield
 5. To exit: morpho_withdraw_supply("all") ← principal + earned interest
 ```
@@ -256,7 +256,7 @@ IF no auto-funding configured:
 ### User wants to repay + withdraw
 ```
 1. agether_health               ← check current debt, collateral, LTV
-2. morpho_repay(amount or "all") ← repay USDC
+2. morpho_repay(amount or "all", loanToken?) ← repay loan token
 3. morpho_withdraw("all", token, toEoa: true) ← get collateral back to EOA
 4. agether_balance               ← show final balances
 ```
@@ -272,7 +272,7 @@ For ETH:
 For Morpho collateral:
   → morpho_withdraw(amount, token, toEoa: true)   ← must use toEoa flag
 
-For supply positions (lent USDC):
+For supply positions (lent tokens):
   → morpho_withdraw_supply(amount, market?, toEoa: true)   ← must use toEoa flag
 ```
 
@@ -344,13 +344,13 @@ You MUST format every on-chain action reply like this. Do NOT skip any field.
 
 Example after repay:
 ```
-✅ Repaid $1.50 USDC
+✅ Repaid 1.50 USDC
 
 🔗 Tx: https://basescan.org/tx/0xabc123def456...
 💰 Balances:
   EOA: 0.05 ETH, 0 USDC
-  AgentAccount: 0 ETH, $3.50 USDC
-📊 Debt remaining: $0.00
+  AgentAccount: 0 ETH, 3.50 USDC
+📊 Debt remaining: 0.00 USDC
 ```
 
 Example after register:
@@ -365,11 +365,11 @@ Example after register:
 
 Example after supply (lending):
 ```
-✅ Supplied $500 USDC to WETH/USDC market
+✅ Supplied 500 USDC to WETH/USDC market
 
 🔗 Tx: https://basescan.org/tx/0x789abc...
 📈 Earning ~3.2% APY from borrowers
-💰 AgentAccount: $50 USDC remaining
+💰 AgentAccount: 50 USDC remaining
 ```
 
 If something **fails**:
@@ -385,7 +385,7 @@ If something **fails**:
 | Parameter | Value |
 |-----------|-------|
 | Chains | Ethereum mainnet (1) or Base mainnet (8453) — set via `agether_set_chain` |
-| Currency | USDC (6 decimals) |
+| Currency | Any supported loan token — USDC (6 decimals), WETH (18 decimals), etc. Dynamically discovered from Morpho markets. |
 | Max LTV | 80% (= 125% collateral ratio) |
 | Collateral tokens | Dynamically discovered from Morpho markets (call `morpho_markets`) |
 | x402 cost | ~$0.001 per API call (WeatherXM) |
@@ -402,7 +402,7 @@ If something **fails**:
 | `Payment rejected (402)` | No USDC for x402 payment | Borrow USDC first, or enable autoDraw/autoYield in config |
 | `No collateral deposited` | Trying to borrow without collateral | `morpho_deposit` first |
 | `Insufficient collateral` | EOA doesn't have enough of that token | Tell user to send collateral to EOA address |
-| `Insufficient USDC in AgentAccount` | Not enough USDC for repay/pay | Fund via borrow, yield withdrawal, or `wallet_fund` |
+| `Insufficient USDC in AgentAccount` | Not enough loan token for repay/pay | Fund via borrow, yield withdrawal, or `wallet_fund` |
 | `ExecutionFailed` | Smart contract call reverted | Check inner error, usually LTV or approval issue |
 | `PositionNotActive` | No collateral deposited for this token | Deposit collateral with `morpho_deposit` first |
 
@@ -437,12 +437,12 @@ EOA Wallet (private key from AGETHER_PRIVATE_KEY)
 Morpho Blue (direct lending, overcollateralized 125%)
   ├── BORROWER side:
   │     ├── supplyCollateral() → collateral into Morpho Blue market
-  │     ├── borrow()           → USDC from Morpho Blue → AgentAccount
-  │     ├── repay()            → USDC from AgentAccount → Morpho Blue
+  │     ├── borrow()           → loan token (USDC, WETH, etc.) from Morpho Blue → AgentAccount
+  │     ├── repay()            → loan token from AgentAccount → Morpho Blue
   │     └── withdrawCollateral() → collateral back (to AgentAccount or EOA)
   └── LENDER side:
-        ├── supply()           → USDC into Morpho Blue market (earn yield)
-        ├── withdraw()         → USDC + earned interest back (to AgentAccount or EOA)
+        ├── supply()           → loan token into Morpho Blue market (earn yield)
+        ├── withdraw()         → loan token + earned interest back (to AgentAccount or EOA)
         └── Yield tracked via Morpho GraphQL API (no database needed)
 
 Wallet transfers:

package/src/index.ts

@@ -59,7 +59,7 @@ const SPEND_CACHE_FILE = path.join(
 
 interface SpendCacheData {
   date: string;           // YYYY-MM-DD
-  totalBorrowed: string;  // raw bigint string (6-decimal USDC units)
+  totalBorrowed: string;  // raw bigint string (loan token native units)
 }
 
 function loadSpendCache(): SpendCacheData | undefined {
@@ -519,14 +519,17 @@ export default function register(api: any) {
         ]);
 
         const positions = status.positions.map((p: any) => {
-          const mm = maxBorrow.byMarket.find((m: any) => m.collateralToken === p.collateralToken);
-          const collateralValueUsd = mm ? Number(mm.collateralValue) / 1e6 : 0;
+          const mm = maxBorrow.byMarket.find((m: any) => m.collateralToken === p.collateralToken && m.loanToken === p.loanToken);
+          const loanDecimals = mm ? mm.loanDecimals : 6;
+          const divisor = 10 ** loanDecimals;
+          const collateralValue = mm ? Number(mm.collateralValue) / divisor : 0;
           const debt = parseFloat(p.debt);
           const lltv = 0.80; // Morpho LLTV
-          const ltv = collateralValueUsd > 0 ? debt / collateralValueUsd : 0;
+          const ltv = collateralValue > 0 ? debt / collateralValue : 0;
           // HF = LLTV / LTV — >1 is safe, <1 is liquidatable
           const hf = ltv > 0 ? lltv / ltv : Infinity;
-          const headroom = mm ? Number(mm.maxAdditional) / 1e6 : 0;
+          const headroom = mm ? Number(mm.maxAdditional) / divisor : 0;
+          const loanSymbol = p.loanToken || 'USDC';
 
           let risk: string;
           if (debt === 0) risk = "🟢 no debt";
@@ -536,19 +539,20 @@ export default function register(api: any) {
 
           return {
             collateralToken: p.collateralToken,
+            loanToken: loanSymbol,
             collateral: p.collateral,
-            collateralValueUsd: `$${collateralValueUsd.toFixed(2)}`,
-            debt: `$${debt.toFixed(2)}`,
+            collateralValue: `${collateralValue.toFixed(4)} ${loanSymbol}`,
+            debt: `${debt.toFixed(4)} ${loanSymbol}`,
             ltv: `${(ltv * 100).toFixed(1)}%`,
             healthFactor: debt === 0 ? "∞" : hf.toFixed(2),
-            headroom: `$${headroom.toFixed(2)}`,
+            headroom: `${headroom.toFixed(4)} ${loanSymbol}`,
             risk,
           };
         });
 
         return ok(JSON.stringify({
           agentAccount: status.agentAccount,
-          totalDebt: `$${status.totalDebt}`,
+          totalDebt: status.totalDebt,
           positions,
         }, null, 2));
       } catch (e) { return fail(e); }
@@ -561,7 +565,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_deposit",
     description:
-      "Deposit collateral into Morpho Blue via AgentAccount. Enables borrowing USDC. Token is auto-discovered from available markets.",
+      "Deposit collateral into Morpho Blue via AgentAccount. Enables borrowing against it. Token is auto-discovered from available markets.",
     parameters: {
       type: "object",
       properties: {
@@ -592,18 +596,20 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_deposit_and_borrow",
     description:
-      "Deposit collateral AND borrow USDC in one batched transaction via AgentAccount (ERC-7579 batch mode). " +
-      "Deposits collateral from EOA into Morpho, then borrows USDC. All in one tx.",
+      "Deposit collateral AND borrow in one batched transaction via AgentAccount (ERC-7579 batch mode). " +
+      "Deposits collateral from EOA into Morpho, then borrows loan token. All in one tx. " +
+      "Supports any loan token (USDC, WETH, etc.).",
     parameters: {
       type: "object",
       properties: {
         collateralAmount: { type: "string", description: "Amount of collateral (e.g. '0.05')" },
         token: { type: "string", description: "Collateral token" },
-        borrowAmount: { type: "string", description: "USDC amount to borrow (e.g. '50')" },
+        borrowAmount: { type: "string", description: "Amount to borrow (e.g. '50')" },
+        loanToken: { type: "string", description: "Loan token to borrow (e.g. 'USDC', 'WETH'). Optional — defaults to most liquid market." },
       },
       required: ["collateralAmount", "token", "borrowAmount"],
     },
-    async execute(_id: string, params: { collateralAmount: string; token: string; borrowAmount: string }) {
+    async execute(_id: string, params: { collateralAmount: string; token: string; borrowAmount: string; loanToken?: string }) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
@@ -612,11 +618,13 @@ export default function register(api: any) {
           params.token,
           params.collateralAmount,
           params.borrowAmount,
+          undefined,
+          params.loanToken,
         );
         return ok(JSON.stringify({
           status: "deposited_and_borrowed",
           collateral: `${params.collateralAmount} ${params.token}`,
-          borrowed: `$${params.borrowAmount}`,
+          borrowed: `${params.borrowAmount}`,
           agentAccount: result.agentAccount,
           tx: txLink(result.tx),
         }));
@@ -671,25 +679,27 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_borrow",
     description:
-      "Borrow USDC against deposited collateral via Morpho Blue. " +
-      "USDC lands in AgentAccount. Requires collateral deposited first.",
+      "Borrow loan token against deposited collateral via Morpho Blue. " +
+      "Borrowed tokens land in AgentAccount. Requires collateral deposited first. " +
+      "Supports any loan token (USDC, WETH, etc.).",
     parameters: {
       type: "object",
       properties: {
-        amount: { type: "string", description: "Amount in USD to borrow (e.g. '100')" },
+        amount: { type: "string", description: "Amount to borrow (e.g. '100')" },
         token: { type: "string", description: "Collateral token (optional, auto-detected)" },
+        loanToken: { type: "string", description: "Loan token to borrow (e.g. 'USDC', 'WETH'). Optional — defaults to most liquid market." },
       },
       required: ["amount"],
     },
-    async execute(_id: string, params: { amount: string; token?: string }) {
+    async execute(_id: string, params: { amount: string; token?: string; loanToken?: string }) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
         const client = createMorphoClient(cfg);
-        const result = await client.borrow(params.amount, params.token);
+        const result = await client.borrow(params.amount, params.token, undefined, params.loanToken);
         return ok(JSON.stringify({
           status: "borrowed",
-          amount: `$${params.amount}`,
+          amount: params.amount,
           collateral: result.collateralToken,
           agentAccount: result.agentAccount,
           tx: txLink(result.tx),
@@ -704,25 +714,27 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_repay",
     description:
-      "Repay borrowed USDC back to Morpho Blue from AgentAccount. Reduces debt. " +
-      "Use amount 'all' to repay full debt and clear dust shares.",
+      "Repay borrowed loan token back to Morpho Blue from AgentAccount. Reduces debt. " +
+      "Use amount 'all' to repay full debt and clear dust shares. " +
+      "Supports any loan token (USDC, WETH, etc.).",
     parameters: {
       type: "object",
       properties: {
-        amount: { type: "string", description: "Amount in USD to repay (e.g. '50' or 'all' for full repayment)" },
+        amount: { type: "string", description: "Amount to repay (e.g. '50' or 'all' for full repayment)" },
         token: { type: "string", description: "Collateral token (optional, auto-detected)" },
+        loanToken: { type: "string", description: "Loan token to repay (e.g. 'USDC', 'WETH'). Optional — auto-detected." },
       },
       required: ["amount"],
     },
-    async execute(_id: string, params: { amount: string; token?: string }) {
+    async execute(_id: string, params: { amount: string; token?: string; loanToken?: string }) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
         const client = createMorphoClient(cfg);
-        const result = await client.repay(params.amount, params.token);
+        const result = await client.repay(params.amount, params.token, undefined, params.loanToken);
         return ok(JSON.stringify({
           status: "repaid",
-          amount: `$${params.amount}`,
+          amount: params.amount,
           remainingDebt: result.remainingDebt,
           tx: txLink(result.tx),
         }));
@@ -774,33 +786,38 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_supply",
     description:
-      "Supply USDC to a Morpho Blue market as a LENDER to earn yield. " +
-      "This is the lending side — your USDC earns interest from borrowers. " +
-      "Unlike morpho_deposit (collateral for borrowing), this puts USDC to work earning APY.",
+      "Supply a loan token (USDC, WETH, etc.) to a Morpho Blue market as a LENDER to earn yield. " +
+      "This is the lending side — your tokens earn interest from borrowers. " +
+      "Unlike morpho_deposit (collateral for borrowing), this puts tokens to work earning APY.",
     parameters: {
       type: "object",
       properties: {
-        amount: { type: "string", description: "USDC amount to supply (e.g. '500')" },
+        amount: { type: "string", description: "Amount to supply (e.g. '500')" },
         market: {
           type: "string",
          
           description: "Which market to supply to, identified by collateral token (optional — auto-picks highest APY)",
         },
+        loanToken: {
+          type: "string",
+          description: "Loan token to supply (e.g. 'USDC', 'WETH'). Optional — defaults to USDC.",
+        },
       },
       required: ["amount"],
     },
-    async execute(_id: string, params: { amount: string; market?: string }) {
+    async execute(_id: string, params: { amount: string; market?: string; loanToken?: string }) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
         const client = createMorphoClient(cfg);
-        const result = await client.supplyAsset(params.amount, params.market);
+        const result = await client.supplyAsset(params.amount, params.market, params.loanToken);
+        const tokenLabel = params.loanToken || 'USDC';
         return ok(JSON.stringify({
           status: "supplied",
-          amount: `$${params.amount} USDC`,
+          amount: `${params.amount} ${tokenLabel}`,
           market: result.collateralToken,
           agentAccount: result.agentAccount,
-          note: "USDC is now earning yield from borrowers in this market",
+          note: `${tokenLabel} is now earning yield from borrowers in this market`,
           tx: txLink(result.tx),
         }));
       } catch (e) { return fail(e); }
@@ -839,9 +856,9 @@ export default function register(api: any) {
 
         const formatted = positions.map((p: any) => ({
           market: `${p.collateralToken}/${p.loanToken}`,
-          suppliedAssets: `$${p.suppliedAssets} USDC`,
-          netDeposited: `$${p.netDeposited} USDC`,
-          earnedYield: `$${p.earnedYield} USDC`,
+          suppliedAssets: `${p.suppliedAssets} ${p.loanToken}`,
+          netDeposited: `${p.netDeposited} ${p.loanToken}`,
+          earnedYield: `${p.earnedYield} ${p.loanToken}`,
           supplyApy: `${(p.supplyApy * 100).toFixed(2)}%`,
           marketId: p.marketId.slice(0, 18) + "…",
         }));
@@ -852,8 +869,8 @@ export default function register(api: any) {
         return ok(JSON.stringify({
           positions: formatted,
           totals: {
-            totalSupplied: `$${totalSupplied.toFixed(2)} USDC`,
-            totalYield: `$${totalYield.toFixed(6)} USDC`,
+            totalSupplied: `${totalSupplied.toFixed(2)}`,
+            totalYield: `${totalYield.toFixed(6)}`,
           },
         }, null, 2));
       } catch (e) { return fail(e); }
@@ -861,18 +878,18 @@ export default function register(api: any) {
   });
 
   // ═══════════════════════════════════════════════════════
-  //  TOOL: morpho_withdraw_supply  (withdraw lent USDC)
+  //  TOOL: morpho_withdraw_supply  (withdraw lent tokens)
   // ═══════════════════════════════════════════════════════
   api.registerTool({
     name: "morpho_withdraw_supply",
     description:
-      "Withdraw supplied USDC (principal + earned interest) from a Morpho Blue lending position. " +
-      "By default keeps USDC in AgentAccount. Set toEoa=true to send to EOA wallet. " +
+      "Withdraw supplied tokens (principal + earned interest) from a Morpho Blue lending position. " +
+      "By default keeps tokens in AgentAccount. Set toEoa=true to send to EOA wallet. " +
       "Use amount 'all' to withdraw the full position. Different from morpho_withdraw which withdraws collateral.",
     parameters: {
       type: "object",
       properties: {
-        amount: { type: "string", description: "USDC amount to withdraw (e.g. '100' or 'all')" },
+        amount: { type: "string", description: "Amount to withdraw (e.g. '100' or 'all')" },
         market: {
           type: "string",
          
@@ -892,8 +909,8 @@ export default function register(api: any) {
         const result = await client.withdrawSupply(params.amount, params.market, receiver);
         return ok(JSON.stringify({
           status: "withdrawn",
-          amount: params.amount === "all" ? "all (full position)" : `$${params.amount} USDC`,
-          remainingSupply: `$${result.remainingSupply} USDC`,
+          amount: params.amount === "all" ? "all (full position)" : params.amount,
+          remainingSupply: result.remainingSupply,
           destination: result.destination,
           tx: txLink(result.tx),
         }));
@@ -907,20 +924,21 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_markets",
     description:
-      "List available Morpho Blue USDC markets — liquidity, supply/borrow APY, utilization, LLTV. " +
-      "Optionally filter by collateral token.",
+      "List available Morpho Blue markets — liquidity, supply/borrow APY, utilization, LLTV. " +
+      "Supports all loan tokens (USDC, WETH, etc.). Optionally filter by collateral or loan token.",
     parameters: {
       type: "object",
       properties: {
         token: { type: "string", description: "Filter by collateral token (optional)" },
+        loanToken: { type: "string", description: "Filter by loan token (e.g. 'USDC', 'WETH'). Optional — shows all." },
       },
       required: [],
     },
-    async execute(_id: string, params: { token?: string }) {
+    async execute(_id: string, params: { token?: string; loanToken?: string }) {
       try {
         const cfg = getConfig(api);
         const client = createMorphoClient(cfg);
-        const rates = await client.getMarketRates(params.token);
+        const rates = await client.getMarketRates(params.token, params.loanToken);
 
         if (rates.length === 0) return ok("No markets found.");