@agether/sdk 1.11.2 → 2.0.0

package/dist/cli.js

@@ -47,7 +47,7 @@ var init_types = __esm({
 });
 
 // src/utils/abis.ts
-var IDENTITY_REGISTRY_ABI, ACCOUNT_FACTORY_ABI, AGENT_ACCOUNT_ABI, AGENT_REPUTATION_ABI, MORPHO_BLUE_ABI, ERC20_ABI, KYA_HOOK_ABI;
+var IDENTITY_REGISTRY_ABI, SAFE_AGENT_FACTORY_ABI, ACCOUNT_FACTORY_ABI, ERC8004_VALIDATION_MODULE_ABI, AGENT_REPUTATION_ABI, MORPHO_BLUE_ABI, ERC20_ABI, ENTRYPOINT_V07_ABI, SAFE7579_ACCOUNT_ABI;
 var init_abis = __esm({
   "src/utils/abis.ts"() {
     "use strict";
@@ -59,38 +59,34 @@ var init_abis = __esm({
       "function register() returns (uint256 agentId)",
       "event Transfer(address indexed from, address indexed to, uint256 indexed tokenId)"
     ];
-    ACCOUNT_FACTORY_ABI = [
+    SAFE_AGENT_FACTORY_ABI = [
       "function getAccount(uint256 agentId) view returns (address)",
       "function accountExists(uint256 agentId) view returns (bool)",
-      "function predictAddress(uint256 agentId) view returns (address)",
       "function totalAccounts() view returns (uint256)",
       "function getAgentId(address account) view returns (uint256)",
-      "function createAccount(uint256 agentId) returns (address account)",
-      "function protocolHook() view returns (address)",
+      "function getAgentIdByIndex(uint256 index) view returns (uint256)",
+      "function getAllAgentIds() view returns (uint256[])",
+      "function createAccount(uint256 agentId) returns (address safeAccount)",
       "function identityRegistry() view returns (address)",
-      "event AccountCreated(uint256 indexed agentId, address indexed account, address indexed owner)"
+      "function validationModule() view returns (address)",
+      "function hookMultiplexer() view returns (address)",
+      "function safeSingleton() view returns (address)",
+      "function safe7579() view returns (address)",
+      "function bootstrap() view returns (address)",
+      "function SENTINEL_OWNER() view returns (address)",
+      "event AccountCreated(uint256 indexed agentId, address indexed safeAccount, address indexed owner)"
     ];
-    AGENT_ACCOUNT_ABI = [
-      "function agentId() view returns (uint256)",
+    ACCOUNT_FACTORY_ABI = SAFE_AGENT_FACTORY_ABI;
+    ERC8004_VALIDATION_MODULE_ABI = [
+      // View
+      "function getConfig(address account) view returns (address registry, uint256 agentId)",
+      "function getOwner(address account) view returns (address)",
+      "function isInstalled(address account) view returns (bool)",
+      "function isKYAApproved(address account) view returns (bool)",
+      "function validationRegistry() view returns (address)",
       "function owner() view returns (address)",
-      "function factory() view returns (address)",
-      "function identityRegistry() view returns (address)",
-      "function balanceOf(address token) view returns (uint256)",
-      "function ethBalance() view returns (uint256)",
-      // ERC-7579 execution
-      "function execute(bytes32 mode, bytes executionCalldata) payable",
-      "function executeFromExecutor(bytes32 mode, bytes executionCalldata) payable returns (bytes[])",
-      // ERC-7579 module management
-      "function installModule(uint256 moduleTypeId, address module, bytes initData) payable",
-      "function uninstallModule(uint256 moduleTypeId, address module, bytes deInitData) payable",
-      "function isModuleInstalled(uint256 moduleTypeId, address module, bytes additionalContext) view returns (bool)",
-      "function hook() view returns (address)",
-      // Funding (direct, no execution needed)
-      "function fund(address token, uint256 amount)",
-      "function withdraw(address token, uint256 amount, address to)",
-      "function withdrawETH(uint256 amount, address to)",
-      // EIP-1271
-      "function isValidSignature(bytes32 hash, bytes signature) view returns (bytes4)"
+      // Admin (via TimelockController)
+      "function setValidationRegistry(address registry_)"
     ];
     AGENT_REPUTATION_ABI = [
       "function getCreditScore(uint256 agentId) view returns (uint256)",
@@ -130,9 +126,22 @@ var init_abis = __esm({
       "function symbol() view returns (string)",
       "function name() view returns (string)"
     ];
-    KYA_HOOK_ABI = [
-      "function validationRegistry() view returns (address)",
-      "function setValidationRegistry(address newRegistry)"
+    ENTRYPOINT_V07_ABI = [
+      "function handleOps(tuple(address sender, uint256 nonce, bytes initCode, bytes callData, bytes32 accountGasLimits, uint256 preVerificationGas, bytes32 gasFees, bytes paymasterAndData, bytes signature)[] ops, address payable beneficiary)",
+      "function getUserOpHash(tuple(address sender, uint256 nonce, bytes initCode, bytes callData, bytes32 accountGasLimits, uint256 preVerificationGas, bytes32 gasFees, bytes paymasterAndData, bytes signature) userOp) view returns (bytes32)",
+      "function getNonce(address sender, uint192 key) view returns (uint256 nonce)",
+      "function balanceOf(address account) view returns (uint256)",
+      "function depositTo(address account) payable",
+      "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)"
+    ];
+    SAFE7579_ACCOUNT_ABI = [
+      // ERC-7579 execution (called via UserOp through Safe7579 fallback)
+      "function execute(bytes32 mode, bytes executionCalldata) payable",
+      "function executeFromExecutor(bytes32 mode, bytes executionCalldata) payable returns (bytes[])",
+      // ERC-7579 module queries
+      "function isModuleInstalled(uint256 moduleTypeId, address module, bytes additionalContext) view returns (bool)",
+      // EIP-1271
+      "function isValidSignature(bytes32 hash, bytes signature) view returns (bytes4)"
     ];
   }
 });
@@ -146,56 +155,99 @@ function getDefaultConfig(chainId) {
     scoringEndpoint: SCORING_ENDPOINTS[chainId]
   };
 }
-var CONTRACT_ADDRESSES, RPC_URLS, SCORING_ENDPOINTS;
+var ZERO, ENTRYPOINT_V07, ERC8004_IDENTITY_REGISTRY, ERC8004_IDENTITY_REGISTRY_TESTNET, MORPHO_BLUE, SAFE_SINGLETON, SAFE_PROXY_FACTORY, SAFE7579, CONTRACT_ADDRESSES, RPC_URLS, SCORING_ENDPOINTS;
 var init_config = __esm({
   "src/utils/config.ts"() {
     "use strict";
     init_types();
+    ZERO = "0x0000000000000000000000000000000000000000";
+    ENTRYPOINT_V07 = "0x0000000071727De22E5E9d8BAf0edAc6f37da032";
+    ERC8004_IDENTITY_REGISTRY = "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432";
+    ERC8004_IDENTITY_REGISTRY_TESTNET = "0x8004A818BFB912233c491871b3d84c89A494BD9e";
+    MORPHO_BLUE = "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
+    SAFE_SINGLETON = "0x41675C099F32341bf84BFc5382aF534df5C7461a";
+    SAFE_PROXY_FACTORY = "0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67";
+    SAFE7579 = "0x7579EE8307284F293B1927136486880611F20002";
     CONTRACT_ADDRESSES = {
       [1 /* Ethereum */]: {
-        accountFactory: "0x0000000000000000000000000000000000000000",
-        validationRegistry: "0x0000000000000000000000000000000000000000",
-        agentReputation: "0x0000000000000000000000000000000000000000",
-        kyaHook: "0x0000000000000000000000000000000000000000",
+        safeSingleton: SAFE_SINGLETON,
+        safeProxyFactory: SAFE_PROXY_FACTORY,
+        safe7579: SAFE7579,
+        entryPoint: ENTRYPOINT_V07,
+        safeAgentFactory: ZERO,
+        safe7579Bootstrap: ZERO,
+        erc8004ValidationModule: ZERO,
+        hookMultiplexer: ZERO,
+        validationRegistry: ZERO,
+        agentReputation: ZERO,
+        timelockController: ZERO,
         usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
-        morphoBlue: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"
+        identityRegistry: ERC8004_IDENTITY_REGISTRY,
+        morphoBlue: MORPHO_BLUE
       },
       [8453 /* Base */]: {
-        accountFactory: "0x89a8758E60A56EcB47247D92E05447eFd450d6Bf",
-        validationRegistry: "0x6f76cF69B71Dc5F9A414BCEe4583b12738E47985",
-        agentReputation: "0xe88f3419a2dbac70e3aF6E487b0C63e8301C6A87",
-        kyaHook: "0x28e50Aa9eD517E369b2806928709B44062aD9821",
+        safeSingleton: SAFE_SINGLETON,
+        safeProxyFactory: SAFE_PROXY_FACTORY,
+        safe7579: SAFE7579,
+        entryPoint: ENTRYPOINT_V07,
+        safeAgentFactory: "0xB0A88ffe28491E793F7706829278f20d724947d1",
+        safe7579Bootstrap: "0x72A636bc23B2644138489c3bBE3B05a0a7184b33",
+        erc8004ValidationModule: "0x49e27A6B4d012B87271897b51d0296ABcFCb0BBd",
+        hookMultiplexer: "0x12c77f17F91f06a11C2C34C618ce9d78f9a34541",
+        validationRegistry: "0x88E21e8883c093E4c8d0d0cE68f1c93Cf6190f51",
+        agentReputation: "0x4C2d42cbD35f6541f0902499CFEC27C1Cf5683E3",
+        timelockController: "0x0517b4f73b61774C88A2B1c5745141315E831015",
         usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-        identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
-        morphoBlue: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"
+        identityRegistry: ERC8004_IDENTITY_REGISTRY,
+        morphoBlue: MORPHO_BLUE
       },
       [84532 /* BaseSepolia */]: {
-        accountFactory: "0x0000000000000000000000000000000000000000",
-        validationRegistry: "0x0000000000000000000000000000000000000000",
-        agentReputation: "0x0000000000000000000000000000000000000000",
-        kyaHook: "0x0000000000000000000000000000000000000000",
+        safeSingleton: SAFE_SINGLETON,
+        safeProxyFactory: SAFE_PROXY_FACTORY,
+        safe7579: SAFE7579,
+        entryPoint: ENTRYPOINT_V07,
+        safeAgentFactory: ZERO,
+        safe7579Bootstrap: ZERO,
+        erc8004ValidationModule: ZERO,
+        hookMultiplexer: ZERO,
+        validationRegistry: ZERO,
+        agentReputation: ZERO,
+        timelockController: ZERO,
         usdc: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-        identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
-        morphoBlue: "0x0000000000000000000000000000000000000000"
+        identityRegistry: ERC8004_IDENTITY_REGISTRY_TESTNET,
+        morphoBlue: ZERO
       },
       [11155111 /* Sepolia */]: {
-        accountFactory: "0x0000000000000000000000000000000000000000",
-        validationRegistry: "0x0000000000000000000000000000000000000000",
-        agentReputation: "0x0000000000000000000000000000000000000000",
-        kyaHook: "0x0000000000000000000000000000000000000000",
+        safeSingleton: SAFE_SINGLETON,
+        safeProxyFactory: SAFE_PROXY_FACTORY,
+        safe7579: SAFE7579,
+        entryPoint: ENTRYPOINT_V07,
+        safeAgentFactory: ZERO,
+        safe7579Bootstrap: ZERO,
+        erc8004ValidationModule: ZERO,
+        hookMultiplexer: ZERO,
+        validationRegistry: ZERO,
+        agentReputation: ZERO,
+        timelockController: ZERO,
         usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
-        identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
-        morphoBlue: "0x0000000000000000000000000000000000000000"
+        identityRegistry: ERC8004_IDENTITY_REGISTRY_TESTNET,
+        morphoBlue: ZERO
       },
       [31337 /* Hardhat */]: {
-        accountFactory: "0x0000000000000000000000000000000000000000",
-        validationRegistry: "0x0000000000000000000000000000000000000000",
-        agentReputation: "0x0000000000000000000000000000000000000000",
-        kyaHook: "0x0000000000000000000000000000000000000000",
+        safeSingleton: SAFE_SINGLETON,
+        safeProxyFactory: SAFE_PROXY_FACTORY,
+        safe7579: SAFE7579,
+        entryPoint: ENTRYPOINT_V07,
+        safeAgentFactory: ZERO,
+        safe7579Bootstrap: ZERO,
+        erc8004ValidationModule: ZERO,
+        hookMultiplexer: ZERO,
+        validationRegistry: ZERO,
+        agentReputation: ZERO,
+        timelockController: ZERO,
         usdc: "0x56d4d6aEe0278c5Df2FA23Ecb32eC146C9446FDf",
-        identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
-        morphoBlue: "0x0000000000000000000000000000000000000000"
+        identityRegistry: ERC8004_IDENTITY_REGISTRY,
+        morphoBlue: ZERO
       }
     };
     RPC_URLS = {
@@ -270,27 +322,24 @@ var init_MorphoClient = __esm({
           this._eoaAddress = wallet.address;
         }
         const addrs = { ...defaultCfg.contracts, ...config.contracts };
-        this.accountFactory = new import_ethers.Contract(addrs.accountFactory, ACCOUNT_FACTORY_ABI, this._signer);
+        this.safeAgentFactory = new import_ethers.Contract(addrs.safeAgentFactory, ACCOUNT_FACTORY_ABI, this._signer);
         this.morphoBlue = new import_ethers.Contract(addrs.morphoBlue, MORPHO_BLUE_ABI, this.provider);
         this.agentReputation = new import_ethers.Contract(addrs.agentReputation, AGENT_REPUTATION_ABI, this._signer);
         this.identityRegistry = new import_ethers.Contract(addrs.identityRegistry, IDENTITY_REGISTRY_ABI, this._signer);
+        this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+        this.validationModule = new import_ethers.Contract(addrs.erc8004ValidationModule, ERC8004_VALIDATION_MODULE_ABI, this.provider);
       }
       // ════════════════════════════════════════════════════════
       //  KYA Gate Check
       // ════════════════════════════════════════════════════════
       /**
        * Check whether the KYA (Know Your Agent) code verification gate is active.
-       * Reads the account's installed hook and checks if it has a non-zero
-       * validationRegistry — when set, the hook enforces KYA code approval.
+       * Reads the ERC8004ValidationModule's validationRegistry — when set to
+       * a non-zero address, the module enforces KYA code approval.
        */
       async isKyaRequired() {
         try {
-          const acctAddr = await this.getAccountAddress();
-          const account = new import_ethers.Contract(acctAddr, AGENT_ACCOUNT_ABI, this.provider);
-          const hookAddr = await account.hook();
-          if (hookAddr === import_ethers.ethers.ZeroAddress) return false;
-          const hook = new import_ethers.Contract(hookAddr, KYA_HOOK_ABI, this.provider);
-          const registryAddr = await hook.validationRegistry();
+          const registryAddr = await this.validationModule.validationRegistry();
           return registryAddr !== import_ethers.ethers.ZeroAddress;
         } catch {
           return false;
@@ -307,7 +356,7 @@ var init_MorphoClient = __esm({
         let lastErr;
         for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
           try {
-            const addr = await this.accountFactory.getAccount(BigInt(this.agentId));
+            const addr = await this.safeAgentFactory.getAccount(BigInt(this.agentId));
             if (addr === import_ethers.ethers.ZeroAddress) {
               throw new AgetherError("No AgentAccount found. Call register() first.", "NO_ACCOUNT");
             }
@@ -385,9 +434,9 @@ var init_MorphoClient = __esm({
       async register(_name) {
         const eoaAddr = await this.getSignerAddress();
         if (this.agentId) {
-          const exists = await this.accountFactory.accountExists(BigInt(this.agentId));
+          const exists = await this.safeAgentFactory.accountExists(BigInt(this.agentId));
           if (exists) {
-            const acct = await this.accountFactory.getAccount(BigInt(this.agentId));
+            const acct = await this.safeAgentFactory.getAccount(BigInt(this.agentId));
             this._accountAddress = acct;
             const kyaRequired2 = await this.isKyaRequired();
             return { agentId: this.agentId, address: eoaAddr, agentAccount: acct, alreadyRegistered: true, kyaRequired: kyaRequired2 };
@@ -405,15 +454,15 @@ var init_MorphoClient = __esm({
           agentId = await this._mintNewIdentity();
         }
         this.agentId = agentId.toString();
-        const acctExists = await this.accountFactory.accountExists(agentId);
+        const acctExists = await this.safeAgentFactory.accountExists(agentId);
         let txHash;
         if (!acctExists) {
-          const tx = await this.accountFactory.createAccount(agentId);
+          const tx = await this.safeAgentFactory.createAccount(agentId);
           const receipt = await tx.wait();
           this._refreshSigner();
           txHash = receipt.hash;
         }
-        const acctAddr = await this.accountFactory.getAccount(agentId);
+        const acctAddr = await this.safeAgentFactory.getAccount(agentId);
         this._accountAddress = acctAddr;
         const kyaRequired = await this.isKyaRequired();
         return {
@@ -1140,7 +1189,7 @@ var init_MorphoClient = __esm({
         if (target.address) {
           targetAddr = target.address;
         } else if (target.agentId) {
-          targetAddr = await this.accountFactory.getAccount(BigInt(target.agentId));
+          targetAddr = await this.safeAgentFactory.getAccount(BigInt(target.agentId));
           if (targetAddr === import_ethers.ethers.ZeroAddress) throw new AgetherError("Target agent has no account", "NO_ACCOUNT");
         } else {
           throw new AgetherError("Provide agentId or address", "INVALID_TARGET");
@@ -1193,7 +1242,9 @@ var init_MorphoClient = __esm({
       _refreshSigner() {
         if (this._useExternalSigner) {
           const addrs = this.config.contracts;
-          this.accountFactory = new import_ethers.Contract(addrs.accountFactory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.safeAgentFactory = new import_ethers.Contract(addrs.safeAgentFactory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+          this.validationModule = new import_ethers.Contract(addrs.erc8004ValidationModule, ERC8004_VALIDATION_MODULE_ABI, this.provider);
           this.agentReputation = new import_ethers.Contract(addrs.agentReputation, AGENT_REPUTATION_ABI, this._signer);
           this.identityRegistry = new import_ethers.Contract(addrs.identityRegistry, IDENTITY_REGISTRY_ABI, this._signer);
         } else {
@@ -1202,57 +1253,87 @@ var init_MorphoClient = __esm({
           this._signer = wallet;
           this._eoaAddress = wallet.address;
           const addrs = this.config.contracts;
-          this.accountFactory = new import_ethers.Contract(addrs.accountFactory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.safeAgentFactory = new import_ethers.Contract(addrs.safeAgentFactory, ACCOUNT_FACTORY_ABI, this._signer);
+          this.entryPoint = new import_ethers.Contract(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+          this.validationModule = new import_ethers.Contract(addrs.erc8004ValidationModule, ERC8004_VALIDATION_MODULE_ABI, this.provider);
           this.agentReputation = new import_ethers.Contract(addrs.agentReputation, AGENT_REPUTATION_ABI, this._signer);
           this.identityRegistry = new import_ethers.Contract(addrs.identityRegistry, IDENTITY_REGISTRY_ABI, this._signer);
         }
       }
+      // ────────────────────────────────────────────────────────────
+      //  ERC-4337 UserOp helpers (Safe + Safe7579 + EntryPoint v0.7)
+      // ────────────────────────────────────────────────────────────
       /**
-       * Execute a single call via AgentAccount.execute (ERC-7579 single mode).
+       * Pack two uint128 values into a single bytes32:
+       *   bytes32 = (hi << 128) | lo
+       */
+      _packUint128(hi, lo) {
+        return import_ethers.ethers.zeroPadValue(import_ethers.ethers.toBeHex(hi << 128n | lo), 32);
+      }
+      /**
+       * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
+       *
+       * @param callData – the ABI-encoded calldata for the Safe7579 account
+       *   (e.g. `execute(mode, executionCalldata)`)
+       * @returns the transaction receipt of the handleOps call
+       */
+      async _submitUserOp(callData) {
+        const sender = await this.getAccountAddress();
+        const nonce = await this.entryPoint.getNonce(sender, 0);
+        const feeData = await this.provider.getFeeData();
+        const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers.ethers.parseUnits("0.5", "gwei");
+        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers.ethers.parseUnits("0.1", "gwei");
+        const verificationGasLimit = 500000n;
+        const callGasLimit = 800000n;
+        const preVerificationGas = 100000n;
+        const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
+        const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+        const userOp = {
+          sender,
+          nonce,
+          initCode: "0x",
+          callData,
+          accountGasLimits,
+          preVerificationGas,
+          gasFees,
+          paymasterAndData: "0x",
+          signature: "0x"
+          // placeholder — replaced after signing
+        };
+        const userOpHash = await this.entryPoint.getUserOpHash(userOp);
+        const signature = await this._signer.signMessage(import_ethers.ethers.getBytes(userOpHash));
+        userOp.signature = signature;
+        const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
+        const receipt = await tx.wait();
+        this._refreshSigner();
+        return receipt;
+      }
+      /**
+       * Execute a single call via Safe7579 account (ERC-7579 single mode)
+       * through an ERC-4337 UserOperation.
        */
       async exec(target, data, value = 0n) {
-        const acctAddr = await this.getAccountAddress();
-        const account = new import_ethers.Contract(acctAddr, AGENT_ACCOUNT_ABI, this._signer);
         const executionCalldata = import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
           ["address", "uint256", "bytes"],
           [target, value, data]
         );
-        let gasLimit;
-        try {
-          const estimate = await account.execute.estimateGas(MODE_SINGLE, executionCalldata);
-          gasLimit = estimate * 130n / 100n;
-        } catch (e) {
-          console.warn("[agether] exec gas estimation failed, using default 500k:", e instanceof Error ? e.message : e);
-          gasLimit = 500000n;
-        }
-        const tx = await account.execute(MODE_SINGLE, executionCalldata, { gasLimit });
-        const receipt = await tx.wait();
-        this._refreshSigner();
-        return receipt;
+        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
+        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE, executionCalldata]);
+        return this._submitUserOp(callData);
       }
       /**
-       * Execute multiple calls via AgentAccount.execute (ERC-7579 batch mode).
+       * Execute multiple calls via Safe7579 account (ERC-7579 batch mode)
+       * through an ERC-4337 UserOperation.
        */
       async batch(targets, values, datas) {
-        const acctAddr = await this.getAccountAddress();
-        const account = new import_ethers.Contract(acctAddr, AGENT_ACCOUNT_ABI, this._signer);
         const executions = targets.map((t, i) => [t, values[i], datas[i]]);
         const executionCalldata = import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
           ["(address,uint256,bytes)[]"],
           [executions]
         );
-        let gasLimit;
-        try {
-          const estimate = await account.execute.estimateGas(MODE_BATCH, executionCalldata);
-          gasLimit = estimate * 130n / 100n;
-        } catch (e) {
-          console.warn("[agether] batch gas estimation failed, using default 800k:", e instanceof Error ? e.message : e);
-          gasLimit = 800000n;
-        }
-        const tx = await account.execute(MODE_BATCH, executionCalldata, { gasLimit });
-        const receipt = await tx.wait();
-        this._refreshSigner();
-        return receipt;
+        const safe7579Iface = new import_ethers.ethers.Interface(SAFE7579_ACCOUNT_ABI);
+        const callData = safe7579Iface.encodeFunctionData("execute", [MODE_BATCH, executionCalldata]);
+        return this._submitUserOp(callData);
       }
       /** Convert MorphoMarketParams to Solidity tuple. */
       _toTuple(p) {
@@ -1753,10 +1834,10 @@ async function cmdRegister(name) {
     process.exit(1);
   }
   const registryAddr = contracts.agentRegistry || contracts.identityRegistry;
-  const factoryAddr = contracts.accountFactory;
+  const factoryAddr = contracts.safeAgentFactory || contracts.accountFactory;
   const validationAddr = contracts.validationRegistry;
   if (!registryAddr || !factoryAddr) {
-    console.error("        \u274C Backend missing agentRegistry or accountFactory");
+    console.error("        \u274C Backend missing agentRegistry or safeAgentFactory");
     process.exit(1);
   }
   console.log("  [2/4] Registering on ERC-8004 IdentityRegistry...");
@@ -1839,7 +1920,7 @@ async function cmdRegister(name) {
   } else {
     console.log("  [3/4] Skipping USDC mint (real network)");
   }
-  console.log("  [4/4] Creating AgentAccount...");
+  console.log("  [4/4] Creating Safe account...");
   if (factoryAddr) {
     const factory = new import_ethers2.ethers.Contract(factoryAddr, ACCOUNT_FACTORY_ABI2, signer);
     try {
@@ -2109,14 +2190,14 @@ async function cmdX402Call(url, method = "GET", body) {
 }
 function cmdHelp() {
   console.log(`
-\u{1F3E6} Agether CLI \u2014 Direct Morpho Blue Credit for AI Agents
+\u{1F3E6} Agether CLI \u2014 Direct Morpho Blue Credit for AI Agents (Safe + Safe7579)
 
 USAGE:
   agether <command> [options]
 
 SETUP:
   init <private-key> [--agent-id <id>]    Initialize with private key
-  register [--name <n>]                   Register ERC-8004 + create AgentAccount
+  register [--name <n>]                   Register ERC-8004 + create Safe account
 
 INFO:
   balance                                 Check ETH + USDC balances
@@ -2132,7 +2213,7 @@ MORPHO LENDING:
   repay --amount <usd> [--token <t>]      Repay borrowed USDC
   withdraw --amount <n> --token <t>       Withdraw collateral (use 'all' for max)
   sponsor --amount <n> --token <t> --agent-id <id>   Send collateral to another agent
-  fund --amount <usd>                     Transfer USDC from EOA to AgentAccount
+  fund --amount <usd>                     Transfer USDC from EOA to Safe account
 
 x402 PAYMENTS:
   x402 <url> [--method GET|POST] [--body <json>]   Make a paid API call