@agether/sdk 2.5.0 → 2.6.1

package/dist/cli.js

@@ -537,6 +537,50 @@ var init_MorphoClient = __esm({
         this._refreshSigner();
         return { tx: receipt.hash, amount: usdcAmount, agentAccount: acctAddr };
       }
+      /**
+       * Withdraw (transfer) a token from AgentAccount to EOA.
+       * Executes an ERC-20 transfer via Safe UserOp.
+       *
+       * @param tokenSymbol - Token to withdraw (e.g. 'USDC', 'WETH', 'wstETH')
+       * @param amount - Amount to withdraw (human-readable, e.g. '100' for 100 USDC, or 'all')
+       */
+      async withdrawToken(tokenSymbol, amount) {
+        const acctAddr = await this.getAccountAddress();
+        const eoaAddr = await this.getSignerAddress();
+        const tokenInfo = await this._resolveToken(tokenSymbol);
+        const tokenContract = new import_ethers.Contract(tokenInfo.address, ERC20_ABI, this.provider);
+        let weiAmount;
+        if (amount === "all") {
+          weiAmount = await tokenContract.balanceOf(acctAddr);
+          if (weiAmount === 0n) throw new AgetherError(`No ${tokenSymbol} in AgentAccount`, "INSUFFICIENT_BALANCE");
+        } else {
+          weiAmount = import_ethers.ethers.parseUnits(amount, tokenInfo.decimals);
+        }
+        const data = erc20Iface.encodeFunctionData("transfer", [eoaAddr, weiAmount]);
+        const receipt = await this.exec(tokenInfo.address, data);
+        const actualAmount = amount === "all" ? import_ethers.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
+        return { tx: receipt.hash, token: tokenSymbol, amount: actualAmount, destination: eoaAddr };
+      }
+      /**
+       * Withdraw ETH from AgentAccount to EOA.
+       * Executes a native ETH transfer via Safe UserOp.
+       *
+       * @param amount - ETH amount (e.g. '0.01' or 'all')
+       */
+      async withdrawEth(amount) {
+        const acctAddr = await this.getAccountAddress();
+        const eoaAddr = await this.getSignerAddress();
+        let weiAmount;
+        if (amount === "all") {
+          weiAmount = await this.provider.getBalance(acctAddr);
+          if (weiAmount === 0n) throw new AgetherError("No ETH in AgentAccount", "INSUFFICIENT_BALANCE");
+        } else {
+          weiAmount = import_ethers.ethers.parseEther(amount);
+        }
+        const receipt = await this.exec(eoaAddr, "0x", weiAmount);
+        const actualAmount = amount === "all" ? import_ethers.ethers.formatEther(weiAmount) : amount;
+        return { tx: receipt.hash, token: "ETH", amount: actualAmount, destination: eoaAddr };
+      }
       // ════════════════════════════════════════════════════════
       //  Market Discovery (Morpho GraphQL API)
       // ════════════════════════════════════════════════════════
@@ -1998,7 +2042,9 @@ var init_X402Client = __esm({
         this.paidFetch = (0, import_fetch.wrapFetchWithPayment)(fetch, client);
         const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
         const dailyLimit = config.dailySpendLimitUsdc ? BigInt(Math.round(parseFloat(config.dailySpendLimitUsdc) * 1e6)) : 0n;
-        this._spendingTracker = { date: today, totalBorrowed: 0n, dailyLimit };
+        const restored = config.initialSpendingState;
+        const restoredBorrowed = restored && restored.date === today ? BigInt(restored.totalBorrowed) : 0n;
+        this._spendingTracker = { date: today, totalBorrowed: restoredBorrowed, dailyLimit };
       }
       async get(url, opts) {
         return this.request(url, { ...opts, method: "GET" });
@@ -2027,66 +2073,120 @@ var init_X402Client = __esm({
         return (Number(remaining > 0n ? remaining : 0n) / 1e6).toFixed(2);
       }
       /**
-       * Pay with auto-draw: Make an x402 request with automatic Morpho borrowing.
+       * Pay with auto-funding: Make an x402 request with automatic USDC sourcing.
        *
-       * Flow:
-       * 1. Check USDC balance on AgentAccount
-       * 2. Probe the URL to discover payment amount (if 402)
-       * 3. If insufficient USDC, calculate deficit
-       * 4. Check spending limit
-       * 5. Borrow from Morpho via MorphoClient
-       * 6. Proceed with x402 payment
+       * Uses a **plan-then-execute** approach: all reads happen first, and if the
+       * full deficit can't be covered the method fails with NO side-effects
+       * (no yield withdrawn, no USDC borrowed).
+       *
+       * Waterfall (when both autoYield + autoDraw enabled):
+       *   1. Check USDC balance on AgentAccount
+       *   2. Probe the URL to discover payment amount (if 402)
+       *   3. If insufficient USDC — PLANNING PHASE (read-only):
+       *      a. Calculate total available yield across supply positions
+       *      b. Calculate max borrowable from Morpho markets
+       *      c. Verify yield + borrow can cover full deficit — if not, fail immediately
+       *   4. EXECUTION PHASE (only if plan is feasible):
+       *      a. Withdraw needed yield from supply positions
+       *      b. Borrow remaining deficit from Morpho
+       *   5. Proceed with x402 payment
        */
       async payWithAutoDraw(url, opts) {
         const { morphoClient, ...fetchOpts } = opts || {};
-        if (!this.config.autoDraw || !morphoClient) {
+        if (!this.config.autoDraw && !this.config.autoYield || !morphoClient) {
           return this.request(url, fetchOpts);
         }
         try {
           const usdcBalance = await morphoClient.getUsdcBalance();
-          console.log(`   [auto-draw] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
+          console.log(`   [auto-fund] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
           const paymentAmount = await this._probePaymentAmount(url, fetchOpts);
           if (paymentAmount !== null) {
-            console.log(`   [auto-draw] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
-            const bufferStr = this.config.autoDrawBuffer || "0.5";
-            const buffer = BigInt(Math.round(parseFloat(bufferStr) * 1e6));
-            const needed = paymentAmount + buffer;
+            console.log(`   [auto-fund] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
+            const needed = paymentAmount;
             if (usdcBalance < needed) {
-              const deficit = needed - usdcBalance;
-              console.log(`   [auto-draw] Insufficient balance. Need to borrow ${(Number(deficit) / 1e6).toFixed(2)} USDC`);
-              const limitCheck = await this._checkSpendingLimit(deficit, morphoClient);
-              if (!limitCheck.allowed) {
-                return {
-                  success: false,
-                  error: `Auto-draw blocked: ${limitCheck.reason}`
-                };
+              const totalDeficit = needed - usdcBalance;
+              console.log(`   [auto-fund] Insufficient balance. Deficit: ${(Number(totalDeficit) / 1e6).toFixed(2)} USDC`);
+              const yieldPlan = [];
+              let totalYieldAvailable = 0n;
+              if (this.config.autoYield) {
+                try {
+                  const positions = await morphoClient.getSupplyPositions();
+                  const withYield = positions.filter((p) => parseFloat(p.earnedYield) > 1e-6).sort((a, b) => parseFloat(b.earnedYield) - parseFloat(a.earnedYield));
+                  for (const pos of withYield) {
+                    const yieldRaw = BigInt(Math.floor(parseFloat(pos.earnedYield) * 1e6));
+                    if (yieldRaw > 0n) {
+                      yieldPlan.push({ collateralToken: pos.collateralToken, amount: yieldRaw });
+                      totalYieldAvailable += yieldRaw;
+                    }
+                  }
+                  console.log(`   [auto-fund] Plan: ${(Number(totalYieldAvailable) / 1e6).toFixed(6)} USDC available from yield`);
+                } catch (e) {
+                  console.warn(`   [auto-fund] Plan: yield check failed: ${e instanceof Error ? e.message : String(e)}`);
+                }
+              }
+              const yieldToUse = totalYieldAvailable < totalDeficit ? totalYieldAvailable : totalDeficit;
+              const deficitAfterYield = totalDeficit - yieldToUse;
+              let canBorrow = 0n;
+              if (this.config.autoDraw && deficitAfterYield > 0n) {
+                const limitCheck = await this._checkSpendingLimit(deficitAfterYield, morphoClient);
+                if (!limitCheck.allowed) {
+                  return { success: false, error: `Auto-fund blocked: ${limitCheck.reason}` };
+                }
+                const maxBorrowable = await morphoClient.getMaxBorrowable();
+                canBorrow = maxBorrowable.total;
+                console.log(`   [auto-fund] Plan: ${(Number(canBorrow) / 1e6).toFixed(2)} USDC borrowable from Morpho`);
               }
-              const maxBorrowable = await morphoClient.getMaxBorrowable();
-              if (maxBorrowable.total < deficit) {
+              const totalAvailable = yieldToUse + canBorrow;
+              if (totalAvailable < totalDeficit) {
+                const parts = [];
+                if (totalYieldAvailable > 0n) parts.push(`yield: $${(Number(totalYieldAvailable) / 1e6).toFixed(2)}`);
+                if (canBorrow > 0n) parts.push(`borrowable: $${(Number(canBorrow) / 1e6).toFixed(2)}`);
+                if (!this.config.autoYield) parts.push("autoYield: off");
+                if (!this.config.autoDraw) parts.push("autoDraw: off");
                 return {
                   success: false,
-                  error: `Auto-draw failed: insufficient collateral. Need ${(Number(deficit) / 1e6).toFixed(2)} USDC but can only borrow ${(Number(maxBorrowable.total) / 1e6).toFixed(2)} USDC more.`
+                  error: `Cannot cover deficit of $${(Number(totalDeficit) / 1e6).toFixed(2)} USDC. Available: ${parts.join(", ")}. Balance: $${(Number(usdcBalance) / 1e6).toFixed(2)}, needed: $${(Number(needed) / 1e6).toFixed(2)}.`
                 };
               }
-              const borrowAmount = (Number(deficit) / 1e6).toFixed(6);
-              console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
-              const borrowResult = await morphoClient.borrow(borrowAmount);
-              console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
-              this._trackSpending(deficit);
-              const result = await this.request(url, fetchOpts);
-              return {
-                ...result,
-                autoDrawInfo: {
-                  borrowed: borrowAmount,
-                  borrowTx: borrowResult.tx,
-                  reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
-                }
+              const drawInfo = {
+                reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
               };
+              if (yieldToUse > 0n) {
+                let remaining = yieldToUse;
+                let totalWithdrawn = 0n;
+                let lastTx = "";
+                for (const plan of yieldPlan) {
+                  if (remaining <= 0n) break;
+                  const toWithdraw = plan.amount < remaining ? plan.amount : remaining;
+                  const withdrawStr = (Number(toWithdraw) / 1e6).toFixed(6);
+                  console.log(`   [auto-yield] Withdrawing $${withdrawStr} yield from ${plan.collateralToken} market`);
+                  const wr = await morphoClient.withdrawSupply(withdrawStr, plan.collateralToken);
+                  lastTx = wr.tx;
+                  totalWithdrawn += toWithdraw;
+                  remaining -= toWithdraw;
+                }
+                if (totalWithdrawn > 0n) {
+                  drawInfo.yieldWithdrawn = (Number(totalWithdrawn) / 1e6).toFixed(6);
+                  drawInfo.yieldTx = lastTx;
+                  console.log(`   [auto-yield] Withdrawn: $${drawInfo.yieldWithdrawn}`);
+                }
+              }
+              if (deficitAfterYield > 0n && this.config.autoDraw) {
+                const borrowAmount = (Number(deficitAfterYield) / 1e6).toFixed(6);
+                console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
+                const borrowResult = await morphoClient.borrow(borrowAmount);
+                console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
+                drawInfo.borrowed = borrowAmount;
+                drawInfo.borrowTx = borrowResult.tx;
+                this._trackSpending(deficitAfterYield);
+              }
+              const result = await this.request(url, fetchOpts);
+              return { ...result, autoDrawInfo: drawInfo };
             }
           }
           return this.request(url, fetchOpts);
         } catch (error) {
-          console.log(`   [auto-draw] Auto-draw check failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
+          console.log(`   [auto-fund] Failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
           return this.request(url, fetchOpts);
         }
       }
@@ -2187,48 +2287,26 @@ var init_X402Client = __esm({
           };
         }
       }
-      /** Track a new spending amount */
+      /** Track a new spending amount and notify the caller for persistence */
       _trackSpending(amount) {
         this._resetTrackerIfNewDay();
         this._spendingTracker.totalBorrowed += amount;
-      }
-      /**
-       * Check if a borrow amount is within spending limits.
-       * Considers both fixed daily limits and yield-limited spending.
-       */
-      async _checkSpendingLimit(amount, morphoClient) {
-        this._resetTrackerIfNewDay();
-        if (this.config.yieldLimitedSpending) {
+        if (this.config.onSpendingUpdate) {
           try {
-            const status = await morphoClient.getStatus();
-            let totalDailyYieldUsdc = 0;
-            for (const pos of status.positions) {
-              if (parseFloat(pos.collateral) > 0) {
-                try {
-                  const estimate = await morphoClient.getYieldEstimate(
-                    pos.collateralToken,
-                    pos.collateral,
-                    1
-                    // 1 day
-                  );
-                  totalDailyYieldUsdc += estimate.estimatedYieldUsd;
-                } catch (e) {
-                  console.warn(`[agether] yield calc failed for ${pos.collateralToken}:`, e instanceof Error ? e.message : e);
-                }
-              }
-            }
-            const yieldLimit = BigInt(Math.round(totalDailyYieldUsdc * 1e6));
-            const newTotal = this._spendingTracker.totalBorrowed + amount;
-            if (yieldLimit > 0n && newTotal > yieldLimit) {
-              return {
-                allowed: false,
-                reason: `Yield-limited spending exceeded. Daily yield cap: $${(Number(yieldLimit) / 1e6).toFixed(2)}, already spent: $${(Number(this._spendingTracker.totalBorrowed) / 1e6).toFixed(2)}, requested: $${(Number(amount) / 1e6).toFixed(2)}`
-              };
-            }
+            this.config.onSpendingUpdate({
+              date: this._spendingTracker.date,
+              totalBorrowed: this._spendingTracker.totalBorrowed.toString()
+            });
           } catch (e) {
-            console.warn("[agether] yield-limited spending check failed, falling through to fixed limit:", e instanceof Error ? e.message : e);
+            console.warn("[agether] onSpendingUpdate callback failed:", e instanceof Error ? e.message : e);
           }
         }
+      }
+      /**
+       * Check if a borrow amount is within the fixed daily spending limit.
+       */
+      async _checkSpendingLimit(amount, _morphoClient) {
+        this._resetTrackerIfNewDay();
         if (this._spendingTracker.dailyLimit > 0n) {
           const newTotal = this._spendingTracker.totalBorrowed + amount;
           if (newTotal > this._spendingTracker.dailyLimit) {

package/dist/index.d.mts

@@ -347,6 +347,12 @@ interface FundResult {
     amount: string;
     agentAccount: string;
 }
+interface WithdrawFromAccountResult {
+    tx: string;
+    token: string;
+    amount: string;
+    destination: string;
+}
 interface SupplyAssetResult {
     tx: string;
     amount: string;
@@ -432,6 +438,21 @@ declare class MorphoClient {
     getBalances(): Promise<BalancesResult>;
     /** Transfer USDC from EOA to AgentAccount. */
     fundAccount(usdcAmount: string): Promise<FundResult>;
+    /**
+     * Withdraw (transfer) a token from AgentAccount to EOA.
+     * Executes an ERC-20 transfer via Safe UserOp.
+     *
+     * @param tokenSymbol - Token to withdraw (e.g. 'USDC', 'WETH', 'wstETH')
+     * @param amount - Amount to withdraw (human-readable, e.g. '100' for 100 USDC, or 'all')
+     */
+    withdrawToken(tokenSymbol: string, amount: string): Promise<WithdrawFromAccountResult>;
+    /**
+     * Withdraw ETH from AgentAccount to EOA.
+     * Executes a native ETH transfer via Safe UserOp.
+     *
+     * @param amount - ETH amount (e.g. '0.01' or 'all')
+     */
+    withdrawEth(amount: string): Promise<WithdrawFromAccountResult>;
     /**
      * Fetch USDC borrow markets on Base from Morpho API.
      * Caches results for 5 minutes.
@@ -708,9 +729,14 @@ declare class MorphoClient {
  * Auto-Draw: When autoDraw is enabled and USDC balance is insufficient,
  * the client automatically borrows from Morpho Blue before paying.
  *
- * Spending Limits: Optional daily spending cap (dailySpendLimitUsdc) and
- * yield-limited spending (yieldLimitedSpending) to keep borrows within
- * theoretical collateral yield.
+ * Auto-Yield: When autoYield is enabled, the client first tries to cover
+ * the deficit from earned supply yield (principal untouched) before borrowing.
+ *
+ * Waterfall when both enabled: balance → yield → borrow
+ *
+ * Spending Limits: Optional daily spending cap (dailySpendLimitUsdc) with
+ * persistent state via onSpendingUpdate callback. The caller (e.g. plugin)
+ * is responsible for persisting and restoring state via initialSpendingState.
  *
  * Chain support: Base (8453), Base Sepolia (84532), Ethereum (1).
  */
@@ -733,21 +759,38 @@ interface X402BaseConfig {
      * Default: false
      */
     autoDraw?: boolean;
+    /**
+     * Auto-yield: when USDC is insufficient, try to cover the deficit from
+     * earned supply yield BEFORE borrowing. Withdraws only the yield portion
+     * (principal stays intact). Works independently or combined with autoDraw.
+     *
+     * Waterfall when both enabled: balance → yield → borrow
+     * Default: false
+     */
+    autoYield?: boolean;
     /**
      * Daily spending limit in USDC (e.g. '100' for $100/day).
      * Tracks cumulative daily borrows and rejects auto-draw if exceeded.
      */
     dailySpendLimitUsdc?: string;
     /**
-     * When true, auto-calculates the daily spending limit based on
-     * theoretical yield of deposited collateral. Overrides dailySpendLimitUsdc.
+     * Pre-loaded spending state from a previous session.
+     * Pass this to resume the daily spending tracker after a restart.
+     * If the date doesn't match today, it's ignored (fresh day).
      */
-    yieldLimitedSpending?: boolean;
+    initialSpendingState?: {
+        date: string;
+        totalBorrowed: string;
+    };
     /**
-     * Safety margin: borrow this much extra beyond what's needed (in USDC, e.g. '1').
-     * Helps avoid rounding issues. Default: '0.5'
+     * Called after every auto-draw borrow so the caller can persist the
+     * updated spending state (e.g. to a cache file). Receives the full
+     * SpendingTracker with the current date and cumulative amount.
      */
-    autoDrawBuffer?: string;
+    onSpendingUpdate?: (state: {
+        date: string;
+        totalBorrowed: string;
+    }) => void;
     /**
      * ERC-7579 validator module address (e.g. Agether8004ValidationModule).
      * Required for Safe7579 smart wallets so that `isValidSignature` calls
@@ -790,8 +833,10 @@ interface X402Response<T = unknown> {
         txHash?: string;
     };
     autoDrawInfo?: {
-        borrowed: string;
-        borrowTx: string;
+        borrowed?: string;
+        borrowTx?: string;
+        yieldWithdrawn?: string;
+        yieldTx?: string;
         reason: string;
     };
 }
@@ -828,15 +873,23 @@ declare class X402Client {
     /** Get remaining daily spending allowance in USDC (human-readable) */
     getRemainingDailyAllowance(): string;
     /**
-     * Pay with auto-draw: Make an x402 request with automatic Morpho borrowing.
+     * Pay with auto-funding: Make an x402 request with automatic USDC sourcing.
      *
-     * Flow:
-     * 1. Check USDC balance on AgentAccount
-     * 2. Probe the URL to discover payment amount (if 402)
-     * 3. If insufficient USDC, calculate deficit
-     * 4. Check spending limit
-     * 5. Borrow from Morpho via MorphoClient
-     * 6. Proceed with x402 payment
+     * Uses a **plan-then-execute** approach: all reads happen first, and if the
+     * full deficit can't be covered the method fails with NO side-effects
+     * (no yield withdrawn, no USDC borrowed).
+     *
+     * Waterfall (when both autoYield + autoDraw enabled):
+     *   1. Check USDC balance on AgentAccount
+     *   2. Probe the URL to discover payment amount (if 402)
+     *   3. If insufficient USDC — PLANNING PHASE (read-only):
+     *      a. Calculate total available yield across supply positions
+     *      b. Calculate max borrowable from Morpho markets
+     *      c. Verify yield + borrow can cover full deficit — if not, fail immediately
+     *   4. EXECUTION PHASE (only if plan is feasible):
+     *      a. Withdraw needed yield from supply positions
+     *      b. Borrow remaining deficit from Morpho
+     *   5. Proceed with x402 payment
      */
     payWithAutoDraw<T = unknown>(url: string, opts?: RequestInit & {
         morphoClient?: any;
@@ -850,11 +903,10 @@ declare class X402Client {
     private _probePaymentAmount;
     /** Reset spending tracker if it's a new day */
     private _resetTrackerIfNewDay;
-    /** Track a new spending amount */
+    /** Track a new spending amount and notify the caller for persistence */
     private _trackSpending;
     /**
-     * Check if a borrow amount is within spending limits.
-     * Considers both fixed daily limits and yield-limited spending.
+     * Check if a borrow amount is within the fixed daily spending limit.
      */
     private _checkSpendingLimit;
 }
@@ -1227,4 +1279,4 @@ declare function getDefaultConfig(chainId: ChainId): AgetherConfig;
  */
 declare function createConfig(chainId: ChainId, options?: Partial<AgetherConfig>): AgetherConfig;
 
-export { ACCOUNT_FACTORY_ABI, AGENT_REPUTATION_ABI, AGETHER_4337_FACTORY_ABI, AGETHER_8004_SCORER_ABI, AGETHER_8004_VALIDATION_MODULE_ABI, AGETHER_HOOK_MULTIPLEXER_ABI, AgentIdentityClient, type AgentIdentityClientOptions, AgentNotApprovedError, AgetherClient, type AgetherClientOptions, type AgetherConfig, AgetherError, type AgetherSigner, type AgetherViemWallet, type BalancesResult, type BorrowResult, ChainId, type ContractAddresses, type DepositAndBorrowResult, type DepositResult, ENTRYPOINT_V07_ABI, ERC20_ABI, ERC8004_VALIDATION_MODULE_ABI, type FundResult, HOOK_MULTIPLEXER_ABI, IDENTITY_REGISTRY_ABI, InsufficientBalanceError, MORPHO_BLUE_ABI, MorphoClient, type MorphoClientConfig, type MorphoMarketInfo, type MorphoMarketParams, type MorphoPosition, type PayFromYieldResult, type PaymentRequirements, type PositionResult, type RegisterResult, type RepayResult, SAFE7579_ACCOUNT_ABI, SAFE_AGENT_FACTORY_ABI, type ScoreAttestation, type ScoreResult, ScoringClient, type ScoringClientConfig, ScoringRejectedError, type SpendingTracker, type StatusResult, type SupplyAssetResult, type SupplyPositionResult, type TransactionResult, VALIDATION_REGISTRY_ABI, type WithdrawResult, type WithdrawSupplyResult, X402Client, type X402Config, type X402PaymentRequest, type X402PaymentResult, type X402Response, bpsToRate, createConfig, formatAPR, formatAddress, formatHealthFactor, formatPercent, formatTimestamp, formatUSD, formatUnits, getDefaultConfig, parseUnits, rateToBps };
+export { ACCOUNT_FACTORY_ABI, AGENT_REPUTATION_ABI, AGETHER_4337_FACTORY_ABI, AGETHER_8004_SCORER_ABI, AGETHER_8004_VALIDATION_MODULE_ABI, AGETHER_HOOK_MULTIPLEXER_ABI, AgentIdentityClient, type AgentIdentityClientOptions, AgentNotApprovedError, AgetherClient, type AgetherClientOptions, type AgetherConfig, AgetherError, type AgetherSigner, type AgetherViemWallet, type BalancesResult, type BorrowResult, ChainId, type ContractAddresses, type DepositAndBorrowResult, type DepositResult, ENTRYPOINT_V07_ABI, ERC20_ABI, ERC8004_VALIDATION_MODULE_ABI, type FundResult, HOOK_MULTIPLEXER_ABI, IDENTITY_REGISTRY_ABI, InsufficientBalanceError, MORPHO_BLUE_ABI, MorphoClient, type MorphoClientConfig, type MorphoMarketInfo, type MorphoMarketParams, type MorphoPosition, type PayFromYieldResult, type PaymentRequirements, type PositionResult, type RegisterResult, type RepayResult, SAFE7579_ACCOUNT_ABI, SAFE_AGENT_FACTORY_ABI, type ScoreAttestation, type ScoreResult, ScoringClient, type ScoringClientConfig, ScoringRejectedError, type SpendingTracker, type StatusResult, type SupplyAssetResult, type SupplyPositionResult, type TransactionResult, VALIDATION_REGISTRY_ABI, type WithdrawFromAccountResult, type WithdrawResult, type WithdrawSupplyResult, X402Client, type X402Config, type X402PaymentRequest, type X402PaymentResult, type X402Response, bpsToRate, createConfig, formatAPR, formatAddress, formatHealthFactor, formatPercent, formatTimestamp, formatUSD, formatUnits, getDefaultConfig, parseUnits, rateToBps };

package/dist/index.d.ts

@@ -347,6 +347,12 @@ interface FundResult {
     amount: string;
     agentAccount: string;
 }
+interface WithdrawFromAccountResult {
+    tx: string;
+    token: string;
+    amount: string;
+    destination: string;
+}
 interface SupplyAssetResult {
     tx: string;
     amount: string;
@@ -432,6 +438,21 @@ declare class MorphoClient {
     getBalances(): Promise<BalancesResult>;
     /** Transfer USDC from EOA to AgentAccount. */
     fundAccount(usdcAmount: string): Promise<FundResult>;
+    /**
+     * Withdraw (transfer) a token from AgentAccount to EOA.
+     * Executes an ERC-20 transfer via Safe UserOp.
+     *
+     * @param tokenSymbol - Token to withdraw (e.g. 'USDC', 'WETH', 'wstETH')
+     * @param amount - Amount to withdraw (human-readable, e.g. '100' for 100 USDC, or 'all')
+     */
+    withdrawToken(tokenSymbol: string, amount: string): Promise<WithdrawFromAccountResult>;
+    /**
+     * Withdraw ETH from AgentAccount to EOA.
+     * Executes a native ETH transfer via Safe UserOp.
+     *
+     * @param amount - ETH amount (e.g. '0.01' or 'all')
+     */
+    withdrawEth(amount: string): Promise<WithdrawFromAccountResult>;
     /**
      * Fetch USDC borrow markets on Base from Morpho API.
      * Caches results for 5 minutes.
@@ -708,9 +729,14 @@ declare class MorphoClient {
  * Auto-Draw: When autoDraw is enabled and USDC balance is insufficient,
  * the client automatically borrows from Morpho Blue before paying.
  *
- * Spending Limits: Optional daily spending cap (dailySpendLimitUsdc) and
- * yield-limited spending (yieldLimitedSpending) to keep borrows within
- * theoretical collateral yield.
+ * Auto-Yield: When autoYield is enabled, the client first tries to cover
+ * the deficit from earned supply yield (principal untouched) before borrowing.
+ *
+ * Waterfall when both enabled: balance → yield → borrow
+ *
+ * Spending Limits: Optional daily spending cap (dailySpendLimitUsdc) with
+ * persistent state via onSpendingUpdate callback. The caller (e.g. plugin)
+ * is responsible for persisting and restoring state via initialSpendingState.
  *
  * Chain support: Base (8453), Base Sepolia (84532), Ethereum (1).
  */
@@ -733,21 +759,38 @@ interface X402BaseConfig {
      * Default: false
      */
     autoDraw?: boolean;
+    /**
+     * Auto-yield: when USDC is insufficient, try to cover the deficit from
+     * earned supply yield BEFORE borrowing. Withdraws only the yield portion
+     * (principal stays intact). Works independently or combined with autoDraw.
+     *
+     * Waterfall when both enabled: balance → yield → borrow
+     * Default: false
+     */
+    autoYield?: boolean;
     /**
      * Daily spending limit in USDC (e.g. '100' for $100/day).
      * Tracks cumulative daily borrows and rejects auto-draw if exceeded.
      */
     dailySpendLimitUsdc?: string;
     /**
-     * When true, auto-calculates the daily spending limit based on
-     * theoretical yield of deposited collateral. Overrides dailySpendLimitUsdc.
+     * Pre-loaded spending state from a previous session.
+     * Pass this to resume the daily spending tracker after a restart.
+     * If the date doesn't match today, it's ignored (fresh day).
      */
-    yieldLimitedSpending?: boolean;
+    initialSpendingState?: {
+        date: string;
+        totalBorrowed: string;
+    };
     /**
-     * Safety margin: borrow this much extra beyond what's needed (in USDC, e.g. '1').
-     * Helps avoid rounding issues. Default: '0.5'
+     * Called after every auto-draw borrow so the caller can persist the
+     * updated spending state (e.g. to a cache file). Receives the full
+     * SpendingTracker with the current date and cumulative amount.
      */
-    autoDrawBuffer?: string;
+    onSpendingUpdate?: (state: {
+        date: string;
+        totalBorrowed: string;
+    }) => void;
     /**
      * ERC-7579 validator module address (e.g. Agether8004ValidationModule).
      * Required for Safe7579 smart wallets so that `isValidSignature` calls
@@ -790,8 +833,10 @@ interface X402Response<T = unknown> {
         txHash?: string;
     };
     autoDrawInfo?: {
-        borrowed: string;
-        borrowTx: string;
+        borrowed?: string;
+        borrowTx?: string;
+        yieldWithdrawn?: string;
+        yieldTx?: string;
         reason: string;
     };
 }
@@ -828,15 +873,23 @@ declare class X402Client {
     /** Get remaining daily spending allowance in USDC (human-readable) */
     getRemainingDailyAllowance(): string;
     /**
-     * Pay with auto-draw: Make an x402 request with automatic Morpho borrowing.
+     * Pay with auto-funding: Make an x402 request with automatic USDC sourcing.
      *
-     * Flow:
-     * 1. Check USDC balance on AgentAccount
-     * 2. Probe the URL to discover payment amount (if 402)
-     * 3. If insufficient USDC, calculate deficit
-     * 4. Check spending limit
-     * 5. Borrow from Morpho via MorphoClient
-     * 6. Proceed with x402 payment
+     * Uses a **plan-then-execute** approach: all reads happen first, and if the
+     * full deficit can't be covered the method fails with NO side-effects
+     * (no yield withdrawn, no USDC borrowed).
+     *
+     * Waterfall (when both autoYield + autoDraw enabled):
+     *   1. Check USDC balance on AgentAccount
+     *   2. Probe the URL to discover payment amount (if 402)
+     *   3. If insufficient USDC — PLANNING PHASE (read-only):
+     *      a. Calculate total available yield across supply positions
+     *      b. Calculate max borrowable from Morpho markets
+     *      c. Verify yield + borrow can cover full deficit — if not, fail immediately
+     *   4. EXECUTION PHASE (only if plan is feasible):
+     *      a. Withdraw needed yield from supply positions
+     *      b. Borrow remaining deficit from Morpho
+     *   5. Proceed with x402 payment
      */
     payWithAutoDraw<T = unknown>(url: string, opts?: RequestInit & {
         morphoClient?: any;
@@ -850,11 +903,10 @@ declare class X402Client {
     private _probePaymentAmount;
     /** Reset spending tracker if it's a new day */
     private _resetTrackerIfNewDay;
-    /** Track a new spending amount */
+    /** Track a new spending amount and notify the caller for persistence */
     private _trackSpending;
     /**
-     * Check if a borrow amount is within spending limits.
-     * Considers both fixed daily limits and yield-limited spending.
+     * Check if a borrow amount is within the fixed daily spending limit.
      */
     private _checkSpendingLimit;
 }
@@ -1227,4 +1279,4 @@ declare function getDefaultConfig(chainId: ChainId): AgetherConfig;
  */
 declare function createConfig(chainId: ChainId, options?: Partial<AgetherConfig>): AgetherConfig;
 
-export { ACCOUNT_FACTORY_ABI, AGENT_REPUTATION_ABI, AGETHER_4337_FACTORY_ABI, AGETHER_8004_SCORER_ABI, AGETHER_8004_VALIDATION_MODULE_ABI, AGETHER_HOOK_MULTIPLEXER_ABI, AgentIdentityClient, type AgentIdentityClientOptions, AgentNotApprovedError, AgetherClient, type AgetherClientOptions, type AgetherConfig, AgetherError, type AgetherSigner, type AgetherViemWallet, type BalancesResult, type BorrowResult, ChainId, type ContractAddresses, type DepositAndBorrowResult, type DepositResult, ENTRYPOINT_V07_ABI, ERC20_ABI, ERC8004_VALIDATION_MODULE_ABI, type FundResult, HOOK_MULTIPLEXER_ABI, IDENTITY_REGISTRY_ABI, InsufficientBalanceError, MORPHO_BLUE_ABI, MorphoClient, type MorphoClientConfig, type MorphoMarketInfo, type MorphoMarketParams, type MorphoPosition, type PayFromYieldResult, type PaymentRequirements, type PositionResult, type RegisterResult, type RepayResult, SAFE7579_ACCOUNT_ABI, SAFE_AGENT_FACTORY_ABI, type ScoreAttestation, type ScoreResult, ScoringClient, type ScoringClientConfig, ScoringRejectedError, type SpendingTracker, type StatusResult, type SupplyAssetResult, type SupplyPositionResult, type TransactionResult, VALIDATION_REGISTRY_ABI, type WithdrawResult, type WithdrawSupplyResult, X402Client, type X402Config, type X402PaymentRequest, type X402PaymentResult, type X402Response, bpsToRate, createConfig, formatAPR, formatAddress, formatHealthFactor, formatPercent, formatTimestamp, formatUSD, formatUnits, getDefaultConfig, parseUnits, rateToBps };
+export { ACCOUNT_FACTORY_ABI, AGENT_REPUTATION_ABI, AGETHER_4337_FACTORY_ABI, AGETHER_8004_SCORER_ABI, AGETHER_8004_VALIDATION_MODULE_ABI, AGETHER_HOOK_MULTIPLEXER_ABI, AgentIdentityClient, type AgentIdentityClientOptions, AgentNotApprovedError, AgetherClient, type AgetherClientOptions, type AgetherConfig, AgetherError, type AgetherSigner, type AgetherViemWallet, type BalancesResult, type BorrowResult, ChainId, type ContractAddresses, type DepositAndBorrowResult, type DepositResult, ENTRYPOINT_V07_ABI, ERC20_ABI, ERC8004_VALIDATION_MODULE_ABI, type FundResult, HOOK_MULTIPLEXER_ABI, IDENTITY_REGISTRY_ABI, InsufficientBalanceError, MORPHO_BLUE_ABI, MorphoClient, type MorphoClientConfig, type MorphoMarketInfo, type MorphoMarketParams, type MorphoPosition, type PayFromYieldResult, type PaymentRequirements, type PositionResult, type RegisterResult, type RepayResult, SAFE7579_ACCOUNT_ABI, SAFE_AGENT_FACTORY_ABI, type ScoreAttestation, type ScoreResult, ScoringClient, type ScoringClientConfig, ScoringRejectedError, type SpendingTracker, type StatusResult, type SupplyAssetResult, type SupplyPositionResult, type TransactionResult, VALIDATION_REGISTRY_ABI, type WithdrawFromAccountResult, type WithdrawResult, type WithdrawSupplyResult, X402Client, type X402Config, type X402PaymentRequest, type X402PaymentResult, type X402Response, bpsToRate, createConfig, formatAPR, formatAddress, formatHealthFactor, formatPercent, formatTimestamp, formatUSD, formatUnits, getDefaultConfig, parseUnits, rateToBps };

package/dist/index.js

@@ -786,6 +786,50 @@ var MorphoClient = class {
     this._refreshSigner();
     return { tx: receipt.hash, amount: usdcAmount, agentAccount: acctAddr };
   }
+  /**
+   * Withdraw (transfer) a token from AgentAccount to EOA.
+   * Executes an ERC-20 transfer via Safe UserOp.
+   *
+   * @param tokenSymbol - Token to withdraw (e.g. 'USDC', 'WETH', 'wstETH')
+   * @param amount - Amount to withdraw (human-readable, e.g. '100' for 100 USDC, or 'all')
+   */
+  async withdrawToken(tokenSymbol, amount) {
+    const acctAddr = await this.getAccountAddress();
+    const eoaAddr = await this.getSignerAddress();
+    const tokenInfo = await this._resolveToken(tokenSymbol);
+    const tokenContract = new import_ethers2.Contract(tokenInfo.address, ERC20_ABI, this.provider);
+    let weiAmount;
+    if (amount === "all") {
+      weiAmount = await tokenContract.balanceOf(acctAddr);
+      if (weiAmount === 0n) throw new AgetherError(`No ${tokenSymbol} in AgentAccount`, "INSUFFICIENT_BALANCE");
+    } else {
+      weiAmount = import_ethers2.ethers.parseUnits(amount, tokenInfo.decimals);
+    }
+    const data = erc20Iface.encodeFunctionData("transfer", [eoaAddr, weiAmount]);
+    const receipt = await this.exec(tokenInfo.address, data);
+    const actualAmount = amount === "all" ? import_ethers2.ethers.formatUnits(weiAmount, tokenInfo.decimals) : amount;
+    return { tx: receipt.hash, token: tokenSymbol, amount: actualAmount, destination: eoaAddr };
+  }
+  /**
+   * Withdraw ETH from AgentAccount to EOA.
+   * Executes a native ETH transfer via Safe UserOp.
+   *
+   * @param amount - ETH amount (e.g. '0.01' or 'all')
+   */
+  async withdrawEth(amount) {
+    const acctAddr = await this.getAccountAddress();
+    const eoaAddr = await this.getSignerAddress();
+    let weiAmount;
+    if (amount === "all") {
+      weiAmount = await this.provider.getBalance(acctAddr);
+      if (weiAmount === 0n) throw new AgetherError("No ETH in AgentAccount", "INSUFFICIENT_BALANCE");
+    } else {
+      weiAmount = import_ethers2.ethers.parseEther(amount);
+    }
+    const receipt = await this.exec(eoaAddr, "0x", weiAmount);
+    const actualAmount = amount === "all" ? import_ethers2.ethers.formatEther(weiAmount) : amount;
+    return { tx: receipt.hash, token: "ETH", amount: actualAmount, destination: eoaAddr };
+  }
   // ════════════════════════════════════════════════════════
   //  Market Discovery (Morpho GraphQL API)
   // ════════════════════════════════════════════════════════
@@ -2240,7 +2284,9 @@ var X402Client = class {
     this.paidFetch = (0, import_fetch.wrapFetchWithPayment)(fetch, client);
     const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     const dailyLimit = config.dailySpendLimitUsdc ? BigInt(Math.round(parseFloat(config.dailySpendLimitUsdc) * 1e6)) : 0n;
-    this._spendingTracker = { date: today, totalBorrowed: 0n, dailyLimit };
+    const restored = config.initialSpendingState;
+    const restoredBorrowed = restored && restored.date === today ? BigInt(restored.totalBorrowed) : 0n;
+    this._spendingTracker = { date: today, totalBorrowed: restoredBorrowed, dailyLimit };
   }
   async get(url, opts) {
     return this.request(url, { ...opts, method: "GET" });
@@ -2269,66 +2315,120 @@ var X402Client = class {
     return (Number(remaining > 0n ? remaining : 0n) / 1e6).toFixed(2);
   }
   /**
-   * Pay with auto-draw: Make an x402 request with automatic Morpho borrowing.
+   * Pay with auto-funding: Make an x402 request with automatic USDC sourcing.
    *
-   * Flow:
-   * 1. Check USDC balance on AgentAccount
-   * 2. Probe the URL to discover payment amount (if 402)
-   * 3. If insufficient USDC, calculate deficit
-   * 4. Check spending limit
-   * 5. Borrow from Morpho via MorphoClient
-   * 6. Proceed with x402 payment
+   * Uses a **plan-then-execute** approach: all reads happen first, and if the
+   * full deficit can't be covered the method fails with NO side-effects
+   * (no yield withdrawn, no USDC borrowed).
+   *
+   * Waterfall (when both autoYield + autoDraw enabled):
+   *   1. Check USDC balance on AgentAccount
+   *   2. Probe the URL to discover payment amount (if 402)
+   *   3. If insufficient USDC — PLANNING PHASE (read-only):
+   *      a. Calculate total available yield across supply positions
+   *      b. Calculate max borrowable from Morpho markets
+   *      c. Verify yield + borrow can cover full deficit — if not, fail immediately
+   *   4. EXECUTION PHASE (only if plan is feasible):
+   *      a. Withdraw needed yield from supply positions
+   *      b. Borrow remaining deficit from Morpho
+   *   5. Proceed with x402 payment
    */
   async payWithAutoDraw(url, opts) {
     const { morphoClient, ...fetchOpts } = opts || {};
-    if (!this.config.autoDraw || !morphoClient) {
+    if (!this.config.autoDraw && !this.config.autoYield || !morphoClient) {
       return this.request(url, fetchOpts);
     }
     try {
       const usdcBalance = await morphoClient.getUsdcBalance();
-      console.log(`   [auto-draw] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
+      console.log(`   [auto-fund] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
       const paymentAmount = await this._probePaymentAmount(url, fetchOpts);
       if (paymentAmount !== null) {
-        console.log(`   [auto-draw] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
-        const bufferStr = this.config.autoDrawBuffer || "0.5";
-        const buffer = BigInt(Math.round(parseFloat(bufferStr) * 1e6));
-        const needed = paymentAmount + buffer;
+        console.log(`   [auto-fund] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
+        const needed = paymentAmount;
         if (usdcBalance < needed) {
-          const deficit = needed - usdcBalance;
-          console.log(`   [auto-draw] Insufficient balance. Need to borrow ${(Number(deficit) / 1e6).toFixed(2)} USDC`);
-          const limitCheck = await this._checkSpendingLimit(deficit, morphoClient);
-          if (!limitCheck.allowed) {
-            return {
-              success: false,
-              error: `Auto-draw blocked: ${limitCheck.reason}`
-            };
+          const totalDeficit = needed - usdcBalance;
+          console.log(`   [auto-fund] Insufficient balance. Deficit: ${(Number(totalDeficit) / 1e6).toFixed(2)} USDC`);
+          const yieldPlan = [];
+          let totalYieldAvailable = 0n;
+          if (this.config.autoYield) {
+            try {
+              const positions = await morphoClient.getSupplyPositions();
+              const withYield = positions.filter((p) => parseFloat(p.earnedYield) > 1e-6).sort((a, b) => parseFloat(b.earnedYield) - parseFloat(a.earnedYield));
+              for (const pos of withYield) {
+                const yieldRaw = BigInt(Math.floor(parseFloat(pos.earnedYield) * 1e6));
+                if (yieldRaw > 0n) {
+                  yieldPlan.push({ collateralToken: pos.collateralToken, amount: yieldRaw });
+                  totalYieldAvailable += yieldRaw;
+                }
+              }
+              console.log(`   [auto-fund] Plan: ${(Number(totalYieldAvailable) / 1e6).toFixed(6)} USDC available from yield`);
+            } catch (e) {
+              console.warn(`   [auto-fund] Plan: yield check failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+          }
+          const yieldToUse = totalYieldAvailable < totalDeficit ? totalYieldAvailable : totalDeficit;
+          const deficitAfterYield = totalDeficit - yieldToUse;
+          let canBorrow = 0n;
+          if (this.config.autoDraw && deficitAfterYield > 0n) {
+            const limitCheck = await this._checkSpendingLimit(deficitAfterYield, morphoClient);
+            if (!limitCheck.allowed) {
+              return { success: false, error: `Auto-fund blocked: ${limitCheck.reason}` };
+            }
+            const maxBorrowable = await morphoClient.getMaxBorrowable();
+            canBorrow = maxBorrowable.total;
+            console.log(`   [auto-fund] Plan: ${(Number(canBorrow) / 1e6).toFixed(2)} USDC borrowable from Morpho`);
           }
-          const maxBorrowable = await morphoClient.getMaxBorrowable();
-          if (maxBorrowable.total < deficit) {
+          const totalAvailable = yieldToUse + canBorrow;
+          if (totalAvailable < totalDeficit) {
+            const parts = [];
+            if (totalYieldAvailable > 0n) parts.push(`yield: $${(Number(totalYieldAvailable) / 1e6).toFixed(2)}`);
+            if (canBorrow > 0n) parts.push(`borrowable: $${(Number(canBorrow) / 1e6).toFixed(2)}`);
+            if (!this.config.autoYield) parts.push("autoYield: off");
+            if (!this.config.autoDraw) parts.push("autoDraw: off");
             return {
               success: false,
-              error: `Auto-draw failed: insufficient collateral. Need ${(Number(deficit) / 1e6).toFixed(2)} USDC but can only borrow ${(Number(maxBorrowable.total) / 1e6).toFixed(2)} USDC more.`
+              error: `Cannot cover deficit of $${(Number(totalDeficit) / 1e6).toFixed(2)} USDC. Available: ${parts.join(", ")}. Balance: $${(Number(usdcBalance) / 1e6).toFixed(2)}, needed: $${(Number(needed) / 1e6).toFixed(2)}.`
             };
           }
-          const borrowAmount = (Number(deficit) / 1e6).toFixed(6);
-          console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
-          const borrowResult = await morphoClient.borrow(borrowAmount);
-          console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
-          this._trackSpending(deficit);
-          const result = await this.request(url, fetchOpts);
-          return {
-            ...result,
-            autoDrawInfo: {
-              borrowed: borrowAmount,
-              borrowTx: borrowResult.tx,
-              reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
-            }
+          const drawInfo = {
+            reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
           };
+          if (yieldToUse > 0n) {
+            let remaining = yieldToUse;
+            let totalWithdrawn = 0n;
+            let lastTx = "";
+            for (const plan of yieldPlan) {
+              if (remaining <= 0n) break;
+              const toWithdraw = plan.amount < remaining ? plan.amount : remaining;
+              const withdrawStr = (Number(toWithdraw) / 1e6).toFixed(6);
+              console.log(`   [auto-yield] Withdrawing $${withdrawStr} yield from ${plan.collateralToken} market`);
+              const wr = await morphoClient.withdrawSupply(withdrawStr, plan.collateralToken);
+              lastTx = wr.tx;
+              totalWithdrawn += toWithdraw;
+              remaining -= toWithdraw;
+            }
+            if (totalWithdrawn > 0n) {
+              drawInfo.yieldWithdrawn = (Number(totalWithdrawn) / 1e6).toFixed(6);
+              drawInfo.yieldTx = lastTx;
+              console.log(`   [auto-yield] Withdrawn: $${drawInfo.yieldWithdrawn}`);
+            }
+          }
+          if (deficitAfterYield > 0n && this.config.autoDraw) {
+            const borrowAmount = (Number(deficitAfterYield) / 1e6).toFixed(6);
+            console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
+            const borrowResult = await morphoClient.borrow(borrowAmount);
+            console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
+            drawInfo.borrowed = borrowAmount;
+            drawInfo.borrowTx = borrowResult.tx;
+            this._trackSpending(deficitAfterYield);
+          }
+          const result = await this.request(url, fetchOpts);
+          return { ...result, autoDrawInfo: drawInfo };
         }
       }
       return this.request(url, fetchOpts);
     } catch (error) {
-      console.log(`   [auto-draw] Auto-draw check failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
+      console.log(`   [auto-fund] Failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
       return this.request(url, fetchOpts);
     }
   }
@@ -2429,48 +2529,26 @@ var X402Client = class {
       };
     }
   }
-  /** Track a new spending amount */
+  /** Track a new spending amount and notify the caller for persistence */
   _trackSpending(amount) {
     this._resetTrackerIfNewDay();
     this._spendingTracker.totalBorrowed += amount;
-  }
-  /**
-   * Check if a borrow amount is within spending limits.
-   * Considers both fixed daily limits and yield-limited spending.
-   */
-  async _checkSpendingLimit(amount, morphoClient) {
-    this._resetTrackerIfNewDay();
-    if (this.config.yieldLimitedSpending) {
+    if (this.config.onSpendingUpdate) {
       try {
-        const status = await morphoClient.getStatus();
-        let totalDailyYieldUsdc = 0;
-        for (const pos of status.positions) {
-          if (parseFloat(pos.collateral) > 0) {
-            try {
-              const estimate = await morphoClient.getYieldEstimate(
-                pos.collateralToken,
-                pos.collateral,
-                1
-                // 1 day
-              );
-              totalDailyYieldUsdc += estimate.estimatedYieldUsd;
-            } catch (e) {
-              console.warn(`[agether] yield calc failed for ${pos.collateralToken}:`, e instanceof Error ? e.message : e);
-            }
-          }
-        }
-        const yieldLimit = BigInt(Math.round(totalDailyYieldUsdc * 1e6));
-        const newTotal = this._spendingTracker.totalBorrowed + amount;
-        if (yieldLimit > 0n && newTotal > yieldLimit) {
-          return {
-            allowed: false,
-            reason: `Yield-limited spending exceeded. Daily yield cap: $${(Number(yieldLimit) / 1e6).toFixed(2)}, already spent: $${(Number(this._spendingTracker.totalBorrowed) / 1e6).toFixed(2)}, requested: $${(Number(amount) / 1e6).toFixed(2)}`
-          };
-        }
+        this.config.onSpendingUpdate({
+          date: this._spendingTracker.date,
+          totalBorrowed: this._spendingTracker.totalBorrowed.toString()
+        });
       } catch (e) {
-        console.warn("[agether] yield-limited spending check failed, falling through to fixed limit:", e instanceof Error ? e.message : e);
+        console.warn("[agether] onSpendingUpdate callback failed:", e instanceof Error ? e.message : e);
       }
     }
+  }
+  /**
+   * Check if a borrow amount is within the fixed daily spending limit.
+   */
+  async _checkSpendingLimit(amount, _morphoClient) {
+    this._resetTrackerIfNewDay();
     if (this._spendingTracker.dailyLimit > 0n) {
       const newTotal = this._spendingTracker.totalBorrowed + amount;
       if (newTotal > this._spendingTracker.dailyLimit) {

package/dist/index.mjs

@@ -714,6 +714,50 @@ var MorphoClient = class {
     this._refreshSigner();
     return { tx: receipt.hash, amount: usdcAmount, agentAccount: acctAddr };
   }
+  /**
+   * Withdraw (transfer) a token from AgentAccount to EOA.
+   * Executes an ERC-20 transfer via Safe UserOp.
+   *
+   * @param tokenSymbol - Token to withdraw (e.g. 'USDC', 'WETH', 'wstETH')
+   * @param amount - Amount to withdraw (human-readable, e.g. '100' for 100 USDC, or 'all')
+   */
+  async withdrawToken(tokenSymbol, amount) {
+    const acctAddr = await this.getAccountAddress();
+    const eoaAddr = await this.getSignerAddress();
+    const tokenInfo = await this._resolveToken(tokenSymbol);
+    const tokenContract = new Contract2(tokenInfo.address, ERC20_ABI, this.provider);
+    let weiAmount;
+    if (amount === "all") {
+      weiAmount = await tokenContract.balanceOf(acctAddr);
+      if (weiAmount === 0n) throw new AgetherError(`No ${tokenSymbol} in AgentAccount`, "INSUFFICIENT_BALANCE");
+    } else {
+      weiAmount = ethers2.parseUnits(amount, tokenInfo.decimals);
+    }
+    const data = erc20Iface.encodeFunctionData("transfer", [eoaAddr, weiAmount]);
+    const receipt = await this.exec(tokenInfo.address, data);
+    const actualAmount = amount === "all" ? ethers2.formatUnits(weiAmount, tokenInfo.decimals) : amount;
+    return { tx: receipt.hash, token: tokenSymbol, amount: actualAmount, destination: eoaAddr };
+  }
+  /**
+   * Withdraw ETH from AgentAccount to EOA.
+   * Executes a native ETH transfer via Safe UserOp.
+   *
+   * @param amount - ETH amount (e.g. '0.01' or 'all')
+   */
+  async withdrawEth(amount) {
+    const acctAddr = await this.getAccountAddress();
+    const eoaAddr = await this.getSignerAddress();
+    let weiAmount;
+    if (amount === "all") {
+      weiAmount = await this.provider.getBalance(acctAddr);
+      if (weiAmount === 0n) throw new AgetherError("No ETH in AgentAccount", "INSUFFICIENT_BALANCE");
+    } else {
+      weiAmount = ethers2.parseEther(amount);
+    }
+    const receipt = await this.exec(eoaAddr, "0x", weiAmount);
+    const actualAmount = amount === "all" ? ethers2.formatEther(weiAmount) : amount;
+    return { tx: receipt.hash, token: "ETH", amount: actualAmount, destination: eoaAddr };
+  }
   // ════════════════════════════════════════════════════════
   //  Market Discovery (Morpho GraphQL API)
   // ════════════════════════════════════════════════════════
@@ -2168,7 +2212,9 @@ var X402Client = class {
     this.paidFetch = wrapFetchWithPayment(fetch, client);
     const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     const dailyLimit = config.dailySpendLimitUsdc ? BigInt(Math.round(parseFloat(config.dailySpendLimitUsdc) * 1e6)) : 0n;
-    this._spendingTracker = { date: today, totalBorrowed: 0n, dailyLimit };
+    const restored = config.initialSpendingState;
+    const restoredBorrowed = restored && restored.date === today ? BigInt(restored.totalBorrowed) : 0n;
+    this._spendingTracker = { date: today, totalBorrowed: restoredBorrowed, dailyLimit };
   }
   async get(url, opts) {
     return this.request(url, { ...opts, method: "GET" });
@@ -2197,66 +2243,120 @@ var X402Client = class {
     return (Number(remaining > 0n ? remaining : 0n) / 1e6).toFixed(2);
   }
   /**
-   * Pay with auto-draw: Make an x402 request with automatic Morpho borrowing.
+   * Pay with auto-funding: Make an x402 request with automatic USDC sourcing.
    *
-   * Flow:
-   * 1. Check USDC balance on AgentAccount
-   * 2. Probe the URL to discover payment amount (if 402)
-   * 3. If insufficient USDC, calculate deficit
-   * 4. Check spending limit
-   * 5. Borrow from Morpho via MorphoClient
-   * 6. Proceed with x402 payment
+   * Uses a **plan-then-execute** approach: all reads happen first, and if the
+   * full deficit can't be covered the method fails with NO side-effects
+   * (no yield withdrawn, no USDC borrowed).
+   *
+   * Waterfall (when both autoYield + autoDraw enabled):
+   *   1. Check USDC balance on AgentAccount
+   *   2. Probe the URL to discover payment amount (if 402)
+   *   3. If insufficient USDC — PLANNING PHASE (read-only):
+   *      a. Calculate total available yield across supply positions
+   *      b. Calculate max borrowable from Morpho markets
+   *      c. Verify yield + borrow can cover full deficit — if not, fail immediately
+   *   4. EXECUTION PHASE (only if plan is feasible):
+   *      a. Withdraw needed yield from supply positions
+   *      b. Borrow remaining deficit from Morpho
+   *   5. Proceed with x402 payment
    */
   async payWithAutoDraw(url, opts) {
     const { morphoClient, ...fetchOpts } = opts || {};
-    if (!this.config.autoDraw || !morphoClient) {
+    if (!this.config.autoDraw && !this.config.autoYield || !morphoClient) {
       return this.request(url, fetchOpts);
     }
     try {
       const usdcBalance = await morphoClient.getUsdcBalance();
-      console.log(`   [auto-draw] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
+      console.log(`   [auto-fund] AgentAccount USDC balance: ${(Number(usdcBalance) / 1e6).toFixed(2)}`);
       const paymentAmount = await this._probePaymentAmount(url, fetchOpts);
       if (paymentAmount !== null) {
-        console.log(`   [auto-draw] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
-        const bufferStr = this.config.autoDrawBuffer || "0.5";
-        const buffer = BigInt(Math.round(parseFloat(bufferStr) * 1e6));
-        const needed = paymentAmount + buffer;
+        console.log(`   [auto-fund] Payment required: ${(Number(paymentAmount) / 1e6).toFixed(6)} USDC`);
+        const needed = paymentAmount;
         if (usdcBalance < needed) {
-          const deficit = needed - usdcBalance;
-          console.log(`   [auto-draw] Insufficient balance. Need to borrow ${(Number(deficit) / 1e6).toFixed(2)} USDC`);
-          const limitCheck = await this._checkSpendingLimit(deficit, morphoClient);
-          if (!limitCheck.allowed) {
-            return {
-              success: false,
-              error: `Auto-draw blocked: ${limitCheck.reason}`
-            };
+          const totalDeficit = needed - usdcBalance;
+          console.log(`   [auto-fund] Insufficient balance. Deficit: ${(Number(totalDeficit) / 1e6).toFixed(2)} USDC`);
+          const yieldPlan = [];
+          let totalYieldAvailable = 0n;
+          if (this.config.autoYield) {
+            try {
+              const positions = await morphoClient.getSupplyPositions();
+              const withYield = positions.filter((p) => parseFloat(p.earnedYield) > 1e-6).sort((a, b) => parseFloat(b.earnedYield) - parseFloat(a.earnedYield));
+              for (const pos of withYield) {
+                const yieldRaw = BigInt(Math.floor(parseFloat(pos.earnedYield) * 1e6));
+                if (yieldRaw > 0n) {
+                  yieldPlan.push({ collateralToken: pos.collateralToken, amount: yieldRaw });
+                  totalYieldAvailable += yieldRaw;
+                }
+              }
+              console.log(`   [auto-fund] Plan: ${(Number(totalYieldAvailable) / 1e6).toFixed(6)} USDC available from yield`);
+            } catch (e) {
+              console.warn(`   [auto-fund] Plan: yield check failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+          }
+          const yieldToUse = totalYieldAvailable < totalDeficit ? totalYieldAvailable : totalDeficit;
+          const deficitAfterYield = totalDeficit - yieldToUse;
+          let canBorrow = 0n;
+          if (this.config.autoDraw && deficitAfterYield > 0n) {
+            const limitCheck = await this._checkSpendingLimit(deficitAfterYield, morphoClient);
+            if (!limitCheck.allowed) {
+              return { success: false, error: `Auto-fund blocked: ${limitCheck.reason}` };
+            }
+            const maxBorrowable = await morphoClient.getMaxBorrowable();
+            canBorrow = maxBorrowable.total;
+            console.log(`   [auto-fund] Plan: ${(Number(canBorrow) / 1e6).toFixed(2)} USDC borrowable from Morpho`);
           }
-          const maxBorrowable = await morphoClient.getMaxBorrowable();
-          if (maxBorrowable.total < deficit) {
+          const totalAvailable = yieldToUse + canBorrow;
+          if (totalAvailable < totalDeficit) {
+            const parts = [];
+            if (totalYieldAvailable > 0n) parts.push(`yield: $${(Number(totalYieldAvailable) / 1e6).toFixed(2)}`);
+            if (canBorrow > 0n) parts.push(`borrowable: $${(Number(canBorrow) / 1e6).toFixed(2)}`);
+            if (!this.config.autoYield) parts.push("autoYield: off");
+            if (!this.config.autoDraw) parts.push("autoDraw: off");
             return {
               success: false,
-              error: `Auto-draw failed: insufficient collateral. Need ${(Number(deficit) / 1e6).toFixed(2)} USDC but can only borrow ${(Number(maxBorrowable.total) / 1e6).toFixed(2)} USDC more.`
+              error: `Cannot cover deficit of $${(Number(totalDeficit) / 1e6).toFixed(2)} USDC. Available: ${parts.join(", ")}. Balance: $${(Number(usdcBalance) / 1e6).toFixed(2)}, needed: $${(Number(needed) / 1e6).toFixed(2)}.`
             };
           }
-          const borrowAmount = (Number(deficit) / 1e6).toFixed(6);
-          console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
-          const borrowResult = await morphoClient.borrow(borrowAmount);
-          console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
-          this._trackSpending(deficit);
-          const result = await this.request(url, fetchOpts);
-          return {
-            ...result,
-            autoDrawInfo: {
-              borrowed: borrowAmount,
-              borrowTx: borrowResult.tx,
-              reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
-            }
+          const drawInfo = {
+            reason: `USDC balance insufficient (had ${(Number(usdcBalance) / 1e6).toFixed(2)}, needed ${(Number(needed) / 1e6).toFixed(2)})`
           };
+          if (yieldToUse > 0n) {
+            let remaining = yieldToUse;
+            let totalWithdrawn = 0n;
+            let lastTx = "";
+            for (const plan of yieldPlan) {
+              if (remaining <= 0n) break;
+              const toWithdraw = plan.amount < remaining ? plan.amount : remaining;
+              const withdrawStr = (Number(toWithdraw) / 1e6).toFixed(6);
+              console.log(`   [auto-yield] Withdrawing $${withdrawStr} yield from ${plan.collateralToken} market`);
+              const wr = await morphoClient.withdrawSupply(withdrawStr, plan.collateralToken);
+              lastTx = wr.tx;
+              totalWithdrawn += toWithdraw;
+              remaining -= toWithdraw;
+            }
+            if (totalWithdrawn > 0n) {
+              drawInfo.yieldWithdrawn = (Number(totalWithdrawn) / 1e6).toFixed(6);
+              drawInfo.yieldTx = lastTx;
+              console.log(`   [auto-yield] Withdrawn: $${drawInfo.yieldWithdrawn}`);
+            }
+          }
+          if (deficitAfterYield > 0n && this.config.autoDraw) {
+            const borrowAmount = (Number(deficitAfterYield) / 1e6).toFixed(6);
+            console.log(`   [auto-draw] Borrowing ${borrowAmount} USDC from Morpho...`);
+            const borrowResult = await morphoClient.borrow(borrowAmount);
+            console.log(`   [auto-draw] Borrow tx: ${borrowResult.tx}`);
+            drawInfo.borrowed = borrowAmount;
+            drawInfo.borrowTx = borrowResult.tx;
+            this._trackSpending(deficitAfterYield);
+          }
+          const result = await this.request(url, fetchOpts);
+          return { ...result, autoDrawInfo: drawInfo };
         }
       }
       return this.request(url, fetchOpts);
     } catch (error) {
-      console.log(`   [auto-draw] Auto-draw check failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
+      console.log(`   [auto-fund] Failed: ${error instanceof Error ? error.message : String(error)}. Proceeding with normal request.`);
       return this.request(url, fetchOpts);
     }
   }
@@ -2357,48 +2457,26 @@ var X402Client = class {
       };
     }
   }
-  /** Track a new spending amount */
+  /** Track a new spending amount and notify the caller for persistence */
   _trackSpending(amount) {
     this._resetTrackerIfNewDay();
     this._spendingTracker.totalBorrowed += amount;
-  }
-  /**
-   * Check if a borrow amount is within spending limits.
-   * Considers both fixed daily limits and yield-limited spending.
-   */
-  async _checkSpendingLimit(amount, morphoClient) {
-    this._resetTrackerIfNewDay();
-    if (this.config.yieldLimitedSpending) {
+    if (this.config.onSpendingUpdate) {
       try {
-        const status = await morphoClient.getStatus();
-        let totalDailyYieldUsdc = 0;
-        for (const pos of status.positions) {
-          if (parseFloat(pos.collateral) > 0) {
-            try {
-              const estimate = await morphoClient.getYieldEstimate(
-                pos.collateralToken,
-                pos.collateral,
-                1
-                // 1 day
-              );
-              totalDailyYieldUsdc += estimate.estimatedYieldUsd;
-            } catch (e) {
-              console.warn(`[agether] yield calc failed for ${pos.collateralToken}:`, e instanceof Error ? e.message : e);
-            }
-          }
-        }
-        const yieldLimit = BigInt(Math.round(totalDailyYieldUsdc * 1e6));
-        const newTotal = this._spendingTracker.totalBorrowed + amount;
-        if (yieldLimit > 0n && newTotal > yieldLimit) {
-          return {
-            allowed: false,
-            reason: `Yield-limited spending exceeded. Daily yield cap: $${(Number(yieldLimit) / 1e6).toFixed(2)}, already spent: $${(Number(this._spendingTracker.totalBorrowed) / 1e6).toFixed(2)}, requested: $${(Number(amount) / 1e6).toFixed(2)}`
-          };
-        }
+        this.config.onSpendingUpdate({
+          date: this._spendingTracker.date,
+          totalBorrowed: this._spendingTracker.totalBorrowed.toString()
+        });
       } catch (e) {
-        console.warn("[agether] yield-limited spending check failed, falling through to fixed limit:", e instanceof Error ? e.message : e);
+        console.warn("[agether] onSpendingUpdate callback failed:", e instanceof Error ? e.message : e);
       }
     }
+  }
+  /**
+   * Check if a borrow amount is within the fixed daily spending limit.
+   */
+  async _checkSpendingLimit(amount, _morphoClient) {
+    this._resetTrackerIfNewDay();
     if (this._spendingTracker.dailyLimit > 0n) {
       const newTotal = this._spendingTracker.totalBorrowed + amount;
       if (newTotal > this._spendingTracker.dailyLimit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/sdk",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "TypeScript SDK for Agether - autonomous credit for AI agents on Base",
   "main": "dist/index.js",
   "module": "dist/index.mjs",