@agether/agether 2.3.0 → 2.4.0

package/openclaw.plugin.json

@@ -2,12 +2,18 @@
   "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.3.0",
+  "version": "2.3.1",
   "skills": ["skills/agether"],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
     "properties": {
+      "chain": {
+        "type": "number",
+        "description": "Chain ID: 1 = Ethereum (default), 8453 = Base",
+        "default": 1,
+        "enum": [1, 8453]
+      },
       "agentId": {
         "type": "string",
         "description": "ERC-8004 agent ID (set after registration, auto-saved by tools)"
@@ -27,11 +33,6 @@
         "description": "Daily USDC spending cap for x402 auto-draw payments (0 = unlimited). Persisted to cache file so it survives restarts.",
         "default": 0
       },
-      "autoDrawBuffer": {
-        "type": "number",
-        "description": "Extra USDC buffer when auto-drawing from Morpho (e.g. 0.5 = borrow $0.50 extra)",
-        "default": 0
-      },
       "healthAlertThreshold": {
         "type": "number",
         "description": "LTV percentage threshold for health warnings (e.g. 70 = warn at 70% LTV, liquidation at 80%)",
@@ -41,11 +42,11 @@
     "required": []
   },
   "uiHints": {
+    "chain": { "label": "Chain", "placeholder": "1 (Ethereum)" },
     "agentId": { "label": "Agent ID", "placeholder": "17676" },
     "autoDraw": { "label": "Auto-Draw Credit", "placeholder": "false" },
     "autoYield": { "label": "Auto-Yield (use yield before borrowing)", "placeholder": "false" },
     "dailySpendLimitUsdc": { "label": "Daily Spend Limit (USDC)", "placeholder": "0" },
-    "autoDrawBuffer": { "label": "Auto-Draw Buffer (USDC)", "placeholder": "0" },
     "healthAlertThreshold": { "label": "Health Alert Threshold (%)", "placeholder": "70" }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agether/agether",
-  "version": "2.3.0",
-  "description": "OpenClaw plugin for Agether — onchain credit for AI agents",
+  "version": "2.4.0",
+  "description": "OpenClaw plugin for Agether — onchain credit for AI agents on Ethereum & Base",
   "main": "src/index.ts",
   "openclaw": {
     "extensions": [
@@ -9,7 +9,7 @@
     ]
   },
   "dependencies": {
-    "@agether/sdk": "^2.6.0",
+    "@agether/sdk": "^2.7.0",
     "axios": "^1.6.0",
     "ethers": "^6.9.0"
   },

package/skills/agether/SKILL.md

@@ -1,11 +1,11 @@
 ---
 name: agether
-description: On-chain credit protocol for AI agents on Base. Morpho credit, x402 payments, ERC-8004 identity.
+description: On-chain credit protocol for AI agents on Base. Morpho credit & lending, x402 payments, ERC-8004 identity.
 ---
 
 # Agether — On-Chain Credit for AI Agents
 
-You are an AI agent with on-chain financial capabilities on **Base mainnet**. You can earn credit, borrow USDC, and pay for APIs autonomously.
+You are an AI agent with on-chain financial capabilities on **Base mainnet**. You can borrow USDC, earn yield by lending, and pay for APIs autonomously.
 
 ---
 
@@ -37,6 +37,9 @@ If you don't paste it, the user sees NOTHING. An empty colon ":" with no data af
 12. **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.
 13. **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.
 14. **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.
+15. **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. **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.
+17. **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.
 
 ---
 
@@ -67,42 +70,84 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 | `agether_health` | **START HERE.** Comprehensive check: balances, all positions with LTV & liquidation risk, borrowing headroom, alerts — all in one call. |
 | `agether_preflight` | Setup readiness check: private key present? RPC working? Agent registered? Balances OK? Returns pass/fail checklist. |
 
-### Identity & Wallet
+### Identity
 | Tool | What it does |
 |------|-------------|
-| `agether_balance` | Show ETH + USDC + collateral (WETH/wstETH/cbETH) balances for both EOA wallet and Safe account |
+| `agether_balance` | Show ETH + USDC + all collateral token balances for both EOA wallet and AgentAccount (Safe). Tokens auto-discovered from markets. |
 | `agether_register` | Register on-chain: mints ERC-8004 identity NFT + creates Safe account (via Safe7579). Auto-saves agentId to config. |
 | `agether_set_agent` | Set a known agentId (e.g. from memory) and save to config. Use when agentId is "?" but you remember it. |
 | `agether_score` | Get credit score. `refresh: false` = free read. `refresh: true` = pays x402, computes fresh score on-chain. **Always call this when user asks about score.** |
-| `wallet_fund` | Transfer USDC from EOA wallet → Safe account |
+| `agether_kya_status` | Check if KYA code verification is required for this deployment. |
+| `agether_set_kya` | Enable or disable KYA verification gate (owner only). |
 
-### Morpho Credit (Overcollateralized — instant, no approval)
+### Wallet (move funds between EOA ↔ AgentAccount)
 | Tool | Params | What it does |
 |------|--------|-------------|
-| `morpho_markets` | none | List supported Morpho markets and parameters |
-| `morpho_status` | none | Show all Morpho positions (collateral + debt) |
-| `morpho_rates` | `token?` | Current market rates — supply APY, borrow APY, utilization |
+| `wallet_fund` | `amount` | Transfer USDC from EOA → AgentAccount |
+| `wallet_withdraw_token` | `token`, `amount` | Withdraw any ERC-20 token from AgentAccount → EOA. Use `amount: "all"` for full balance. |
+| `wallet_withdraw_eth` | `amount` | Withdraw ETH from AgentAccount → EOA. Use `amount: "all"` for full balance. |
+
+### Morpho Borrowing (Overcollateralized — instant, no approval needed)
+| 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_yield_estimate` | `token`, `amount`, `periodDays?` | Estimate theoretical yield for collateral |
-| `morpho_deposit` | `amount`, `token` | Deposit collateral from EOA → Morpho (no borrow) |
-| `morpho_deposit_and_borrow` | `collateralAmount`, `token`, `borrowAmount` | **PREFERRED** — Deposit + borrow in one batched tx. Best for first-time setup |
-| `morpho_borrow` | `amount` (USD) | Borrow USDC against existing collateral → lands in Safe account |
-| `morpho_repay` | `amount` (USD or "all") | Repay USDC debt from Safe account → Morpho |
-| `morpho_withdraw` | `amount` (or "all"), `token` | Withdraw collateral back to EOA wallet |
-| `morpho_sponsor` | `agentId`/`agentAddress`, `amount`, `token` | Deposit collateral for another agent |
+| `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_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. |
 
 ### x402 Payments
 | Tool | Params | What it does |
 |------|--------|-------------|
-| `x402_pay` | `url`, `method?`, `body?`, `autoDraw?` | Make a paid API call. Pays with USDC via EIP-3009 signature |
+| `x402_pay` | `url`, `method?`, `body?` | Make a paid API call via x402 protocol. Pays with USDC via EIP-3009 from AgentAccount. If USDC is low, auto-sources: yield first (autoYield), then borrow (autoDraw). |
 
 ### Slash Commands (user types these — no AI invocation)
 | Command | What it does |
 |---------|-------------|
-| `/balance` | Quick balance check |
-| `/morpho` | Quick Morpho position summary |
+| `/balance` | Quick balance check (shows all non-zero balances) |
+| `/morpho` | Quick Morpho position summary with Health Factor |
 | `/health` | Quick position health: LTV, liquidation risk, balances |
-| `/rates` | Current Morpho market rates |
+| `/rates` | Current Morpho market rates (supply APY, borrow APY, utilization) |
+
+---
+
+## ⚙️ PLUGIN CONFIGURATION
+
+These settings are in `openclaw.json` under `plugins.entries.agether.config`:
+
+| Setting | Type | Default | Description |
+|---------|------|---------|-------------|
+| `agentId` | string | — | ERC-8004 agent ID (auto-saved by register/set_agent tools) |
+| `autoDraw` | boolean | `false` | Auto-borrow from Morpho when USDC is low for x402 payments |
+| `autoYield` | boolean | `false` | Auto-withdraw earned yield before borrowing. Waterfall: balance → yield → borrow |
+| `dailySpendLimitUsdc` | number | `0` | Daily spending cap for x402 auto-draw (0 = unlimited). Persisted to cache file. |
+| `healthAlertThreshold` | number | `70` | LTV % threshold for health warnings in `agether_health` and `/health` (liquidation at 80%). Also controls 🟡 vs 🟢 icons. |
+
+### x402 Auto-Funding Waterfall
+When `autoYield` and/or `autoDraw` are enabled, `x402_pay` automatically sources USDC:
+```
+1. Check AgentAccount USDC balance
+   → If enough → pay directly (no extra tx)
+2. If autoYield enabled AND supply positions have earned yield:
+   → Withdraw yield from supply position (1 tx)
+   → Pay with that
+3. If still not enough AND autoDraw enabled AND collateral deposited in Morpho:
+   → Borrow from Morpho credit line (1 tx)
+   → Pay with that
+4. If dailySpendLimitUsdc > 0:
+   → Enforce daily cap (resets at midnight UTC, persisted to disk)
+```
 
 ---
 
@@ -120,18 +165,24 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 
 ### User asks to call a paid API (x402)
 ```
-1. agether_health               ← get full picture in one call
-2. Look at balances.agentAccount.usdc:
-   IF USDC ≥ $0.01:
-     → x402_pay(url)
-3. IF no USDC but positions exist with headroom:
-     → morpho_borrow(amount: "1")    ← borrow $1
-     → x402_pay(url)
-4. IF no USDC AND no positions BUT EOA has WETH/wstETH/cbETH:
-     → morpho_deposit_and_borrow(collateralAmount, token, borrowAmount: "1")
-     → x402_pay(url)
-5. IF nothing at all:
-     → Tell user: "Need collateral (WETH/wstETH/cbETH) on Base. Send to <EOA address>"
+IF autoYield or autoDraw are configured:
+  → x402_pay(url)   ← the waterfall handles everything automatically
+  → Paste: response data, payment info, any auto-fund actions taken
+
+IF no auto-funding configured:
+  1. agether_health               ← get full picture
+  2. Look at balances.agentAccount.usdc:
+     IF USDC ≥ $0.01:
+       → x402_pay(url)
+  3. IF no USDC but positions exist with headroom:
+       → morpho_borrow(amount: "1")    ← borrow $1
+       → x402_pay(url)
+  4. IF no USDC AND no positions BUT EOA has collateral:
+       → morpho_deposit_and_borrow(collateralAmount, token, borrowAmount: "1")
+       → x402_pay(url)
+  5. IF nothing at all:
+       → Tell user: "Need collateral on Base. Send to <EOA address>"
+       → Call morpho_markets to show which tokens are accepted
 ```
 
 ### User wants to borrow USDC via Morpho
@@ -145,14 +196,40 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 5. Show: tx hash, collateral deposited, USDC borrowed, 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
+2. morpho_markets                ← show supply APYs to pick best market
+3. morpho_supply(amount, market?) ← supply USDC to earn yield
+4. Later: morpho_supply_status   ← check earned yield
+5. To exit: morpho_withdraw_supply("all") ← principal + earned interest
+```
+
 ### User wants to repay + withdraw
 ```
 1. agether_health               ← check current debt, collateral, LTV
 2. morpho_repay(amount or "all") ← repay USDC
-3. morpho_withdraw("all", token) ← get collateral back
+3. morpho_withdraw("all", token, toEoa: true) ← get collateral back to EOA
 4. agether_balance               ← show final balances
 ```
 
+### User wants to move funds to EOA
+```
+For tokens (USDC, WETH, etc.):
+  → wallet_withdraw_token(token, amount)    ← any ERC-20
+
+For ETH:
+  → wallet_withdraw_eth(amount)
+
+For Morpho collateral:
+  → morpho_withdraw(amount, token, toEoa: true)   ← must use toEoa flag
+
+For supply positions (lent USDC):
+  → morpho_withdraw_supply(amount, market?, toEoa: true)   ← must use toEoa flag
+```
+
 ### User asks about position health or liquidation risk
 ```
 1. agether_health               ← returns LTV, risk level, alerts per position
@@ -162,12 +239,11 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
      → Show: morpho_max_borrowable for headroom context
 ```
 
-### User wants to optimize rates or compare markets
+### User wants to compare markets or check rates
 ```
-1. morpho_rates                  ← get all market rates
-2. morpho_yield_estimate(token, amount) ← estimate yield
-3. Present: which market has lowest borrow APY, highest supply APY
-4. Suggest optimal strategy based on their holdings
+1. morpho_markets                ← supply APY, borrow APY, utilization, LLTV, liquidity per market
+2. Present: which market has lowest borrow APY, highest supply APY
+3. Suggest optimal strategy based on their holdings
 ```
 
 ### User asks to check or refresh credit score
@@ -182,6 +258,13 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 3. NEVER say "not registered" or "no score yet" without calling the tool first!
 ```
 
+### User wants to sponsor another agent
+```
+1. morpho_sponsor(agentId or agentAddress, amount, token)
+   → Transfers collateral from your EOA to another agent's AgentAccount
+2. The target agent can then deposit that collateral into Morpho themselves
+```
+
 ### Something seems wrong / setup issues
 ```
 1. agether_preflight             ← run the diagnostic checklist
@@ -197,10 +280,13 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 ```
 Explain: You're an AI agent with on-chain credit on Base.
 You can:
-- Deposit WETH/wstETH/cbETH as collateral
-- Borrow USDC instantly (125% collateral ratio)
-- Pay for APIs using x402 protocol
+- Deposit collateral and borrow USDC instantly (125% collateral ratio)
+- Earn yield by lending USDC to Morpho markets
+- Pay for APIs autonomously using x402 protocol
+- Auto-fund payments from yield or credit (autoYield + autoDraw)
+- Sponsor other agents with collateral
 - Monitor position health and avoid liquidation
+- Move funds freely between AgentAccount and EOA wallet
 - All on Base mainnet, all autonomous
 ```
 
@@ -231,6 +317,15 @@ Example after register:
 🔗 Tx: https://basescan.org/tx/0x177fdf...
 ```
 
+Example after supply (lending):
+```
+✅ Supplied $500 USDC to WETH/USDC market
+
+🔗 Tx: https://basescan.org/tx/0x789abc...
+📈 Earning ~3.2% APY from borrowers
+💰 AgentAccount: $50 USDC remaining
+```
+
 If something **fails**:
 ```
 ❌ Borrow failed: ExceedsMaxLtv
@@ -246,7 +341,7 @@ If something **fails**:
 | Chain | Base mainnet (8453) |
 | Currency | USDC (6 decimals) |
 | Max LTV | 80% (= 125% collateral ratio) |
-| Collateral tokens | WETH, wstETH, cbETH |
+| Collateral tokens | Dynamically discovered from Morpho markets (call `morpho_markets`) |
 | x402 cost | ~$0.001 per API call (WeatherXM) |
 | Gas cost | ~$0.001–$0.01 per tx |
 
@@ -258,11 +353,12 @@ If something **fails**:
 |-------|---------|-----------|
 | `Missing AGETHER_PRIVATE_KEY` | Private key not set in secrets | Run `openclaw secrets configure` → source: env → id: AGETHER_PRIVATE_KEY |
 | `ExceedsMaxLtv` | Collateral too low for borrow amount | Deposit more collateral or borrow less. LTV must be ≤ 80% |
-| `Payment rejected (402)` | No USDC for x402 payment | Borrow USDC first: `morpho_borrow` or `morpho_deposit_and_borrow` |
+| `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 WETH/wstETH/cbETH` | EOA doesn't have enough collateral | Tell user to send collateral to EOA address |
-| `Insufficient USDC in AgentAccount` | Not enough USDC for repay | Need to fund Safe account or borrow more |
+| `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` |
 | `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 |
 
 ---
 
@@ -287,15 +383,26 @@ If no RPC key is set, the plugin falls back to `https://base-rpc.publicnode.com`
 EOA Wallet (private key from AGETHER_PRIVATE_KEY)
   ├── Owns ERC-8004 Identity NFT (agentId)  ← can own MULTIPLE
   └── Owns Safe Account (via Safe7579 + ERC-4337, 1 per agentId)
-        ├── Holds USDC (from borrows)
+        ├── Holds USDC (from borrows or fund transfers)
+        ├── Holds any ERC-20 tokens (collateral, etc.)
         ├── ERC8004ValidationModule validates ownership + KYA gate
-        └── Executes Morpho Blue operations via ERC-4337 UserOps through EntryPoint
+        └── Executes operations via ERC-4337 UserOps through EntryPoint
 
 Morpho Blue (direct lending, overcollateralized 125%)
-  ├── supplyCollateral() → collateral into Morpho Blue market
-  ├── borrow()           → USDC from Morpho Blue → Safe Account
-  ├── repay()            → USDC from Safe Account → Morpho Blue
-  └── withdrawCollateral() → collateral back to EOA
+  ├── BORROWER side:
+  │     ├── supplyCollateral() → collateral into Morpho Blue market
+  │     ├── borrow()           → USDC from Morpho Blue → AgentAccount
+  │     ├── repay()            → USDC 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)
+        └── Yield tracked via Morpho GraphQL API (no database needed)
+
+Wallet transfers:
+  ├── wallet_fund           → USDC from EOA → AgentAccount
+  ├── wallet_withdraw_token → any ERC-20 from AgentAccount → EOA
+  └── wallet_withdraw_eth   → ETH from AgentAccount → EOA
 ```
 
 ---
@@ -308,7 +415,6 @@ Morpho Blue (direct lending, overcollateralized 125%)
 | Agether8004ValidationModule | `0xde896C58163b5f6cAC5B16C1b0109843f26106F6` |
 | AgetherHookMultiplexer | `0x4AB6DaD0f7360fa8d8c75889A5c206B65d7CbeDb` |
 | Agether7579Bootstrap | `0xCc83AA714c05B7141B21a17e80EB21bD09652b27` |
-| ValidationRegistry | Not deployed yet |
 | Agether8004Scorer | `0x56c7D35A976fac67b1993b66b861fCA32f59104F` |
 | TimelockController | `0xc600e7AAB8a230326C714CE66f356fdf6aC021d8` |
 | Safe Singleton | `0x41675C099F32341bf84BFc5382aF534df5C7461a` |

package/src/index.ts

@@ -4,15 +4,15 @@
  * Each tool = MorphoClient / X402Client call → format result with txLink.
  * Market discovery via Morpho GraphQL API (no backend dependency for markets).
  *
+ * Supported chains: Ethereum (1, default), Base (8453).
+ *
  * v2: Secrets-first config
  * ─────────────────────────
  * - privateKey     → AGETHER_PRIVATE_KEY env var (set via `openclaw secrets configure` → crypto)
  * - rpcUrl         → auto-resolved from ALCHEMY_API_KEY / ANKR_API_KEY / QUICKNODE_URL env vars,
- *                    falls back to https://base-rpc.publicnode.com
- * - backendUrl     → hardcoded (no config needed)
+ *                    falls back to publicnode.com (chain-aware)
  * - agentId        → optional plugin config field (auto-saved by tools)
- *
- * The plugin works with an empty `plugins.entries.agether.config: {}`.
+ * - chain          → plugin config field (default: 1 = Ethereum)
  */
 
 import axios from "axios";
@@ -21,13 +21,27 @@ import * as path from "path";
 import {
   MorphoClient,
   X402Client,
+  getContractAddresses,
+  ChainId,
 } from "@agether/sdk";
 
 // ─── Constants ────────────────────────────────────────────
 
-const BACKEND_URL = "http://95.179.189.214:3001";
-const DEFAULT_RPC = "https://base-rpc.publicnode.com";
-const BASESCAN = "https://basescan.org/tx";
+const BACKEND_URL = "https://api.agether.ai";
+
+// Per-chain defaults
+const CHAIN_DEFAULTS: Record<number, { rpc: string; explorer: string; chainName: string }> = {
+  [ChainId.Ethereum]: {
+    rpc: "https://ethereum-rpc.publicnode.com",
+    explorer: "https://etherscan.io/tx",
+    chainName: "Ethereum",
+  },
+  [ChainId.Base]: {
+    rpc: "https://base-rpc.publicnode.com",
+    explorer: "https://basescan.org/tx",
+    chainName: "Base",
+  },
+};
 
 // ─── Spending Cache (persists dailySpendLimit tracker across restarts) ────
 
@@ -73,11 +87,13 @@ interface PluginConfig {
   privateKey: string;
   agentId?: string;
   rpcUrl: string;
-  backendUrl: string;
+  chainId: ChainId;
 }
 
 function txLink(hash: string): string {
-  return hash ? `${BASESCAN}/${hash}` : "";
+  if (!hash) return "";
+  const explorer = CHAIN_DEFAULTS[activeChainId]?.explorer ?? CHAIN_DEFAULTS[ChainId.Ethereum].explorer;
+  return `${explorer}/${hash}`;
 }
 
 function ok(text: string) {
@@ -102,18 +118,25 @@ function fail(err: unknown) {
 /**
  * Resolve RPC URL from environment secrets.
  * Priority: ALCHEMY_API_KEY → ANKR_API_KEY → QUICKNODE_URL → publicnode fallback.
+ * Chain-aware: uses the correct endpoint subdomain for the configured chain.
  */
-function resolveRpcUrl(): string {
+function resolveRpcUrl(chainId: ChainId): string {
   const alchemy = process.env.ALCHEMY_API_KEY;
-  if (alchemy) return `https://base-mainnet.g.alchemy.com/v2/${alchemy}`;
+  if (alchemy) {
+    const alchemyChain = chainId === ChainId.Base ? "base-mainnet" : "eth-mainnet";
+    return `https://${alchemyChain}.g.alchemy.com/v2/${alchemy}`;
+  }
 
   const ankr = process.env.ANKR_API_KEY;
-  if (ankr) return `https://rpc.ankr.com/base/${ankr}`;
+  if (ankr) {
+    const ankrChain = chainId === ChainId.Base ? "base" : "eth";
+    return `https://rpc.ankr.com/${ankrChain}/${ankr}`;
+  }
 
   const quicknode = process.env.QUICKNODE_URL;
   if (quicknode) return quicknode;
 
-  return DEFAULT_RPC;
+  return CHAIN_DEFAULTS[chainId]?.rpc ?? CHAIN_DEFAULTS[ChainId.Ethereum].rpc;
 }
 
 /**
@@ -134,16 +157,19 @@ function resolvePrivateKey(): string {
 
 function getConfig(api: any): PluginConfig {
   const cfg = api.config?.plugins?.entries?.["agether"]?.config ?? {};
+  const chainId = (cfg.chain as ChainId) || ChainId.Ethereum;
+  activeChainId = chainId; // Update module-level for txLink
   return {
     privateKey: resolvePrivateKey(),
     agentId: cfg.agentId,
-    rpcUrl: resolveRpcUrl(),
-    backendUrl: BACKEND_URL,
+    rpcUrl: resolveRpcUrl(chainId),
+    chainId,
   };
 }
 
 // Module-level cache
 let cachedAgentId: string | undefined;
+let activeChainId: ChainId = ChainId.Ethereum;
 
 function createClient(cfg: PluginConfig): MorphoClient {
   const agentId = cachedAgentId || cfg.agentId;
@@ -151,6 +177,7 @@ function createClient(cfg: PluginConfig): MorphoClient {
     privateKey: cfg.privateKey,
     rpcUrl: cfg.rpcUrl,
     agentId,
+    chainId: cfg.chainId,
   });
 }
 
@@ -186,7 +213,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "agether_balance",
     description:
-      "Check ETH and USDC balances for the agent's EOA wallet and AgentAccount on Base.",
+      "Check ETH and USDC balances for the agent's EOA wallet and AgentAccount.",
     parameters: { type: "object", properties: {}, required: [] },
     async execute() {
       try {
@@ -204,7 +231,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "agether_register",
     description:
-      "Register a new ERC-8004 agent identity on Base and create a Safe smart account (via Safe7579). Returns the new agentId.",
+      "Register a new ERC-8004 agent identity and create a Safe smart account (via Safe7579). Returns the new agentId.",
     parameters: {
       type: "object",
       properties: {
@@ -359,14 +386,50 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_status",
     description:
-      "Show all Morpho Blue positions — collateral deposited, USDC borrowed, debt, for each market.",
+      "Show all Morpho Blue positions — collateral, debt, LTV, and Health Factor for each market.",
     parameters: { type: "object", properties: {}, required: [] },
     async execute() {
       try {
         const cfg = getConfig(api);
         const client = createClient(cfg);
-        const result = await client.getStatus();
-        return ok(JSON.stringify(result, null, 2));
+        const [status, maxBorrow] = await Promise.all([
+          client.getStatus(),
+          client.getMaxBorrowable(),
+        ]);
+
+        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 debt = parseFloat(p.debt);
+          const lltv = 0.80; // Morpho LLTV
+          const ltv = collateralValueUsd > 0 ? debt / collateralValueUsd : 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;
+
+          let risk: string;
+          if (debt === 0) risk = "🟢 no debt";
+          else if (hf <= 1.0) risk = "🔴 LIQUIDATION ZONE";
+          else if (hf <= 1.15) risk = "🟡 WARNING";
+          else risk = "🟢 healthy";
+
+          return {
+            collateralToken: p.collateralToken,
+            collateral: p.collateral,
+            collateralValueUsd: `$${collateralValueUsd.toFixed(2)}`,
+            debt: `$${debt.toFixed(2)}`,
+            ltv: `${(ltv * 100).toFixed(1)}%`,
+            healthFactor: debt === 0 ? "∞" : hf.toFixed(2),
+            headroom: `$${headroom.toFixed(2)}`,
+            risk,
+          };
+        });
+
+        return ok(JSON.stringify({
+          agentAccount: status.agentAccount,
+          totalDebt: `$${status.totalDebt}`,
+          positions,
+        }, null, 2));
       } catch (e) { return fail(e); }
     },
   });
@@ -715,7 +778,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_markets",
     description:
-      "List available Morpho Blue USDC markets on Base — liquidity, supply/borrow APY, utilization, LLTV. " +
+      "List available Morpho Blue USDC markets — liquidity, supply/borrow APY, utilization, LLTV. " +
       "Optionally filter by collateral token.",
     parameters: {
       type: "object",
@@ -772,22 +835,22 @@ export default function register(api: any) {
         if (params.refresh) {
           // x402-gated fresh score — account address required for payment
           const accountAddress = await client.getAccountAddress();
+          const contracts = getContractAddresses(cfg.chainId);
           const x402 = new X402Client({
             privateKey: cfg.privateKey,
             rpcUrl: cfg.rpcUrl,
-            backendUrl: cfg.backendUrl,
             agentId,
             accountAddress,
             // Safe7579 needs validator prefix for ERC-1271 isValidSignature routing
-            validatorModule: "0xde896C58163b5f6cAC5B16C1b0109843f26106F6",
+            validatorModule: contracts.erc8004ValidationModule,
           });
-          const result = await x402.get(`${cfg.backendUrl}/score/${agentId}`);
+          const result = await x402.get(`${BACKEND_URL}/score/${agentId}?chain=${cfg.chainId}`);
           if (!result.success) return fail(result.error || "Score request failed");
           return ok(JSON.stringify(result.data, null, 2));
         }
 
         // Free: read current onchain score
-        const { data } = await axios.get(`${cfg.backendUrl}/score/${agentId}/current`);
+        const { data } = await axios.get(`${BACKEND_URL}/score/${agentId}/current?chain=${cfg.chainId}`);
         return ok(JSON.stringify(data, null, 2));
       } catch (e) { return fail(e); }
     },
@@ -920,22 +983,21 @@ export default function register(api: any) {
 
         const autoDrawEnabled = agetherCfg.autoDraw === true;
         const autoYieldEnabled = agetherCfg.autoYield === true;
+        const contracts = getContractAddresses(cfg.chainId);
         const x402 = new X402Client({
           privateKey: cfg.privateKey,
           rpcUrl: cfg.rpcUrl,
-          backendUrl: cfg.backendUrl,
           agentId,
           accountAddress,
           autoDraw: autoDrawEnabled,
           autoYield: autoYieldEnabled,
           dailySpendLimitUsdc: agetherCfg.dailySpendLimitUsdc,
-          autoDrawBuffer: agetherCfg.autoDrawBuffer,
           // Restore spending state from cache so limit survives restarts
           initialSpendingState: loadSpendCache(),
           // Persist every spending update to cache file
           onSpendingUpdate: (state: any) => saveSpendCache(state),
           // Safe7579 needs validator prefix for ERC-1271 isValidSignature routing
-          validatorModule: "0xde896C58163b5f6cAC5B16C1b0109843f26106F6",
+          validatorModule: contracts.erc8004ValidationModule,
         });
 
         let result;
@@ -1095,6 +1157,7 @@ export default function register(api: any) {
           totalBorrowingHeadroom: `$${(Number(maxBorrow.total) / 1e6).toFixed(2)}`,
           positions: positionHealth,
           alerts: alerts.length > 0 ? alerts : ["✅ All positions healthy"],
+          chain: CHAIN_DEFAULTS[cfg.chainId]?.chainName ?? `Chain ${cfg.chainId}`,
           rpcSource: process.env.ALCHEMY_API_KEY ? "Alchemy" :
                      process.env.ANKR_API_KEY ? "Ankr" :
                      process.env.QUICKNODE_URL ? "QuickNode" : "PublicNode (free)",
@@ -1127,10 +1190,14 @@ export default function register(api: any) {
       }
 
       // 2. RPC URL
-      const rpcUrl = resolveRpcUrl();
+      const pluginCfg = api.config?.plugins?.entries?.["agether"]?.config ?? {};
+      const prefChainId = (pluginCfg.chain as ChainId) || ChainId.Ethereum;
+      const chainName = CHAIN_DEFAULTS[prefChainId]?.chainName ?? "Unknown";
+      const rpcUrl = resolveRpcUrl(prefChainId);
       const rpcSource = process.env.ALCHEMY_API_KEY ? "Alchemy" :
                         process.env.ANKR_API_KEY ? "Ankr" :
                         process.env.QUICKNODE_URL ? "QuickNode" : "PublicNode (free fallback)";
+      checks.push({ check: "Chain", status: `✅ ${chainName} (${prefChainId})` });
       checks.push({ check: "RPC endpoint", status: `✅ ${rpcSource}`, detail: rpcUrl.replace(/\/[a-zA-Z0-9_-]{20,}$/, '/***') });
 
       // 3. Agent registration
@@ -1219,17 +1286,28 @@ export default function register(api: any) {
 
   api.registerCommand({
     name: "morpho",
-    description: "Show Morpho positions (no AI)",
+    description: "Show Morpho positions with Health Factor (no AI)",
     handler: async () => {
       try {
         const cfg = getConfig(api);
         const client = createClient(cfg);
-        const s = await client.getStatus();
+        const [s, maxBorrow] = await Promise.all([
+          client.getStatus(),
+          client.getMaxBorrowable(),
+        ]);
 
         let text = `📊 Morpho\nAccount: ${s.agentAccount}\nTotal debt: $${s.totalDebt}\n`;
         for (const p of s.positions) {
-          text += `\n${p.collateralToken}: ${p.collateral} collateral, $${p.debt} debt`;
+          const mm = maxBorrow.byMarket.find((m: any) => m.collateralToken === p.collateralToken);
+          const cv = mm ? Number(mm.collateralValue) / 1e6 : 0;
+          const debt = parseFloat(p.debt);
+          const ltv = cv > 0 ? debt / cv : 0;
+          const hf = ltv > 0 ? 0.80 / ltv : Infinity;
+          const hfStr = debt === 0 ? "∞" : hf.toFixed(2);
+          const icon = debt === 0 ? "🟢" : hf <= 1.0 ? "🔴" : hf <= 1.15 ? "🟡" : "🟢";
+          text += `\n${icon} ${p.collateralToken}: ${p.collateral} col, $${p.debt} debt, HF ${hfStr}`;
         }
+        if (s.positions.length === 0) text += "\nNo active positions.";
         return { text };
       } catch (e: any) {
         return { text: `❌ ${e.message}` };
@@ -1315,8 +1393,9 @@ export default function register(api: any) {
         const balances = await client.getBalances();
         const agentId = balances.agentId ?? "?";
         const safeUsdc = balances.agentAccount?.usdc ?? "0";
+        const chainName = CHAIN_DEFAULTS[cfg.chainId]?.chainName ?? `Chain ${cfg.chainId}`;
         api.logger?.info?.(
-          `[agether] Session start — Agent #${agentId}, EOA: ${balances.eth} ETH / $${balances.usdc} USDC, Safe: $${safeUsdc} USDC`,
+          `[agether] Session start — ${chainName}, Agent #${agentId}, EOA: ${balances.eth} ETH / $${balances.usdc} USDC, Safe: $${safeUsdc} USDC`,
         );
       } catch {
         // Silently fail — hook should not block conversations