@agether/agether 2.6.4 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/agether",
-  "version": "2.6.4",
+  "version": "2.9.0",
   "description": "OpenClaw plugin for Agether — onchain credit for AI agents on Ethereum & Base",
   "main": "src/index.ts",
   "openclaw": {

package/skills/agether/SKILL.md

@@ -460,12 +460,12 @@ Contracts are deployed on both **Ethereum** and **Base** mainnets. The SDK auto-
 
 | Contract | Address |
 |----------|---------|
-| Agether4337Factory | `0x8aeE4961EfaA4a1D36e2b24C5b430C8613fB5b8C` |
-| Agether8004ValidationModule | `0x7B18a7E3D5B3d043FC3525Efcd9a2bB1aE1369Ab` |
-| AgetherHookMultiplexer | `0x2D98eff4b959F3dc76f14c5682A8546438406c4A` |
-| Agether7579Bootstrap | `0x5e8e4644c628CB464936981e338635476d012B5F` |
-| Agether8004Scorer | `0xA1a0B09147688a09A3027F960623Ae16d1ca7F69` |
-| TimelockController | `0x7f104DBe209E2a05FFc1700b27eaE1C397f011c4` |
+| Agether4337Factory | `0x73f4153bf1d46dB203Db27fc8FC942f6279D8d38` |
+| Agether8004ValidationModule | `0x85C8C97cE5AE540a4408D6A77a6D3aFcA9BCdB71` |
+| AgetherHookMultiplexer | `0x688cab46ce5A7450D706e9E3C8e0F31BaEa6c8BE` |
+| Agether7579Bootstrap | `0xbD0BDFE70fDB88fc03F2Ea22B81A2dfc99298E42` |
+| Agether8004Scorer | `0x33eB904fe9975e2D8c577aD7e5B14CefBD4A65E1` |
+| TimelockController | `0xB3FD04f0B7c9DeC7f7B52d5c2CdfdCB3Fc9eE111` |
 | USDC | `0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913` |
 | WETH | `0x4200000000000000000000000000000000000006` |
 | wstETH | `0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452` |
@@ -475,12 +475,12 @@ Contracts are deployed on both **Ethereum** and **Base** mainnets. The SDK auto-
 
 | Contract | Address |
 |----------|---------|
-| Agether4337Factory | `0xE350660Ab3EA87b50233854eacCC6328e268fb48` |
-| Agether8004ValidationModule | `0x87Aa07Be4Ab4A2e8EeBf4a4e2451c775D0e3fbf1` |
-| AgetherHookMultiplexer | `0xC0b96e36B20d6689F4E4b8C7A0c19C28e8B45B8B` |
-| Agether7579Bootstrap | `0xD1268B50149e468591Bcba5f6fD3E87b49D43008` |
-| Agether8004Scorer | `0xd281a8ec667E406Fcf1097A64A65d1C88Fb0F7Fa` |
-| TimelockController | `0x2033CD354aAf19191F23211c6A6974fCE038AFBe` |
+| Agether4337Factory | `0xb6363c2B5C72C14D3fC4261e3dd836D8966bE072` |
+| Agether8004ValidationModule | `0xE282fB8615abb8bA53F07b8BAB2937C78fE3867D` |
+| AgetherHookMultiplexer | `0xeD62ac874F58CEc9F065aB8e6872752Eb0F6eA14` |
+| Agether7579Bootstrap | `0x055C2e70dd011C4ADEEfB795Ab77D74437be6D33` |
+| Agether8004Scorer | `0x960853769d52B14aA0daeab7E1E59f5c9299cb65` |
+| TimelockController | `0x78e0227f9DE577e583B8149C73F0bA1E7200AD01` |
 | USDC | `0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48` |
 | WETH | `0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2` |
 | wstETH | `0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0` |

package/src/index.ts

@@ -1,7 +1,12 @@
 /**
  * Agether OpenClaw Plugin — thin wrapper over @agether/sdk
  *
- * Each tool = MorphoClient / X402Client call → format result with txLink.
+ * Architecture:
+ * - AgetherClient: registration, balances, withdrawals, sponsorship, identity, scoring
+ * - MorphoClient: Morpho Blue lending only (deposit, borrow, repay, supply, withdraw collateral)
+ * - X402Client: HTTP 402 payment protocol
+ *
+ * Each tool = AgetherClient / 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).
@@ -18,6 +23,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import {
+  AgetherClient,
   MorphoClient,
   X402Client,
   ScoringClient,
@@ -192,8 +198,28 @@ function requireChain(cfg: PluginConfig): void {
   }
 }
 
-function createClient(cfg: PluginConfig): MorphoClient {
+/**
+ * Create an AgetherClient for protocol operations (register, balances, withdraw, sponsor).
+ * If agentId is known, creates a client bound to that agent. Otherwise creates an unbound
+ * client (only register() and getBalances() available).
+ */
+function createAgetherClient(cfg: PluginConfig): AgetherClient {
+  const agentId = cachedAgentIds[cfg.chainId] || cfg.agentId;
+  if (agentId) {
+    return AgetherClient.fromPrivateKey(cfg.privateKey, BigInt(agentId), cfg.chainId);
+  }
+  return AgetherClient.fromPrivateKey(cfg.privateKey, cfg.chainId);
+}
+
+/**
+ * Create a MorphoClient for Morpho Blue lending operations.
+ * Requires agentId — use AgetherClient.register() first.
+ */
+function createMorphoClient(cfg: PluginConfig): MorphoClient {
   const agentId = cachedAgentIds[cfg.chainId] || cfg.agentId;
+  if (!agentId) {
+    throw new Error("agentId not set. Register first with agether_register, then try again.");
+  }
   return new MorphoClient({
     privateKey: cfg.privateKey,
     rpcUrl: cfg.rpcUrl,
@@ -202,6 +228,11 @@ function createClient(cfg: PluginConfig): MorphoClient {
   });
 }
 
+/** @deprecated Use createAgetherClient or createMorphoClient instead */
+function createClient(cfg: PluginConfig): MorphoClient {
+  return createMorphoClient(cfg);
+}
+
 /** Persist agentId to openclaw.json so it survives restarts. */
 function persistAgentId(agentId: string): string {
   cachedAgentIds[activeChainId] = agentId;
@@ -263,7 +294,7 @@ export default function register(api: any) {
     async execute() {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const result = await client.getBalances();
         return ok(JSON.stringify(result, null, 2));
       } catch (e) { return fail(e); }
@@ -281,16 +312,16 @@ export default function register(api: any) {
     parameters: {
       type: "object",
       properties: {
-        name: { type: "string", description: "Agent display name" },
+        name: { type: "string", description: "Agent display name (informational only)" },
       },
-      required: ["name"],
+      required: [],
     },
-    async execute(_id: string, params: { name: string }) {
+    async execute(_id: string, _params: { name?: string }) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
-        const result = await client.register(params.name);
+        const client = createAgetherClient(cfg);
+        const result = await client.register();
         const persistStatus = persistAgentId(result.agentId);
         const kyaMessage = result.kyaRequired
           ? "⚠️ KYA required: submit your agent code hash for review before using credit"
@@ -328,11 +359,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         // Verify onchain that this agentId exists and belongs to this wallet
-        const client = new MorphoClient({
-          privateKey: cfg.privateKey,
-          rpcUrl: cfg.rpcUrl,
-          agentId: params.agentId,
-        });
+        const client = AgetherClient.fromPrivateKey(cfg.privateKey, BigInt(params.agentId), cfg.chainId);
         const acctAddr = await client.getAccountAddress();
         const persistStatus = persistAgentId(params.agentId);
         return ok(JSON.stringify({
@@ -403,7 +430,7 @@ export default function register(api: any) {
     async execute() {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const required = await client.isKyaRequired();
         return ok(
           required
@@ -438,7 +465,6 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
 
         // Build the calldata for ERC8004ValidationModule.setValidationRegistry — the owner (Timelock) must execute it
         const { ethers } = await import("ethers");
@@ -486,7 +512,7 @@ export default function register(api: any) {
     async execute() {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const [status, maxBorrow] = await Promise.all([
           client.getStatus(),
           client.getMaxBorrowable(),
@@ -548,7 +574,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.supplyCollateral(params.token, params.amount);
         return ok(JSON.stringify({
           status: "deposited",
@@ -581,7 +607,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.depositAndBorrow(
           params.token,
           params.collateralAmount,
@@ -602,17 +628,17 @@ export default function register(api: any) {
   //  TOOL: morpho_sponsor
   // ═══════════════════════════════════════════════════════
   api.registerTool({
-    name: "morpho_sponsor",
+    name: "agether_sponsor",
     description:
-      "Transfer collateral tokens to another agent's AgentAccount. " +
-      "The target agent can then supply the collateral to Morpho Blue themselves.",
+      "Transfer tokens to another agent's Safe account (or any address). " +
+      "The target agent can then supply the tokens to Morpho Blue or use them directly.",
     parameters: {
       type: "object",
       properties: {
         agentId: { type: "string", description: "Target agent's ERC-8004 ID (e.g. '17676')" },
-        agentAddress: { type: "string", description: "Target AgentAccount address (alternative to agentId)" },
-        amount: { type: "string", description: "Collateral amount (e.g. '0.05')" },
-        token: { type: "string", description: "Collateral token" },
+        agentAddress: { type: "string", description: "Target account address (alternative to agentId)" },
+        amount: { type: "string", description: "Token amount (e.g. '0.05')" },
+        token: { type: "string", description: "Token to send (e.g. 'WETH', 'USDC')" },
       },
       required: ["amount", "token"],
     },
@@ -621,7 +647,7 @@ export default function register(api: any) {
         if (!params.agentId && !params.agentAddress) return fail("Provide either agentId or agentAddress");
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
 
         const target = params.agentId
           ? { agentId: params.agentId }
@@ -632,7 +658,7 @@ export default function register(api: any) {
           status: "sponsored",
           target: result.targetAccount,
           targetAgentId: result.targetAgentId || "by address",
-          collateral: `${params.amount} ${params.token}`,
+          amount: `${params.amount} ${params.token}`,
           tx: txLink(result.tx),
         }));
       } catch (e) { return fail(e); }
@@ -659,7 +685,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.borrow(params.amount, params.token);
         return ok(JSON.stringify({
           status: "borrowed",
@@ -692,7 +718,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.repay(params.amount, params.token);
         return ok(JSON.stringify({
           status: "repaid",
@@ -726,7 +752,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         // Default: keep in AgentAccount. toEoa=true → send to EOA.
         const receiver = params.toEoa ? await client.getSignerAddress() : await client.getAccountAddress();
         const result = await client.withdrawCollateral(params.token, params.amount, undefined, receiver);
@@ -767,7 +793,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.supplyAsset(params.amount, params.market);
         return ok(JSON.stringify({
           status: "supplied",
@@ -804,7 +830,7 @@ export default function register(api: any) {
     async execute(_id: string, params: { market?: string }) {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const positions = await client.getSupplyPositions(params.market);
 
         if (positions.length === 0) {
@@ -860,7 +886,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         // Default: keep in AgentAccount. toEoa=true → send to EOA.
         const receiver = params.toEoa ? await client.getSignerAddress() : await client.getAccountAddress();
         const result = await client.withdrawSupply(params.amount, params.market, receiver);
@@ -893,7 +919,7 @@ export default function register(api: any) {
     async execute(_id: string, params: { token?: string }) {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const rates = await client.getMarketRates(params.token);
 
         if (rates.length === 0) return ok("No markets found.");
@@ -933,8 +959,8 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
-        const agentId = client.getAgentId();
+        const client = createAgetherClient(cfg);
+        const agentId = client.getAgentId().toString();
 
         if (params.refresh) {
           // x402-gated fresh score via ScoringClient
@@ -983,13 +1009,12 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const result = await client.fundAccount(params.amount);
         return ok(JSON.stringify({
           status: "funded",
           amount: `$${params.amount}`,
-          agentAccount: result.agentAccount,
-          tx: txLink(result.tx),
+          tx: txLink(result.txHash),
         }));
       } catch (e) { return fail(e); }
     },
@@ -1016,7 +1041,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const result = await client.withdrawToken(params.token, params.amount);
         return ok(JSON.stringify({
           status: "withdrawn",
@@ -1048,7 +1073,7 @@ export default function register(api: any) {
       try {
         const cfg = getConfig(api);
         requireChain(cfg);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const result = await client.withdrawEth(params.amount);
         return ok(JSON.stringify({
           status: "withdrawn",
@@ -1084,13 +1109,13 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         requireChain(cfg);
         const agetherCfg = api.config?.plugins?.entries?.agether?.config || {};
-        const client = createClient(cfg);
+        const agether = createAgetherClient(cfg);
 
         let accountAddress: string | undefined;
         let agentId: string | undefined;
         try {
-          agentId = client.getAgentId();
-          accountAddress = await client.getAccountAddress();
+          agentId = agether.getAgentId().toString();
+          accountAddress = await agether.getAccountAddress();
         } catch (e) {
           console.warn('[agether] x402_pay: getAccountAddress failed, paying from EOA:', e instanceof Error ? e.message : e);
         }
@@ -1117,8 +1142,9 @@ export default function register(api: any) {
         let result;
         if ((autoDrawEnabled || autoYieldEnabled) && agentId) {
           // Use payWithAutoDraw which handles waterfall: balance → yield → borrow
+          const morpho = createMorphoClient(cfg);
           const fetchOpts: any = {
-            morphoClient: client,
+            morphoClient: morpho,
           };
           if (params.method?.toUpperCase() === "POST" && params.body) {
             fetchOpts.method = "POST";
@@ -1172,7 +1198,7 @@ export default function register(api: any) {
     async execute() {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const result = await client.getMaxBorrowable();
 
         const formatted = {
@@ -1205,13 +1231,14 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const agetherCfg = api.config?.plugins?.entries?.agether?.config ?? {};
         const healthThreshold = agetherCfg.healthAlertThreshold ?? 70;
-        const client = createClient(cfg);
+        const agether = createAgetherClient(cfg);
+        const morpho = createMorphoClient(cfg);
 
         // Gather everything in parallel where possible
         const [balances, status, maxBorrow] = await Promise.all([
-          client.getBalances(),
-          client.getStatus(),
-          client.getMaxBorrowable(),
+          agether.getBalances(),
+          morpho.getStatus(),
+          morpho.getMaxBorrowable(),
         ]);
 
         // Build per-position health analysis
@@ -1330,7 +1357,7 @@ export default function register(api: any) {
       // 3. Agent registration
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const balances = await client.getBalances();
 
         if (balances.agentId && balances.agentId !== '?') {
@@ -1375,7 +1402,7 @@ export default function register(api: any) {
     handler: async () => {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const b = await client.getBalances();
 
         const nz = (v: string) => parseFloat(v) > 0;
@@ -1417,7 +1444,7 @@ export default function register(api: any) {
     handler: async () => {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const [s, maxBorrow] = await Promise.all([
           client.getStatus(),
           client.getMaxBorrowable(),
@@ -1450,12 +1477,13 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const agetherCfg = api.config?.plugins?.entries?.agether?.config ?? {};
         const healthThreshold = agetherCfg.healthAlertThreshold ?? 70;
-        const client = createClient(cfg);
+        const agether = createAgetherClient(cfg);
+        const morpho = createMorphoClient(cfg);
 
         const [balances, status, maxBorrow] = await Promise.all([
-          client.getBalances(),
-          client.getStatus(),
-          client.getMaxBorrowable(),
+          agether.getBalances(),
+          morpho.getStatus(),
+          morpho.getMaxBorrowable(),
         ]);
 
         let text = `🏥 Health — Agent #${balances.agentId}\n`;
@@ -1489,7 +1517,7 @@ export default function register(api: any) {
     handler: async () => {
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createMorphoClient(cfg);
         const rates = await client.getMarketRates();
 
         if (rates.length === 0) return { text: "No markets found." };
@@ -1516,7 +1544,7 @@ export default function register(api: any) {
       // starts with awareness of the current state.
       try {
         const cfg = getConfig(api);
-        const client = createClient(cfg);
+        const client = createAgetherClient(cfg);
         const balances = await client.getBalances();
         const agentId = balances.agentId ?? "?";
         const safeUsdc = balances.agentAccount?.usdc ?? "0";