@owney/sdk 0.7.25-beta.13 → 0.7.25-beta.15

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/lib/funding-evidence.ts
 import { decodeEventLog, decodeFunctionData, erc20Abi, parseAbi } from "viem";
+import { entryPoint06Abi, entryPoint07Abi, getUserOperationHash, toUserOperation } from "viem/account-abstraction";
 function notifyFunding(callback, evidence) {
   try {
     void Promise.resolve(callback?.({ ...evidence })).catch(() => {
@@ -9,11 +10,53 @@ function notifyFunding(callback, evidence) {
 }
 var fullWithdrawalAbi = parseAbi(["function withdrawAllAssetToUser(address recipient, address asset)"]);
 var withdrawalEventAbi = parseAbi(["event WithdrewTokenToUser(address indexed owner, address indexed recipient, address indexed token, uint256 amount)"]);
-function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress) {
-  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || transaction.to?.toLowerCase() !== evidence.agentWallet?.toLowerCase() || transaction.from.toLowerCase() !== evidence.walletAddress.toLowerCase()) return false;
+var accountExecutionAbi = parseAbi([
+  "function execute(address target,uint256 value,bytes data)",
+  "function executeBatch((address target,uint256 value,bytes data)[] calls)"
+]);
+var entryPoint06 = "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789";
+var entryPoint07 = "0x0000000071727de22e5e9d8baf0edac6f37da032";
+function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress, receipt) {
+  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || !evidence.agentWallet) return false;
+  const matchesFullCall = (data) => {
+    try {
+      const decoded = decodeFunctionData({ abi: fullWithdrawalAbi, data });
+      return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    } catch {
+      return false;
+    }
+  };
+  if (transaction.to?.toLowerCase() === evidence.agentWallet.toLowerCase() && transaction.from.toLowerCase() === evidence.walletAddress.toLowerCase()) return matchesFullCall(transaction.input);
   try {
-    const decoded = decodeFunctionData({ abi: fullWithdrawalAbi, data: transaction.input });
-    return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    const address = transaction.to?.toLowerCase();
+    if (address !== entryPoint06 && address !== entryPoint07) return false;
+    const version = address === entryPoint06 ? "0.6" : "0.7";
+    const decoded = decodeFunctionData({ abi: version === "0.6" ? entryPoint06Abi : entryPoint07Abi, data: transaction.input });
+    if (decoded.functionName !== "handleOps") return false;
+    const operations = decoded.args[0].filter((operation2) => [evidence.agentWallet.toLowerCase(), evidence.walletAddress.toLowerCase()].includes(operation2.sender.toLowerCase()));
+    if (operations.length !== 1) return false;
+    const operation = operations[0];
+    const userOperation = toUserOperation(operation);
+    const hash = getUserOperationHash({
+      chainId: evidence.chainId,
+      entryPointAddress: transaction.to,
+      entryPointVersion: version,
+      userOperation
+    });
+    if (evidence.userOpHash && hash.toLowerCase() !== evidence.userOpHash.toLowerCase()) return false;
+    if (!receipt?.logs.some((log) => {
+      if (log.address.toLowerCase() !== address) return false;
+      try {
+        const event = decodeEventLog({ abi: entryPoint06Abi, data: log.data, topics: log.topics });
+        return event.eventName === "UserOperationEvent" && event.args.userOpHash.toLowerCase() === hash.toLowerCase() && event.args.sender.toLowerCase() === operation.sender.toLowerCase() && event.args.success;
+      } catch {
+        return false;
+      }
+    })) return false;
+    if (operation.sender.toLowerCase() === evidence.agentWallet.toLowerCase()) return matchesFullCall(operation.callData);
+    const execution = decodeFunctionData({ abi: accountExecutionAbi, data: operation.callData });
+    const calls = execution.functionName === "execute" ? [{ target: execution.args[0], value: execution.args[1], data: execution.args[2] }] : execution.args[0];
+    return calls.length === 1 && calls[0].value === 0n && calls[0].target.toLowerCase() === evidence.agentWallet.toLowerCase() && matchesFullCall(calls[0].data);
   } catch {
     return false;
   }
@@ -25,6 +68,8 @@ function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
   const attributed = /* @__PURE__ */ new Map();
   const agent = evidence.agentWallet?.toLowerCase();
   const owner = evidence.walletAddress.toLowerCase();
+  const source = direction === "deposit" ? owner : agent;
+  const destination = direction === "deposit" ? agent : owner;
   const logIndexes = [];
   const transferLogs = [];
   const zeroTransferLogs = [];
@@ -39,17 +84,13 @@ function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
       if (direction === "withdraw" && value === 0n && from.toLowerCase() === agent && to.toLowerCase() === owner)
         zeroTransferLogs.push(log.logIndex);
       let matched = 0n;
-      if (direction === "deposit") {
-        if (to.toLowerCase() === agent) matched = value;
-      } else {
-        const sender = from.toLowerCase();
-        const recipient = to.toLowerCase();
-        const available = sender === agent ? value : attributed.get(sender) ?? 0n;
-        const carried = available < value ? available : value;
-        if (sender !== agent) attributed.set(sender, available - carried);
-        if (recipient === owner) matched = carried;
-        else if (recipient !== agent) attributed.set(recipient, (attributed.get(recipient) ?? 0n) + carried);
-      }
+      const sender = from.toLowerCase();
+      const recipient = to.toLowerCase();
+      const available = sender === source ? value : attributed.get(sender) ?? 0n;
+      const carried = available < value ? available : value;
+      if (sender !== source) attributed.set(sender, available - carried);
+      if (recipient === destination) matched = carried;
+      else if (recipient !== source) attributed.set(recipient, (attributed.get(recipient) ?? 0n) + carried);
       if (matched === 0n) continue;
       amount += matched;
       transferLogs.push({ logIndex: log.logIndex, amountRaw: matched.toString() });
@@ -341,8 +382,8 @@ function observeWithdrawalSubmission(sdk, chainId, token) {
           return await original.apply(this, args);
         } catch (error) {
           const message = error instanceof Error ? error.message : "";
-          request2.failure = message === "Unauthorized: Invalid API key" ? "unauthorized" : message === "Forbidden: Access denied" ? "forbidden" : message === "Rate limit exceeded. Please try again later." ? "rate-limited" : message === "Network error: Unable to reach the server" ? "network" : "other";
-          if (["unauthorized", "forbidden", "rate-limited"].includes(request2.failure)) notify("rejected");
+          request2.failure = message === "Unauthorized: Invalid API key" ? "unauthorized" : message === "Forbidden: Access denied" ? "forbidden" : message === "Rate limit exceeded. Please try again later." ? "rate-limited" : /^Idle balance \d+(?:\.\d+)? (USDC|WETH|ETH|EURC) is below the minimum withdrawal of \d+(?:\.\d+)? \1\.?$/.test(message) ? "insufficient-balance" : /^User doesn't have any active session key\.?$/.test(message) ? "session-key-missing" : message === "Network error: Unable to reach the server" ? "network" : "other";
+          if (["unauthorized", "forbidden", "rate-limited", "insufficient-balance", "session-key-missing"].includes(request2.failure)) notify("rejected");
           throw error;
         } finally {
           request2.elapsedMs = Math.max(0, Date.now() - startedAt);
@@ -365,9 +406,49 @@ function observeWithdrawalSubmission(sdk, chainId, token) {
   } };
 }
 
+// src/agents/zyfai/zyfai.withdraw-empty.ts
+function hasEmptyWithdrawalSnapshot(raw2, chainId, token) {
+  const record = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+  const response = record(raw2);
+  const portfolio = record(response?.portfolio);
+  const chains = record(portfolio?.portfolioByChain);
+  if (response?.success === false || !chains || !Array.isArray(portfolio?.positions) || !Array.isArray(portfolio.staleBalances)) return false;
+  if (portfolio.pendingAsyncWithdrawals !== void 0 && (!Array.isArray(portfolio.pendingAsyncWithdrawals) || portfolio.pendingAsyncWithdrawals.length > 0)) return false;
+  const symbol = (value) => typeof value === "string" ? value.toUpperCase() === "ETH" ? "WETH" : value.toUpperCase() : void 0;
+  const chain = (value) => {
+    if (typeof value === "number") return value;
+    if (typeof value !== "string") return void 0;
+    return /^\d+$/.test(value) ? Number(value) : { base: 8453, arbitrum: 42161, ethereum: 1, mainnet: 1 }[value.trim().toLowerCase()];
+  };
+  const zero = (value) => typeof value === "string" && /^(?:0x)?0+$/i.test(value);
+  for (const [id, assets] of Object.entries(chains)) {
+    const idNumber = chain(id);
+    if (idNumber === void 0) return false;
+    if (idNumber !== chainId) continue;
+    const entries = record(assets);
+    if (!entries) return false;
+    for (const [asset, value] of Object.entries(entries)) {
+      if (symbol(asset) !== token) continue;
+      const balance = record(value);
+      if (!balance || !zero(balance.balance)) return false;
+    }
+  }
+  for (const value of [...portfolio.positions, ...portfolio.staleBalances]) {
+    const entry = record(value);
+    if (!entry) return false;
+    const id = chain(entry.chainId ?? entry.chain);
+    const asset = symbol(entry.tokenSymbol ?? entry.token_symbol);
+    if (id === void 0 || asset === void 0) return false;
+    if (id !== chainId || asset !== token) continue;
+    const amounts = [entry.balance, entry.amount, entry.underlyingAmount].filter((value2) => value2 !== void 0);
+    if (!amounts.length || !amounts.every(zero)) return false;
+  }
+  return true;
+}
+
 // src/agents/zyfai/zyfai.agent.ts
 import { SMART_SESSIONS_VALIDATOR, ZyfaiSDK } from "@zyfai/sdk";
-import { formatUnits, parseAbi as parseAbi2 } from "viem";
+import { erc20Abi as erc20Abi2, formatUnits as formatUnits2, isAddress, parseAbi as parseAbi2 } from "viem";
 import { base, arbitrum, mainnet } from "viem/chains";
 
 // src/types/config.ts
@@ -454,14 +535,6 @@ function hexToDecimal(hex, decimals = 6) {
   const remainder = parsed % divisor;
   return Number(whole) + Number(remainder) / Number(divisor);
 }
-function normalizeDecimalPlace(value, decimals = 6) {
-  const parsed = BigInt(value);
-  if (decimals <= 0) return Number(parsed);
-  const divisor = BigInt(10 ** decimals);
-  const whole = parsed / divisor;
-  const remainder = parsed % divisor;
-  return Number(whole) + Number(remainder) / Number(divisor);
-}
 var DayFilterMapping = {
   "30D": 30,
   "14D": 14,
@@ -469,6 +542,8 @@ var DayFilterMapping = {
 };
 
 // src/agents/zyfai/zyfai.mapper.ts
+import { formatUnits } from "viem";
+var exactHexAmount = (raw2, decimals) => formatUnits(BigInt(/^0x/i.test(raw2) ? raw2 : `0x${raw2}`), decimals);
 var DECIMALS_BY_SYMBOL = {
   usdc: 6,
   weth: 18,
@@ -523,15 +598,15 @@ function mapPendingAllocations(raw2) {
     if (typeof e.balance !== "string") continue;
     let amount;
     try {
-      amount = hexToDecimal(e.balance, tokenDecimals(e.tokenSymbol));
+      if (BigInt(/^0x/i.test(e.balance) ? e.balance : `0x${e.balance}`) <= 0n) continue;
+      amount = exactHexAmount(e.balance, tokenDecimals(e.tokenSymbol));
     } catch {
       continue;
     }
-    if (!Number.isFinite(amount) || amount <= 0) continue;
     pending.push({
       chainId: e.chainId,
       asset: e.tokenSymbol,
-      amount: String(amount),
+      amount,
       isPending: e.isPending === true,
       ...typeof e.updatedAt === "string" && e.updatedAt !== "" ? { since: e.updatedAt } : {}
     });
@@ -554,13 +629,13 @@ function mapBalances(raw2, _chainId, smartWallet) {
       { balance, balanceWithFee, decimals }
     ] of Object.entries(tokensBySymbol ?? {})) {
       if (balanceWithFee === void 0 && balance === void 0) throw new Error("Zyfai asset balance is unavailable.");
-      const amount = hexToDecimal(balanceWithFee ?? balance, decimals);
-      totalBalance += amount;
+      const amount = exactHexAmount(balanceWithFee ?? balance, tokenDecimals(symbol, decimals));
+      totalBalance += Number(amount);
       tokens.push({
         chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
         chainId: positionChainId,
         asset: symbol,
-        amount: String(amount)
+        amount
       });
     }
   }
@@ -574,19 +649,17 @@ function mapBalances(raw2, _chainId, smartWallet) {
     // legacy `amount` fallback is hex. Runtime
     // getBalances payloads often carry one (e.g. 18 for WETH) — prefer that
     // when present, otherwise fall back to the per-symbol lookup.
-    amount: String(
-      p.underlyingAmountWithFee ?? p.underlyingAmount ? normalizeDecimalPlace(
-        p.underlyingAmountWithFee ?? p.underlyingAmount ?? "0",
-        tokenDecimals(
-          p.token_symbol,
-          p.decimals
-        )
-      ) : hexToDecimal(
-        p.amount || "0",
-        tokenDecimals(
-          p.token_symbol,
-          p.decimals
-        )
+    amount: p.underlyingAmountWithFee ?? p.underlyingAmount ? formatUnits(
+      BigInt(p.underlyingAmountWithFee ?? p.underlyingAmount ?? "0"),
+      tokenDecimals(
+        p.token_symbol,
+        p.decimals
+      )
+    ) : exactHexAmount(
+      p.amount || "0",
+      tokenDecimals(
+        p.token_symbol,
+        p.decimals
       )
     ),
     apy: netApy(p.pool_apy_withFee, p.pool_apy, "pool_apy_withFee"),
@@ -1530,7 +1603,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
           }, asset.address, entry.action === "Withdraw" ? "withdraw" : "deposit");
           if (evidence.transfer === "confirmed" && evidence.confirmedAmount) {
             Object.assign(tx, {
-              amount: formatUnits(BigInt(evidence.confirmedAmount), asset.decimals),
+              amount: formatUnits2(BigInt(evidence.confirmedAmount), asset.decimals),
               amountRaw: evidence.confirmedAmount,
               blockNumber: evidence.blockNumber,
               logIndexes: evidence.logIndexes,
@@ -2257,6 +2330,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
           evidence2 = { ...evidence2, transfer: "unknown" };
         }
         notifyFunding(onProgress, evidence2);
+        if (evidence2.transfer === "failed")
+          throw new OwneyError("AGENT_TRANSACTION_REVERTED", "Zyfai deposit transaction reverted.", { txHash }, this.id);
         try {
           const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
           await (tokenAddress ? this.sdk.logDeposit(validChainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(validChainId, txHash, amount));
@@ -2295,12 +2370,77 @@ var ZyfaiAgent = class _ZyfaiAgent {
       } catch {
       }
       notifyFunding(onProgress, evidence);
+      if (evidence.transfer === "failed")
+        throw new OwneyError("AGENT_TRANSACTION_REVERTED", "Zyfai deposit transaction reverted.", { txHash: raw2.txHash }, this.id);
       return { ...mapDeposit(raw2), evidence };
     } catch (error) {
       throw error;
     }
   }
   // --- IAgent: Fund operations ---
+  /** Called only after the execution endpoint explicitly rejected a request.
+   * A timeout or an accepted request never authorizes repair and resubmission. */
+  async recoverWithdrawalSession(state, chainId, token, owner) {
+    const internals = this.sdk;
+    const assertScope = () => {
+      const account = internals.walletClient?.account?.address;
+      if (state.walletAddress.toLowerCase() !== owner.toLowerCase() || this.connectedAddress?.toLowerCase() !== owner.toLowerCase() || this.connectedChainId !== chainId || account && account.toLowerCase() !== owner.toLowerCase())
+        throw new OwneyError("NOT_CONNECTED", "Wallet changed while preparing Zyfai withdrawal.", void 0, this.id);
+    };
+    assertScope();
+    const [wallet, registered, portfolio] = await Promise.all([
+      this.sdk.getSmartWalletAddress(owner, chainId),
+      this.sdk.getSmartWalletByEOA(owner),
+      this.sdk.getPortfolio(owner).catch(() => void 0)
+    ]);
+    assertScope();
+    if (!isAddress(wallet.address) || !registered.smartWallet || registered.smartWallet.toLowerCase() !== wallet.address.toLowerCase())
+      throw new OwneyError(
+        "AGENT_AUTH_FAILED",
+        "Could not verify Zyfai's withdrawal wallet.",
+        { reason: "ZYFAI_SESSION_UNAVAILABLE", phase: "prepare", chainId, token },
+        this.id
+      );
+    if (hasEmptyWithdrawalSnapshot(portfolio, chainId, token)) {
+      const asset = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === token);
+      const idle = asset ? await this.getPublicClient(chainId).readContract({
+        address: asset.address,
+        abi: erc20Abi2,
+        functionName: "balanceOf",
+        args: [wallet.address]
+      }).catch(() => void 0) : void 0;
+      assertScope();
+      if (idle === 0n) throw new OwneyError(
+        "WITHDRAW_INSUFFICIENT_BALANCE",
+        "No funds remain in Zyfai for this asset.",
+        { available: "0", chainId, token },
+        this.id
+      );
+    }
+    const walletState = await this.readWalletState(owner);
+    assertScope();
+    const unavailable = () => new OwneyError(
+      "AGENT_AUTH_FAILED",
+      "Zyfai has no active withdrawal session. Its withdrawal was not submitted.",
+      { reason: "ZYFAI_SESSION_UNAVAILABLE", phase: "prepare", chainId, token },
+      this.id
+    );
+    if (walletState.predeployed !== false || internals.isPredeployed === true) throw unavailable();
+    internals.hasActiveSessionKey = false;
+    const key2 = `${owner.toLowerCase()}:${chainId}`;
+    this.sessionKeyAttempts.delete(key2);
+    try {
+      const result = await this.sdk.createSessionKey(owner, chainId);
+      assertScope();
+      if (result.success === false || result.alreadyActive === true) throw unavailable();
+      this.sessionKeyAttempts.add(key2);
+    } catch (error) {
+      assertScope();
+      const code = error?.code;
+      if (code === 4001 || code === "ACTION_REJECTED" || error instanceof Error && /user (rejected|denied)|request rejected|action rejected/i.test(error.message)) throw error;
+      throw unavailable();
+    }
+  }
   async withdraw(state, chainId, token, amount, onProgress) {
     const validChainId = isValidChainId(chainId);
     try {
@@ -2318,11 +2458,35 @@ var ZyfaiAgent = class _ZyfaiAgent {
       });
       throw error;
     }
-    const observation = observeWithdrawalSubmission(this.sdk, validChainId, token);
+    let observation = observeWithdrawalSubmission(this.sdk, validChainId, token);
     const authToken = this.sdk.httpClient?.authToken;
+    const owner = this.getAddress();
     let raw2;
     try {
-      raw2 = await this.sdk.withdrawFunds(this.getAddress(), validChainId, amount, token);
+      for (let attempt = 0; attempt < 2; attempt++) {
+        try {
+          raw2 = await this.sdk.withdrawFunds(owner, validChainId, amount, token);
+          break;
+        } catch (error) {
+          if (!observation.rejected() || observation.request()?.failure !== "session-key-missing") throw error;
+          if (attempt === 1)
+            throw new OwneyError(
+              "AGENT_AUTH_FAILED",
+              "Zyfai has no active withdrawal session. Its withdrawal was not submitted.",
+              { reason: "ZYFAI_SESSION_UNAVAILABLE", phase: "prepare", chainId, token },
+              this.id
+            );
+          await this.recoverWithdrawalSession(state, validChainId, token, owner);
+          observation.stop();
+          observation = observeWithdrawalSubmission(this.sdk, validChainId, token);
+        }
+      }
+      if (!raw2) throw new OwneyError(
+        "AGENT_INVALID_RESPONSE",
+        "Zyfai returned no withdrawal result.",
+        { chainId, token, phase: "observe" },
+        this.id
+      );
     } catch (error) {
       this.invalidateRejectedWithdrawalSession(error, state, validChainId, authToken);
       if (observation.attempted() !== void 0) {
@@ -2605,10 +2769,13 @@ import {
   createPublicClient as createPublicClient3,
   createWalletClient as createWalletClient3,
   custom as custom3,
+  decodeEventLog as decodeEventLog2,
+  encodeEventTopics,
   encodeFunctionData,
-  erc20Abi as erc20Abi2,
+  erc20Abi as erc20Abi3,
+  erc4626Abi,
   getAddress as getAddress4,
-  isAddress as isAddress2
+  isAddress as isAddress3
 } from "viem";
 import { base as base4 } from "viem/chains";
 
@@ -3227,7 +3394,7 @@ var YieldseekerApiClient = class {
 };
 
 // src/agents/yieldseeker/yieldseeker.mapper.ts
-import { formatUnits as formatUnits2, isAddress } from "viem";
+import { formatUnits as formatUnits3, isAddress as isAddress2 } from "viem";
 
 // src/lib/helpers/snapshot-apy.ts
 var DAY_MS = 864e5;
@@ -3294,10 +3461,10 @@ function raw(value, endpoint) {
   return BigInt(value);
 }
 function decimal(value, decimals, endpoint) {
-  return formatUnits2(raw(value, endpoint), decimals);
+  return formatUnits3(raw(value, endpoint), decimals);
 }
 function usd(rawAmount, decimals, price) {
-  return Number(formatUnits2(rawAmount, decimals)) * price;
+  return Number(formatUnits3(rawAmount, decimals)) * price;
 }
 function percent(value) {
   const result = Number(value);
@@ -3323,7 +3490,7 @@ function assetAddressValue(record, address) {
 }
 function position(value, asset, baseAssetDecimals) {
   const option = value?.yieldOption;
-  if (!option || typeof option.provider !== "string" || typeof option.name !== "string" || typeof option.address !== "string" || !isAddress(option.address)) {
+  if (!option || typeof option.provider !== "string" || typeof option.name !== "string" || typeof option.address !== "string" || !isAddress2(option.address)) {
     return invalid("yield positions", "missing vault metadata");
   }
   return {
@@ -3415,7 +3582,7 @@ function mapYieldseekerEarnings(contexts) {
       chain: "BASE",
       chainId: 8453,
       asset: context.asset,
-      amount: formatUnits2(amount, context.snapshot.baseAssetDecimals)
+      amount: formatUnits3(amount, context.snapshot.baseAssetDecimals)
     });
     lifetimeEarnings += usd(
       amount,
@@ -3532,6 +3699,49 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
+function allocationEntry(action, context) {
+  if (action.actionType.toLowerCase() !== "autoseek") return void 0;
+  const hash = action.details?.depositTransactionHash;
+  const deposits = action.details?.deposits;
+  if (typeof hash !== "string" || !/^0x[a-fA-F0-9]{64}$/.test(hash) || !Array.isArray(deposits) || deposits.length === 0) return void 0;
+  const positions = [];
+  let amountRaw = 0n;
+  for (const deposit of deposits) {
+    if (!deposit || typeof deposit !== "object") return void 0;
+    const leg = deposit;
+    const symbol = typeof leg.assetSymbol === "string" ? leg.assetSymbol.toUpperCase() : "";
+    if (symbol !== context.asset && !(context.asset === "WETH" && symbol === "ETH")) return void 0;
+    if (typeof leg.vaultAddress !== "string" || !isAddress2(leg.vaultAddress)) return void 0;
+    const rawAmount = typeof leg.rawAmount === "string" && /^\d+$/.test(leg.rawAmount) ? BigInt(leg.rawAmount) : typeof leg.rawAmount === "number" && Number.isSafeInteger(leg.rawAmount) ? BigInt(leg.rawAmount) : void 0;
+    if (rawAmount === void 0 || rawAmount <= 0n) return void 0;
+    const option = context.positions.find((position2) => position2.yieldOption.address.toLowerCase() === leg.vaultAddress.toLowerCase())?.yieldOption;
+    positions.push({
+      protocol: typeof leg.vaultProvider === "string" && leg.vaultProvider ? leg.vaultProvider : option?.provider || "Vault",
+      pool: typeof leg.vaultName === "string" && leg.vaultName ? leg.vaultName : option?.name,
+      tokenSymbol: context.asset,
+      amount: formatUnits3(rawAmount, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    });
+    amountRaw += rawAmount;
+  }
+  return {
+    agent: "yieldseeker",
+    action: "Deposit",
+    date: action.createdDate,
+    oldApy: null,
+    newApy: null,
+    positions,
+    rebalanceLog: [],
+    transactions: [{
+      txHashes: [hash],
+      chainId: context.agent.chainId,
+      tokenAddress: context.agent.assetAddress,
+      tokenSymbol: context.asset,
+      agentWallet: context.wallet.walletAddress,
+      amountRaw: String(amountRaw),
+      amount: formatUnits3(amountRaw, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    }]
+  };
+}
 function depositDestination(context, movement) {
   const to = movement.toAddress.toLowerCase();
   const option = context.positions.find(({ yieldOption }) => yieldOption.chainId === movement.chainId && yieldOption.assetAddress.toLowerCase() === context.agent.assetAddress.toLowerCase() && yieldOption.address.toLowerCase() === to)?.yieldOption;
@@ -3599,20 +3809,30 @@ function mapYieldseekerHistory(contexts, options) {
       seenMovements.add(key2);
       return true;
     });
-    return [
-      ...movements.map(
-        (movement) => movementEntry(
-          movement,
-          context.wallet,
-          context.agent,
-          context.asset,
-          options.ownerAddress,
-          options.vaultAddresses,
-          depositDestination(context, movement)
-        )
-      ),
-      ...(context.actions ?? []).map(actionEntry)
-    ].filter((entry) => entry !== void 0);
+    const movementEntries = movements.map(
+      (movement) => movementEntry(
+        movement,
+        context.wallet,
+        context.agent,
+        context.asset,
+        options.ownerAddress,
+        options.vaultAddresses,
+        depositDestination(context, movement)
+      )
+    ).filter((entry) => entry !== void 0);
+    const deposits = new Set(movementEntries.filter((entry) => entry.action === "Deposit").map((entry) => entry.transactions[0]?.txHashes[0]?.toLowerCase()));
+    const actions = (context.actions ?? []).flatMap((action) => {
+      const allocation = allocationEntry(action, context);
+      if (allocation) {
+        const hash = allocation.transactions[0].txHashes[0].toLowerCase();
+        if (deposits.has(hash)) return [];
+        deposits.add(hash);
+        return [allocation];
+      }
+      const entry = actionEntry(action);
+      return entry ? [entry] : [];
+    });
+    return [...movementEntries, ...actions];
   });
   const grouped = /* @__PURE__ */ new Map();
   const ungrouped = [];
@@ -3642,7 +3862,7 @@ function mapYieldseekerHistory(contexts, options) {
       const known = new Set(target.logIndexes ?? []);
       if (tx.logIndexes?.some((index) => !known.has(index))) {
         target.amountRaw = String(BigInt(target.amountRaw ?? "0") + BigInt(tx.amountRaw));
-        target.amount = formatUnits2(
+        target.amount = formatUnits3(
           BigInt(target.amountRaw),
           YIELDSEEKER_ASSET_METADATA[target.tokenSymbol].decimals
         );
@@ -3737,7 +3957,8 @@ var walletAbi = parseAbi3([
   "function ownerAgentIndex() view returns (uint256)",
   "function baseAsset() view returns (address)",
   "function FACTORY() view returns (address)",
-  "function upgradeToLatest()"
+  "function upgradeToLatest()",
+  "event Upgraded(address indexed implementation)"
 ]);
 var factoryAbi = parseAbi3([
   "function userWallets(address owner, uint256 index) view returns (address)",
@@ -3746,19 +3967,19 @@ var factoryAbi = parseAbi3([
 function yieldseekerOwnerPath(code) {
   return !code || code === "0x" || /^0xef0100[0-9a-f]{40}$/i.test(code) ? "eoa" : "smart";
 }
-async function readYieldseekerWalletStatus(client, wallet, owner, asset) {
+async function readYieldseekerWalletStatus(client, wallet, owner, asset, blockNumber) {
   const agentWallet = getAddress2(wallet);
   const expectedOwner = getAddress2(owner);
   const expectedAsset = getAddress2(asset);
   const [code, ownerCode, slot, actualOwner, index, actualAsset, actualFactory, latest] = await Promise.all([
-    client.getBytecode({ address: agentWallet }),
-    client.getBytecode({ address: expectedOwner }),
-    client.getStorageAt({ address: agentWallet, slot: ERC1967_IMPLEMENTATION_SLOT }),
-    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "owner" }),
-    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "ownerAgentIndex" }),
-    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "baseAsset" }),
-    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "FACTORY" }),
-    client.readContract({ address: YIELDSEEKER_FACTORY, abi: factoryAbi, functionName: "agentWalletImplementation" })
+    client.getBytecode({ address: agentWallet, blockNumber }),
+    client.getBytecode({ address: expectedOwner, blockNumber }),
+    client.getStorageAt({ address: agentWallet, slot: ERC1967_IMPLEMENTATION_SLOT, blockNumber }),
+    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "owner", blockNumber }),
+    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "ownerAgentIndex", blockNumber }),
+    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "baseAsset", blockNumber }),
+    client.readContract({ address: agentWallet, abi: walletAbi, functionName: "FACTORY", blockNumber }),
+    client.readContract({ address: YIELDSEEKER_FACTORY, abi: factoryAbi, functionName: "agentWalletImplementation", blockNumber })
   ]);
   if (!code || code === "0x" || !slot || /^0x0+$/.test(slot)) {
     throw new Error("Yieldseeker wallet is not a deployed ERC1967 proxy");
@@ -3768,7 +3989,8 @@ async function readYieldseekerWalletStatus(client, wallet, owner, asset) {
     address: YIELDSEEKER_FACTORY,
     abi: factoryAbi,
     functionName: "userWallets",
-    args: [expectedOwner, index]
+    args: [expectedOwner, index],
+    blockNumber
   });
   const verified = isAddressEqual(actualOwner, expectedOwner) && isAddressEqual(actualAsset, expectedAsset) && isAddressEqual(actualFactory, YIELDSEEKER_FACTORY) && isAddressEqual(mapped, agentWallet);
   const version = !verified ? "unknown" : isAddressEqual(implementation, YIELDSEEKER_V2_IMPLEMENTATION) ? "v2" : isAddressEqual(implementation, YIELDSEEKER_V1_IMPLEMENTATION) ? "v1" : "unknown";
@@ -3792,11 +4014,13 @@ import {
   getAddress as getAddress3,
   toHex
 } from "viem";
-import { getUserOperationHash } from "viem/account-abstraction";
+import { getUserOperationHash as getUserOperationHash2 } from "viem/account-abstraction";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
 import { base as base3 } from "viem/chains";
 var ENTRY_POINT_V06 = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
 var USER_OP_FEE_HEADROOM = 2n;
+var OBSERVATION_WINDOW_MS = 6e4;
+var OBSERVATION_POLL_MS = 1500;
 var ENTRY_POINT_NONCE_ABI = [
   { type: "function", name: "getNonce", stateMutability: "view", inputs: [
     { name: "sender", type: "address" },
@@ -3806,7 +4030,7 @@ var ENTRY_POINT_NONCE_ABI = [
 var DEFAULT_ROUTING_API = "https://owney-routing-api-243946518160.europe-west4.run.app";
 var SIMULATION_ACCOUNT = privateKeyToAccount(generatePrivateKey());
 function operationHash(operation) {
-  return getUserOperationHash({
+  return getUserOperationHash2({
     chainId: 8453,
     entryPointAddress: ENTRY_POINT_V06,
     entryPointVersion: "0.6",
@@ -3829,10 +4053,119 @@ function sponsorError(message, safeToFallback, details = {}) {
   return new OwneyError(
     "SPONSOR_REQUEST_FAILED",
     message,
-    { safeToFallback, ...details },
+    {
+      safeToFallback,
+      phase: safeToFallback ? "prepare" : "observe",
+      failureCode: safeToFallback ? "SPONSOR_PREPARATION_FAILED" : "SPONSOR_OUTCOME_UNRESOLVED",
+      ...safeToFallback ? { rejectedBeforeSubmission: true } : {},
+      ...details
+    },
     "yieldseeker"
   );
 }
+function providerReason(value) {
+  if (typeof value !== "string") return void 0;
+  return value.replace(/https?:\/\/\S+/gi, "[url]").replace(/0x[0-9a-fA-F]{40,}/g, "[hex]").replace(/[A-Za-z0-9_+=\/-]{48,}/g, "[token]").slice(0, 300);
+}
+function rpcDiagnostics(data) {
+  const details = {};
+  if (typeof data?.failureCode === "string" && [
+    "SPONSOR_RATE_LIMIT",
+    "SPONSOR_UPSTREAM_UNAVAILABLE",
+    "SPONSOR_RPC_UNSUPPORTED",
+    "SPONSOR_POLICY_REJECTED",
+    "SPONSOR_BUDGET_REJECTED",
+    "SPONSOR_EXECUTION_REVERTED"
+  ].includes(data.failureCode))
+    details.failureCode = data.failureCode;
+  if (typeof data?.revertSelector === "string" && /^0x[0-9a-fA-F]{8}$/.test(data.revertSelector))
+    details.revertSelector = data.revertSelector;
+  if (typeof data?.revertName === "string" && [
+    "InsufficientBalance",
+    "InvalidAsset",
+    "Unauthorized",
+    "Error",
+    "Panic",
+    "FailedOp",
+    "FailedOpWithRevert"
+  ].includes(data.revertName))
+    details.revertName = data.revertName;
+  if (typeof data?.aaCode === "string" && /^AA[0-9]{2}$/.test(data.aaCode)) details.aaCode = data.aaCode;
+  if (typeof data?.panicCode === "string" && /^0x[0-9a-fA-F]{1,2}$/.test(data.panicCode)) {
+    const panicCode = toHex(BigInt(data.panicCode));
+    if (["0x0", "0x1", "0x11", "0x12", "0x21", "0x22", "0x31", "0x32", "0x41", "0x51"].includes(panicCode))
+      details.panicCode = panicCode;
+  }
+  return details;
+}
+function isHash(value) {
+  return typeof value === "string" && /^0x[0-9a-fA-F]{64}$/.test(value);
+}
+async function assertOwnerSession(state, owner) {
+  const [chain, accounts] = await Promise.all([
+    state.provider.request({ method: "eth_chainId" }),
+    state.provider.request({ method: "eth_accounts" })
+  ]);
+  if (Number(chain) !== 8453)
+    throw new OwneyError(
+      "CHAIN_MISMATCH",
+      "Switch back to Base before withdrawing.",
+      { rejectedBeforeSubmission: true, phase: "prepare" },
+      "yieldseeker"
+    );
+  if (!Array.isArray(accounts) || typeof accounts[0] !== "string" || accounts[0].toLowerCase() !== owner.toLowerCase())
+    throw new OwneyError(
+      "NOT_CONNECTED",
+      "The connected withdrawal account changed.",
+      { rejectedBeforeSubmission: true, phase: "prepare" },
+      "yieldseeker"
+    );
+}
+function savePending(onPending, evidence, beforeSubmission = false) {
+  try {
+    onPending?.(evidence);
+  } catch {
+    if (beforeSubmission)
+      throw sponsorError(
+        "Withdrawal status cannot be saved before submission.",
+        true,
+        { phase: "prepare", rejectedBeforeSubmission: true, failureCode: "RECOVERY_STORAGE_UNAVAILABLE" }
+      );
+  }
+}
+async function checkpoint(callback, pending) {
+  try {
+    await callback?.(pending);
+  } catch {
+    throw sponsorError(
+      "Withdrawal status cannot be saved before submission.",
+      true,
+      { phase: "prepare", rejectedBeforeSubmission: true, failureCode: "RECOVERY_STORAGE_UNAVAILABLE" }
+    );
+  }
+}
+function finalPaymasterFields(value) {
+  const result = {};
+  for (const key2 of [
+    "paymasterAndData",
+    "callGasLimit",
+    "verificationGasLimit",
+    "preVerificationGas",
+    "maxFeePerGas",
+    "maxPriorityFeePerGas"
+  ]) {
+    const field = value[key2];
+    if (field === void 0) continue;
+    if (typeof field !== "string" || !/^0x[0-9a-fA-F]+$/.test(field))
+      throw sponsorError(
+        "Paymaster returned an invalid final operation.",
+        true,
+        { phase: "prepare", rejectedBeforeSubmission: true, failureCode: "INVALID_PAYMASTER_QUOTE" }
+      );
+    result[key2] = field;
+  }
+  return result;
+}
 async function requestIntent(input) {
   const baseUrl = (input.routingApiBaseUrl ?? DEFAULT_ROUTING_API).replace(/\/$/, "");
   let response;
@@ -3854,18 +4187,35 @@ async function requestIntent(input) {
         action: input.action,
         yieldseekerUserId: input.userId,
         yieldseekerAgentId: input.agentId
-      })
+      }),
+      signal: AbortSignal.timeout(15e3)
     });
   } catch {
-    throw sponsorError("Withdrawal sponsorship could not be requested.", true);
+    throw sponsorError(
+      "Withdrawal sponsorship could not be requested.",
+      true,
+      { phase: "prepare", rejectedBeforeSubmission: true, failureCode: "INTENT_NETWORK_ERROR" }
+    );
   }
   const envelope = await response.json().catch(() => null);
   const intent = envelope?.data;
   if (!response.ok || !envelope?.success || !intent?.intent || !["eoa", "smart"].includes(intent.ownerPath)) {
+    const rawCode = typeof envelope?.failureCode === "string" ? envelope.failureCode : envelope?.code;
+    const failureCode = typeof rawCode === "string" && /^[A-Z][A-Z0-9_]{0,79}$/.test(rawCode) ? rawCode : void 0;
+    if (input.refreshYieldseekerSignature && (failureCode === "YIELDSEEKER_AUTH_REJECTED" || failureCode === "AUTH_REJECTED" || envelope?.sponsorshipStage === "provider-auth" && (envelope.providerStatus === 401 || envelope.providerStatus === 403))) {
+      const signature = await input.refreshYieldseekerSignature(input.yieldseekerSignature);
+      return requestIntent({ ...input, yieldseekerSignature: signature, refreshYieldseekerSignature: void 0 });
+    }
     throw sponsorError(
       "Withdrawal sponsorship is currently unavailable.",
       true,
-      { statusCode: response.status }
+      {
+        statusCode: response.status,
+        phase: "prepare",
+        rejectedBeforeSubmission: true,
+        failureCode: failureCode ?? "INTENT_REJECTED",
+        providerReason: providerReason(envelope?.message)
+      }
     );
   }
   const url = new URL(`${baseUrl}/api/v1/sponsor/yieldseeker-withdraw/rpc`);
@@ -3878,19 +4228,55 @@ async function rpc(url, method, params, phase) {
     response = await fetch(url, {
       method: "POST",
       headers: { "content-type": "application/json" },
-      body: JSON.stringify({ jsonrpc: "2.0", id: 1, method, params })
+      body: JSON.stringify({ jsonrpc: "2.0", id: 1, method, params }),
+      signal: AbortSignal.timeout(15e3)
     });
   } catch {
-    throw sponsorError("Withdrawal sponsorship request status is unknown.", phase === "prepare");
+    throw sponsorError(
+      "Withdrawal sponsorship request status is unknown.",
+      phase === "prepare",
+      {
+        phase,
+        rpcMethod: method,
+        ...phase === "prepare" ? { rejectedBeforeSubmission: true } : {},
+        failureCode: "RPC_NETWORK_ERROR"
+      }
+    );
   }
   const payload = await response.json().catch(() => null);
   if (!response.ok || payload?.error || payload?.result === void 0) {
     const rejection = payload?.error;
-    const definitiveRejection = phase === "send" && response.status < 500 && !!rejection && (rejection.data?.rejectedBeforeSubmission === true || [-32501, -32502, -32503, -32504, -32505, -32507].includes(rejection.code ?? 0) || /maxFeePerGas.*(?:too low|lower than|less than|must be at least)/i.test(rejection.message ?? ""));
+    const diagnostics = rpcDiagnostics(rejection?.data);
+    const executionReverted = rejection?.code === -32521 || diagnostics.failureCode === "SPONSOR_EXECUTION_REVERTED";
+    const details = {
+      statusCode: response.status,
+      rpcCode: rejection?.code,
+      rpcMethod: method,
+      phase,
+      providerReason: providerReason(rejection?.data?.providerReason) ?? providerReason(rejection?.message),
+      failureCode: "RPC_REJECTED",
+      ...diagnostics
+    };
+    if (phase === "prepare" && executionReverted)
+      throw new OwneyError(
+        "WITHDRAW_FAILED",
+        "Yieldseeker withdrawal simulation reverted before submission.",
+        {
+          ...details,
+          failureCode: "SPONSOR_EXECUTION_REVERTED",
+          safeToFallback: false,
+          rejectedBeforeSubmission: true
+        },
+        "yieldseeker"
+      );
+    const definitiveRejection = phase === "send" && !executionReverted && response.status < 500 && !!rejection && (rejection.data?.rejectedBeforeSubmission === true || [-32501, -32502, -32503, -32504, -32505, -32507].includes(rejection.code ?? 0) || /maxFeePerGas.*(?:too low|lower than|less than|must be at least)/i.test(rejection.message ?? ""));
     throw sponsorError(
       phase !== "prepare" && !definitiveRejection ? "Sponsored withdrawal submission status is unknown." : "Withdrawal sponsorship was declined before submission.",
       phase === "prepare" || definitiveRejection,
-      { statusCode: response.status, rpcCode: payload?.error?.code, rpcMethod: method }
+      {
+        ...details,
+        ...phase === "prepare" || definitiveRejection ? { rejectedBeforeSubmission: true } : {}
+      }
     );
   }
   return payload.result;
@@ -3910,13 +4296,15 @@ async function submitEoa(input) {
   let nonce;
   let fees;
   try {
-    nonce = await input.client.readContract({
-      address: ENTRY_POINT_V06,
-      abi: ENTRY_POINT_NONCE_ABI,
-      functionName: "getNonce",
-      args: [input.agentWallet, 0n]
-    });
-    fees = await input.client.estimateFeesPerGas();
+    [nonce, fees] = await Promise.all([
+      input.client.readContract({
+        address: ENTRY_POINT_V06,
+        abi: ENTRY_POINT_NONCE_ABI,
+        functionName: "getNonce",
+        args: [input.agentWallet, 0n]
+      }),
+      input.client.estimateFeesPerGas()
+    ]);
   } catch {
     throw sponsorError("Could not prepare the sponsored withdrawal.", true);
   }
@@ -3959,9 +4347,10 @@ async function submitEoa(input) {
     );
     if (!final.paymasterAndData?.startsWith("0x"))
       throw sponsorError("CDP did not return final paymaster data.", true);
-    operation = { ...operation, paymasterAndData: final.paymasterAndData };
+    operation = { ...operation, ...finalPaymasterFields(final) };
   }
   const userOpHash = operationHash(operation);
+  await assertOwnerSession(input.state, input.owner);
   const wallet = createWalletClient2({
     account: input.owner,
     chain: base3,
@@ -3969,24 +4358,47 @@ async function submitEoa(input) {
   });
   const signature = await wallet.signMessage({ message: { raw: userOpHash } });
   operation = { ...operation, signature };
-  input.onPending?.({ userOpHash });
+  await assertOwnerSession(input.state, input.owner);
+  const userOperation = {
+    sender: operation.sender,
+    nonce: operation.nonce,
+    initCode: operation.initCode,
+    callData: operation.callData,
+    callGasLimit: operation.callGasLimit,
+    verificationGasLimit: operation.verificationGasLimit,
+    preVerificationGas: operation.preVerificationGas,
+    maxFeePerGas: operation.maxFeePerGas,
+    maxPriorityFeePerGas: operation.maxPriorityFeePerGas,
+    paymasterAndData: operation.paymasterAndData
+  };
+  savePending(input.onPending, { userOpHash, userOperation }, true);
+  await checkpoint(input.onBeforeSubmission, { userOpHash, userOperation });
   const submittedHash = await rpc(
     input.rpcUrl,
     "eth_sendUserOperation",
     [operation, ENTRY_POINT_V06],
     "send"
   );
-  if (submittedHash.toLowerCase() !== userOpHash.toLowerCase())
+  if (!isHash(submittedHash) || submittedHash.toLowerCase() !== userOpHash.toLowerCase())
     throw sponsorError(
       "Bundler returned a different UserOperation hash.",
       false,
-      { userOpHash, submittedHash }
+      { userOpHash, submittedHash, phase: "send", failureCode: "BUNDLER_HASH_MISMATCH" }
     );
-  for (let poll = 0; poll < 40; poll++) {
-    const response = await rpc(input.rpcUrl, "eth_getUserOperationReceipt", [userOpHash], "observe");
+  const deadline = Date.now() + OBSERVATION_WINDOW_MS;
+  let lastReadError;
+  for (let poll = 0; poll < 40 && Date.now() < deadline; poll++) {
+    let response;
+    try {
+      response = await rpc(input.rpcUrl, "eth_getUserOperationReceipt", [userOpHash], "observe");
+    } catch (error) {
+      lastReadError = error;
+      await new Promise((resolve) => setTimeout(resolve, Math.min(OBSERVATION_POLL_MS, Math.max(0, deadline - Date.now()))));
+      continue;
+    }
     const txHash = response?.receipt?.transactionHash;
-    if (txHash) {
-      input.onPending?.({ userOpHash, txHash });
+    if (isHash(txHash)) {
+      savePending(input.onPending, { userOpHash, txHash });
       if (response?.success === false)
         throw new OwneyError(
           "AGENT_TRANSACTION_REVERTED",
@@ -3996,12 +4408,17 @@ async function submitEoa(input) {
         );
       return { txHash, receipt: await waitForTransaction(input.client, txHash) };
     }
-    await new Promise((resolve) => setTimeout(resolve, 1500));
+    await new Promise((resolve) => setTimeout(resolve, OBSERVATION_POLL_MS));
   }
   throw sponsorError(
     "Sponsored withdrawal is still pending; check status before retrying.",
     false,
-    { userOpHash }
+    {
+      userOpHash,
+      phase: "observe",
+      failureCode: "RECEIPT_UNRESOLVED",
+      ...lastReadError instanceof OwneyError ? { lastObservationError: lastReadError.details } : {}
+    }
   );
 }
 async function submitSmart(input) {
@@ -4014,14 +4431,14 @@ async function submitSmart(input) {
   } catch {
     throw sponsorError("This account cannot check paymaster support on Base.", true);
   }
-  if (!capabilities?.[toHex(8453)]?.paymasterService?.supported && !capabilities?.["8453"]?.paymasterService?.supported)
+  const supportsPaymaster = capabilities?.[toHex(8453)]?.paymasterService?.supported ?? capabilities?.["8453"]?.paymasterService?.supported ?? capabilities?.["0x0"]?.paymasterService?.supported;
+  if (supportsPaymaster !== true)
     throw sponsorError("This account cannot use a paymaster on Base.", true);
+  await assertOwnerSession(input.state, input.owner);
   let sent;
-  try {
-    input.onPending?.({});
-  } catch {
-    throw sponsorError("Upgrade or withdrawal status cannot be saved.", true);
-  }
+  const requestedId = toHex(globalThis.crypto.getRandomValues(new Uint8Array(32)));
+  savePending(input.onPending, { callsId: requestedId }, true);
+  await checkpoint(input.onBeforeSubmission, { callsId: requestedId });
   try {
     sent = await input.state.provider.request({
       method: "wallet_sendCalls",
@@ -4029,6 +4446,7 @@ async function submitSmart(input) {
         version: "2.0.0",
         from: input.owner,
         chainId: toHex(8453),
+        id: requestedId,
         atomicRequired: false,
         calls: [{ to: input.agentWallet, value: "0x0", data: input.callData }],
         capabilities: { paymasterService: { url: input.rpcUrl } }
@@ -4037,17 +4455,27 @@ async function submitSmart(input) {
   } catch (error) {
     if (error?.code === 4001) throw error;
     if ([4200, -32601].includes(Number(error?.code)))
-      throw sponsorError("This account does not support sponsored calls.", true);
-    throw sponsorError("Wallet submission status is unknown. Check activity before retrying.", false);
+      throw sponsorError(
+        "This account does not support sponsored calls.",
+        true,
+        { phase: "send", failureCode: "WALLET_CALLS_UNSUPPORTED" }
+      );
+    throw sponsorError(
+      "Wallet submission status is unknown. Check activity before retrying.",
+      false,
+      { callsId: requestedId, phase: "send", failureCode: "WALLET_SEND_UNRESOLVED" }
+    );
   }
   const callsId = typeof sent === "string" ? sent : sent?.id;
-  if (!callsId) throw sponsorError("Wallet returned no calls ID; submission status is unknown.", false);
-  try {
-    input.onPending?.({ callsId });
-  } catch {
-    throw sponsorError("Submitted call status could not be saved.", false, { callsId });
-  }
-  for (let poll = 0; poll < 40; poll++) {
+  if (typeof callsId !== "string" || callsId.length === 0 || callsId.length > 8194)
+    throw sponsorError(
+      "Wallet returned no calls ID; submission status is unknown.",
+      false,
+      { callsId: requestedId, phase: "send", failureCode: "WALLET_SEND_UNRESOLVED" }
+    );
+  savePending(input.onPending, { callsId });
+  const deadline = Date.now() + OBSERVATION_WINDOW_MS;
+  for (let poll = 0; poll < 40 && Date.now() < deadline; poll++) {
     let status;
     try {
       status = await input.state.provider.request({
@@ -4055,33 +4483,40 @@ async function submitSmart(input) {
         params: [callsId]
       });
     } catch {
-      throw sponsorError("Sponsored withdrawal status is unknown.", false, { callsId });
+      await new Promise((resolve) => setTimeout(resolve, Math.min(OBSERVATION_POLL_MS, Math.max(0, deadline - Date.now()))));
+      continue;
     }
-    if (status?.status === 400 || status?.status === 500)
+    if (status?.id !== void 0 && status.id !== callsId || status?.chainId !== void 0 && Number(status.chainId) !== 8453)
+      throw sponsorError(
+        "Wallet returned a different sponsored operation status.",
+        false,
+        { callsId, phase: "observe", failureCode: "WALLET_STATUS_MISMATCH" }
+      );
+    if (Number(status?.status) === 400 || Number(status?.status) === 500)
       throw sponsorError(
         "Sponsored withdrawal failed in the wallet.",
         false,
-        { callsId, executionFailed: true }
+        { callsId, executionFailed: true, phase: "observe", failureCode: "WALLET_EXECUTION_FAILED" }
       );
-    const txHash = status?.receipts?.[0]?.transactionHash;
+    const hashes = [...new Set((status?.receipts ?? []).map((receipt) => receipt.transactionHash).filter(isHash))];
+    const txHash = hashes.length === 1 ? hashes[0] : void 0;
     if (txHash) {
-      try {
-        input.onPending?.({ callsId, txHash });
-      } catch {
-        throw sponsorError(
-          "Submitted call receipt could not be saved.",
-          false,
-          { callsId, txHash }
+      savePending(input.onPending, { callsId, txHash });
+      if (status?.receipts?.some((receipt) => receipt.transactionHash === txHash && /^(?:0x0+|0|failed|reverted)$/i.test(String(receipt.status))))
+        throw new OwneyError(
+          "AGENT_TRANSACTION_REVERTED",
+          "Sponsored withdrawal execution reverted.",
+          { callsId, transactionHash: txHash },
+          "yieldseeker"
         );
-      }
       return { txHash, receipt: await waitForTransaction(input.client, txHash) };
     }
-    await new Promise((resolve) => setTimeout(resolve, 1500));
+    await new Promise((resolve) => setTimeout(resolve, OBSERVATION_POLL_MS));
   }
   throw sponsorError(
     "Sponsored withdrawal is still pending; check status before retrying.",
     false,
-    { callsId }
+    { callsId, phase: "observe", failureCode: "RECEIPT_UNRESOLVED" }
   );
 }
 async function submitYieldseekerSponsoredWithdrawal(input) {
@@ -4096,7 +4531,8 @@ async function submitYieldseekerSponsoredWithdrawal(input) {
     agentWallet: input.agentWallet,
     asset: input.asset,
     callData: input.callData,
-    action: "withdraw"
+    action: "withdraw",
+    refreshYieldseekerSignature: input.refreshYieldseekerSignature
   });
   const args = { ...input, owner, rpcUrl };
   return intent.ownerPath === "eoa" ? submitEoa(args) : submitSmart(args);
@@ -4113,7 +4549,8 @@ async function submitYieldseekerSponsoredUpgrade(input) {
     agentWallet: input.agentWallet,
     asset: input.asset,
     callData: input.callData,
-    action: "upgrade"
+    action: "upgrade",
+    refreshYieldseekerSignature: input.refreshYieldseekerSignature
   });
   if (intent.ownerPath !== "smart")
     throw sponsorError("V1 upgrade sponsorship requires a Base Account owner.", true);
@@ -4134,6 +4571,8 @@ var YIELDSEEKER_SETTLEMENT_ACTIVITY_CACHE_MS = 15e3;
 var YIELDSEEKER_READ_FAILURE_COOLDOWN_MS = 6e4;
 var YIELDSEEKER_SETTLEMENT_WINDOW_MS = 5 * 6e4;
 var YIELDSEEKER_ACTIVITY_CACHE_MS = 6e4;
+var YIELDSEEKER_MAX_WITHDRAW_SWEEPS = 3;
+var YIELDSEEKER_MAX_POSITION_VERIFICATION_MS = 2e3;
 function generateYieldseekerUsername() {
   const suffix = globalThis.crypto.randomUUID().replaceAll("-", "").slice(0, YIELDSEEKER_USERNAME_RANDOM_LENGTH).toLowerCase();
   return `${YIELDSEEKER_USERNAME_PREFIX}${suffix}`;
@@ -4144,6 +4583,13 @@ function isUsernameConflict(error) {
   return code.includes("USERNAME") && (code.includes("TAKEN") || code.includes("EXIST") || code.includes("UNAVAILABLE") || code.includes("IN_USE"));
 }
 var YIELDSEEKER_AGENT_WALLET_ABI = [
+  {
+    type: "function",
+    name: "feeTracker",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "", type: "address" }]
+  },
   {
     type: "function",
     name: "withdrawAssetToUser",
@@ -4166,6 +4612,13 @@ var YIELDSEEKER_AGENT_WALLET_ABI = [
     outputs: []
   }
 ];
+var YIELDSEEKER_FEE_TRACKER_ABI = [{
+  type: "function",
+  name: "getFeesOwed",
+  stateMutability: "view",
+  inputs: [{ name: "wallet", type: "address" }],
+  outputs: [{ name: "", type: "uint256" }]
+}];
 function query(params) {
   const search = new URLSearchParams();
   for (const [key2, value] of Object.entries(params)) {
@@ -4249,17 +4702,22 @@ var YieldseekerAgent = class {
       getAddress4(state.walletAddress),
       YIELDSEEKER_ASSET_METADATA[asset].address
     );
+    this.rememberWalletStatus(key2, status);
+    return status;
+  }
+  rememberWalletStatus(key2, status) {
     if (status.verified && status.version === "v2") {
       this.withdrawalVersionCache.set(key2, { at: Date.now(), status: { ...status } });
       if (this.withdrawalVersionCache.size > 128)
         this.withdrawalVersionCache.delete(this.withdrawalVersionCache.keys().next().value);
     } else this.withdrawalVersionCache.delete(key2);
-    return status;
   }
   /** Explicit owner action. This never runs as a side effect of withdrawal. */
   async upgradeWallet(state, chainId, asset, gasMode = "paid") {
+    const generation = this.readGeneration;
     const before = await this.getWalletStatus(state, chainId, asset);
-    if (!before?.verified || !before.upgradeAvailable) {
+    this.assertSession(generation, chainId);
+    if (!before?.verified || before.version === "unknown") {
       throw new OwneyError(
         "WITHDRAW_FAILED",
         "This Yieldseeker wallet cannot be upgraded to the reviewed V2 implementation.",
@@ -4267,48 +4725,77 @@ var YieldseekerAgent = class {
         this.id
       );
     }
-    const data = encodeFunctionData({ abi: YIELDSEEKER_UPGRADE_ABI, functionName: "upgradeToLatest" });
-    let txHash;
-    if (gasMode === "sponsored") {
-      if (before.ownerPath !== "smart")
-        throw new OwneyError(
-          "SPONSOR_REQUEST_FAILED",
-          "EOA owners pay Base gas for the V1 upgrade.",
-          { safeToFallback: true },
-          this.id
-        );
-      let storage5;
-      try {
-        storage5 = typeof window === "undefined" ? void 0 : window.localStorage;
-      } catch {
-        storage5 = void 0;
-      }
-      if (!storage5)
+    const versionKey = `${chainId}:${before.owner.toLowerCase()}:${before.agentWallet.toLowerCase()}:${asset}`;
+    const pendingKey2 = `owney.yieldseeker.upgrade:${before.owner.toLowerCase()}:${before.agentWallet.toLowerCase()}`;
+    const confirmUpgrade = async (hash, receipt2) => {
+      this.withdrawalVersionCache.delete(versionKey);
+      const upgradeTopic = encodeEventTopics({ abi: YIELDSEEKER_UPGRADE_ABI, eventName: "Upgraded" })[0];
+      const lastUpgrade = receipt2?.logs.filter((log) => log.address.toLowerCase() === before.agentWallet.toLowerCase() && log.topics[0] === upgradeTopic).at(-1);
+      const expectedUpgrade = (() => {
+        if (!lastUpgrade || lastUpgrade.removed) return false;
+        try {
+          const event = decodeEventLog2({ abi: YIELDSEEKER_UPGRADE_ABI, eventName: "Upgraded", data: lastUpgrade.data, topics: lastUpgrade.topics });
+          return event.args.implementation.toLowerCase() === YIELDSEEKER_V2_IMPLEMENTATION.toLowerCase();
+        } catch {
+          return false;
+        }
+      })();
+      if (!receipt2 || receipt2.status !== "success" || receipt2.transactionHash.toLowerCase() !== hash.toLowerCase() || typeof receipt2.blockNumber !== "bigint" || !expectedUpgrade)
         throw new OwneyError(
-          "SPONSOR_REQUEST_FAILED",
-          "Upgrade status cannot be saved in this browser.",
-          { safeToFallback: true },
+          "WITHDRAW_FAILED",
+          "Yieldseeker wallet upgrade receipt could not be verified.",
+          { txHash: hash, reason: "UPGRADE_RECEIPT_MISMATCH" },
           this.id
         );
-      const pendingKey = `owney.yieldseeker.upgrade:${state.walletAddress.toLowerCase()}:${before.agentWallet.toLowerCase()}`;
-      let prior = null;
-      let saved;
+      this.assertSession(generation, chainId);
+      const status = {
+        ...before,
+        implementation: YIELDSEEKER_V2_IMPLEMENTATION,
+        version: "v2",
+        upgradeAvailable: false
+      };
+      this.rememberWalletStatus(versionKey, status);
+      return { txHash: hash, status };
+    };
+    let storage5;
+    try {
+      storage5 = typeof window === "undefined" ? void 0 : window.localStorage;
+    } catch {
+      storage5 = void 0;
+    }
+    const clearConfirmedUpgrade = () => {
       try {
-        saved = storage5.getItem(pendingKey);
+        storage5?.removeItem(pendingKey2);
       } catch {
-        throw new OwneyError(
-          "SPONSOR_REQUEST_FAILED",
-          "Upgrade status cannot be read in this browser.",
-          { safeToFallback: true },
-          this.id
-        );
       }
+    };
+    if (!storage5 && (gasMode === "sponsored" || before.ownerPath === "smart"))
+      throw new OwneyError(
+        "SPONSOR_REQUEST_FAILED",
+        "Upgrade status cannot be saved in this browser.",
+        { safeToFallback: false },
+        this.id
+      );
+    let prior = null;
+    try {
+      const saved = storage5?.getItem(pendingKey2);
       try {
         prior = JSON.parse(saved ?? "null");
       } catch {
         prior = { callsId: void 0 };
       }
-      if (prior) {
+    } catch {
+      if (gasMode === "paid" && before.ownerPath === "eoa") storage5 = void 0;
+      else throw new OwneyError(
+        "SPONSOR_REQUEST_FAILED",
+        "Upgrade status cannot be read in this browser.",
+        { safeToFallback: false },
+        this.id
+      );
+    }
+    if (prior) {
+      let earlierHash = this.isTransactionHash(prior.txHash) ? prior.txHash : void 0;
+      if (!earlierHash) {
         if (!prior.callsId)
           throw new OwneyError(
             "SPONSOR_REQUEST_FAILED",
@@ -4318,10 +4805,7 @@ var YieldseekerAgent = class {
           );
         let callsStatus;
         try {
-          callsStatus = await state.provider.request({
-            method: "wallet_getCallsStatus",
-            params: [prior.callsId]
-          });
+          callsStatus = await state.provider.request({ method: "wallet_getCallsStatus", params: [prior.callsId] });
         } catch {
           throw new OwneyError(
             "SPONSOR_REQUEST_FAILED",
@@ -4330,8 +4814,15 @@ var YieldseekerAgent = class {
             this.id
           );
         }
-        if (callsStatus?.status === 400 || callsStatus?.status === 500) {
-          storage5.removeItem(pendingKey);
+        if (callsStatus?.id !== void 0 && callsStatus.id !== prior.callsId || callsStatus?.chainId !== void 0 && Number(callsStatus.chainId) !== chainId)
+          throw new OwneyError(
+            "SPONSOR_REQUEST_FAILED",
+            "The earlier upgrade returned a different operation status.",
+            { safeToFallback: false, callsId: prior.callsId },
+            this.id
+          );
+        if (Number(callsStatus?.status) === 400 || Number(callsStatus?.status) === 500) {
+          storage5.removeItem(pendingKey2);
           throw new OwneyError(
             "SPONSOR_REQUEST_FAILED",
             "The earlier sponsored upgrade failed.",
@@ -4339,22 +4830,39 @@ var YieldseekerAgent = class {
             this.id
           );
         }
-        const earlierHash = callsStatus?.receipts?.[0]?.transactionHash;
-        if (earlierHash) {
-          await this.waitForReceipt(state, chainId, earlierHash);
-          const earlierStatus = await this.getWalletStatus(state, chainId, asset);
-          if (earlierStatus?.version === "v2" && earlierStatus.verified) {
-            storage5.removeItem(pendingKey);
-            return { txHash: earlierHash, status: earlierStatus };
-          }
-        }
+        const hashes = [...new Set((callsStatus?.receipts ?? []).map((value) => value.transactionHash).filter(this.isTransactionHash))];
+        earlierHash = hashes.length === 1 ? hashes[0] : void 0;
+      }
+      if (earlierHash) {
+        const recovered = await confirmUpgrade(earlierHash, await this.waitForReceipt(state, chainId, earlierHash));
+        clearConfirmedUpgrade();
+        return recovered;
+      }
+      throw new OwneyError(
+        "SPONSOR_REQUEST_FAILED",
+        "An earlier upgrade is still pending.",
+        { safeToFallback: false, callsId: prior.callsId },
+        this.id
+      );
+    }
+    if (!before.upgradeAvailable)
+      throw new OwneyError(
+        "WITHDRAW_FAILED",
+        "This Yieldseeker wallet cannot be upgraded to the reviewed V2 implementation.",
+        { version: before.version },
+        this.id
+      );
+    const data = encodeFunctionData({ abi: YIELDSEEKER_UPGRADE_ABI, functionName: "upgradeToLatest" });
+    let txHash;
+    let receipt;
+    if (gasMode === "sponsored") {
+      if (before.ownerPath !== "smart")
         throw new OwneyError(
           "SPONSOR_REQUEST_FAILED",
-          "An earlier upgrade is still pending.",
-          { safeToFallback: false, callsId: prior.callsId },
+          "EOA owners pay Base gas for the V1 upgrade.",
+          { safeToFallback: true },
           this.id
         );
-      }
       const context = await this.findAgent(state, chainId, asset);
       if (!context) throw new OwneyError("NOT_CONNECTED", "Yieldseeker agent is unavailable.");
       try {
@@ -4364,14 +4872,15 @@ var YieldseekerAgent = class {
           apiKey: this.owneyApiKey,
           routingApiBaseUrl: this.routingApiBaseUrl,
           yieldseekerSignature: await this.auth.getToken(state, chainId),
+          refreshYieldseekerSignature: (rejected) => this.auth.refreshToken(state, chainId, rejected),
           userId: context.user.userId,
           agentId: context.agent.agentId,
           agentWallet: before.agentWallet,
           asset: YIELDSEEKER_ASSET_METADATA[asset].address,
           callData: data,
           onPending: (pending) => {
-            const current = storage5.getItem(pendingKey);
-            storage5.setItem(pendingKey, JSON.stringify({
+            const current = storage5.getItem(pendingKey2);
+            storage5.setItem(pendingKey2, JSON.stringify({
               startedAt: Date.now(),
               ...current ? JSON.parse(current) : {},
               ...pending
@@ -4379,8 +4888,9 @@ var YieldseekerAgent = class {
           }
         });
         txHash = upgraded.txHash;
+        receipt = upgraded.receipt;
       } catch (error) {
-        if (error?.code === 4001 || error instanceof OwneyError && error.code === "SPONSOR_REQUEST_FAILED" && (error.details?.safeToFallback === true || error.details?.executionFailed === true)) storage5.removeItem(pendingKey);
+        if (error?.code === 4001 || error instanceof OwneyError && error.code === "SPONSOR_REQUEST_FAILED" && (error.details?.safeToFallback === true || error.details?.executionFailed === true)) storage5.removeItem(pendingKey2);
         throw error;
       }
     } else {
@@ -4390,20 +4900,13 @@ var YieldseekerAgent = class {
         data,
         value: "0",
         chainId
+      }, void 0, (value) => {
+        receipt = value;
       });
     }
-    const status = await this.getWalletStatus(state, chainId, asset);
-    if (!status?.verified || status.version !== "v2") {
-      throw new OwneyError(
-        "WITHDRAW_FAILED",
-        "Yieldseeker wallet upgrade was not confirmed as V2.",
-        { txHash, version: status?.version ?? "missing" },
-        this.id
-      );
-    }
-    if (gasMode === "sponsored" && typeof window !== "undefined")
-      window.localStorage.removeItem(`owney.yieldseeker.upgrade:${state.walletAddress.toLowerCase()}:${before.agentWallet.toLowerCase()}`);
-    return { txHash, status };
+    const confirmed = await confirmUpgrade(txHash, receipt ?? await this.waitForReceipt(state, chainId, txHash));
+    if (gasMode === "sponsored") clearConfirmedUpgrade();
+    return confirmed;
   }
   async disconnect() {
     this.withdrawalVersionCache.clear();
@@ -4476,32 +4979,50 @@ var YieldseekerAgent = class {
       submitted(txHash);
       receipt = await this.waitForReceipt(state, chainId, txHash);
     } else {
-      txHash = await this.submitTransaction(state, chainId, {
-        from: getAddress4(state.walletAddress),
-        to: YIELDSEEKER_ASSET_METADATA[asset].address,
-        data: encodeFunctionData({
-          abi: erc20Abi2,
-          functionName: "transfer",
-          args: [getAddress4(context.wallet.walletAddress), BigInt(amount)]
-        }),
-        value: "0",
-        chainId
-      }, submitted, (value) => {
-        receipt = value;
-      });
-    }
-    if (this.readGeneration === generation) {
-      void this.refreshSnapshotAfterMovement(state, chainId, context, "deposit", movement);
-    }
-    const base6 = { agentId: this.id, chainId, token: asset, walletAddress: state.walletAddress, agentWallet: context.wallet.walletAddress, intendedAmount: amount, confirmedAmount: amount, txHash, transfer: "confirmed", registration: "not-applicable", delivery: "not-applicable" };
-    const evidence = receipt ? inspectFundingReceipt(receipt, base6, YIELDSEEKER_ASSET_METADATA[asset].address, "deposit") : base6;
-    notifyFunding(onProgress, evidence);
-    return { txHash, smartWallet: context.wallet.walletAddress, amount, evidence };
-  }
-  async withdraw(state, chainId, asset, amount, onProgress, gasMode = "auto") {
-    let ownerTransferAttempted = false;
-    let evidence = {
-      agentId: this.id,
+      try {
+        txHash = await this.submitTransaction(state, chainId, {
+          from: getAddress4(state.walletAddress),
+          to: YIELDSEEKER_ASSET_METADATA[asset].address,
+          data: encodeFunctionData({
+            abi: erc20Abi3,
+            functionName: "transfer",
+            args: [getAddress4(context.wallet.walletAddress), BigInt(amount)]
+          }),
+          value: "0",
+          chainId
+        }, submitted, (value) => {
+          receipt = value;
+        });
+      } catch (error) {
+        if (error instanceof OwneyError && error.details?.ownerTransferNotExecuted === true && error.details.reason === "TRANSACTION_REPLACED_WITH_DIFFERENT_CALL") {
+          notifyFunding(onProgress, {
+            agentId: this.id,
+            chainId,
+            token: asset,
+            walletAddress: state.walletAddress,
+            agentWallet: context.wallet.walletAddress,
+            intendedAmount: amount,
+            txHash: String(error.details.originalTransactionHash),
+            transfer: "failed",
+            registration: "not-applicable",
+            delivery: "not-applicable"
+          });
+        }
+        throw error;
+      }
+    }
+    if (this.readGeneration === generation) {
+      void this.refreshSnapshotAfterMovement(state, chainId, context, "deposit", movement);
+    }
+    const base6 = { agentId: this.id, chainId, token: asset, walletAddress: state.walletAddress, agentWallet: context.wallet.walletAddress, intendedAmount: amount, confirmedAmount: amount, txHash, transfer: "confirmed", registration: "not-applicable", delivery: "not-applicable" };
+    const evidence = receipt ? inspectFundingReceipt(receipt, base6, YIELDSEEKER_ASSET_METADATA[asset].address, "deposit") : base6;
+    notifyFunding(onProgress, evidence);
+    return { txHash, smartWallet: context.wallet.walletAddress, amount, evidence };
+  }
+  async withdraw(state, chainId, asset, amount, onProgress, gasMode = "auto", onBeforeSubmission) {
+    let ownerTransferAttempted = false;
+    let evidence = {
+      agentId: this.id,
       chainId,
       token: asset,
       walletAddress: state.walletAddress,
@@ -4516,10 +5037,10 @@ var YieldseekerAgent = class {
         notifyFunding(onProgress, evidence);
       }, () => {
         ownerTransferAttempted = true;
-      }, gasMode);
+      }, gasMode, onBeforeSubmission);
     } catch (error) {
       if (error instanceof OwneyError && error.code === "SPONSOR_REQUEST_FAILED") this.withdrawalVersionCache.clear();
-      if (!ownerTransferAttempted || error?.code === 4001 || error instanceof OwneyError && (error.code === "AGENT_TRANSACTION_REVERTED" || error.code === "SPONSOR_REQUEST_FAILED" && (error.details?.safeToFallback === true || error.details?.executionFailed === true)))
+      if (!ownerTransferAttempted || error?.code === 4001 || error instanceof OwneyError && (error.code === "AGENT_TRANSACTION_REVERTED" || error.details?.ownerTransferNotExecuted === true || error.code === "SPONSOR_REQUEST_FAILED" && (error.details?.safeToFallback === true || error.details?.executionFailed === true)))
         notifyFunding(onProgress, {
           ...evidence,
           ...error instanceof OwneyError && error.code === "SPONSOR_REQUEST_FAILED" && error.details?.safeToFallback === true ? { userOpHash: void 0, callsId: void 0 } : {},
@@ -4529,7 +5050,7 @@ var YieldseekerAgent = class {
       throw error;
     }
   }
-  async withdrawInternal(state, chainId, asset, amount, onProgress, onOwnerTransferAttempted, gasMode = "auto") {
+  async withdrawInternal(state, chainId, asset, amount, onProgress, onOwnerTransferAttempted, gasMode = "auto", onBeforeSubmission) {
     this.assertChain(chainId);
     this.assertAsset(asset);
     if (amount !== void 0 && BigInt(amount) <= 0n) {
@@ -4574,31 +5095,170 @@ var YieldseekerAgent = class {
     let confirmedMovement = false;
     let settlement = null;
     try {
-      const portfolio = await this.loadPortfolioContext(
-        state,
-        chainId,
-        context
-      );
+      const maxSettlementBasis = amount === void 0 ? this.snapshotMovement(state, chainId, context, 0n) : null;
+      this.advancePortfolioVersion(this.contextKey(state, chainId, asset));
+      const portfolioRead = amount === void 0 ? this.loadActivityContext(state, chainId, context, {}).then((value) => ({ positions: value.positions, feeRateBps: 0 })) : this.loadPortfolioContext(state, chainId, context).then((value) => ({ positions: value.positions, feeRateBps: value.snapshot.feeRateBps }));
       const metadata = YIELDSEEKER_ASSET_METADATA[asset];
-      const readIdle = async () => {
-        const balance = await withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
-          address: metadata.address,
-          abi: erc20Abi2,
-          functionName: "balanceOf",
-          args: [getAddress4(context.wallet.walletAddress)]
-        }), chainId, "eth_call", this.id);
+      const agentWallet = getAddress4(context.wallet.walletAddress);
+      const feeTrackerRead = withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
+        address: agentWallet,
+        abi: YIELDSEEKER_AGENT_WALLET_ABI,
+        functionName: "feeTracker"
+      }), chainId, "eth_call", this.id);
+      const readOwnerFunds = async () => {
+        const feeTracker = await feeTrackerRead;
+        this.assertSession(generation, chainId, asset);
+        if (!isAddress3(feeTracker) || /^0x0{40}$/i.test(feeTracker))
+          throw this.invalidResponse("wallet fee tracker");
+        const [idle2, fees] = await Promise.all([
+          withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
+            address: metadata.address,
+            abi: erc20Abi3,
+            functionName: "balanceOf",
+            args: [agentWallet]
+          }), chainId, "eth_call", this.id),
+          withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
+            address: getAddress4(feeTracker),
+            abi: YIELDSEEKER_FEE_TRACKER_ABI,
+            functionName: "getFeesOwed",
+            args: [agentWallet]
+          }), chainId, "eth_call", this.id)
+        ]);
         this.assertSession(generation, chainId, asset);
-        return balance;
+        if (typeof idle2 !== "bigint" || idle2 < 0n || typeof fees !== "bigint" || fees < 0n)
+          throw this.invalidResponse("wallet withdrawal balance");
+        return { idle: idle2, fees, available: idle2 > fees ? idle2 - fees : 0n };
       };
-      const idle = await readIdle();
-      const deployed = portfolio.positions.reduce(
+      const [portfolio, initialFunds] = await Promise.all([portfolioRead, readOwnerFunds()]);
+      const idle = initialFunds.idle;
+      let positions = portfolio.positions;
+      let positionsStatus = "empty";
+      const validatePositions = (values) => {
+        const seen = /* @__PURE__ */ new Set();
+        for (const value of values) {
+          const address = value?.yieldOption?.address;
+          if (typeof address !== "string" || !isAddress3(address) || seen.has(address.toLowerCase()) || typeof value.assetsRaw !== "string" || !/^\d+$/.test(value.assetsRaw) || typeof value.withdrawableAssetsRaw !== "string" || !/^\d+$/.test(value.withdrawableAssetsRaw))
+            throw this.invalidResponse("yield positions");
+          seen.add(address.toLowerCase());
+        }
+        return values;
+      };
+      const zeroValuePositions = /* @__PURE__ */ new WeakSet();
+      const hasPositions = (values) => values.some((position2) => !zeroValuePositions.has(position2) && (BigInt(position2.assetsRaw) > 0n || BigInt(position2.withdrawableAssetsRaw) > 0n));
+      const knownPositions = /* @__PURE__ */ new Map();
+      const rememberPositions = (values) => {
+        for (const position2 of values) knownPositions.set(position2.yieldOption.address.toLowerCase(), position2);
+      };
+      const boundedVerification = async (read2, timeoutMs = YIELDSEEKER_MAX_POSITION_VERIFICATION_MS) => {
+        let timer;
+        try {
+          return await Promise.race([read2, new Promise((resolve) => {
+            timer = setTimeout(() => resolve(void 0), Math.max(0, timeoutMs));
+          })]);
+        } finally {
+          if (timer) clearTimeout(timer);
+        }
+      };
+      const verifyKnownPositions = async (blockNumber, values = [...knownPositions.values()], timeoutMs = YIELDSEEKER_MAX_POSITION_VERIFICATION_MS) => {
+        const verifiedPositions = [];
+        if (timeoutMs <= 0) return { verified: false, positions: verifiedPositions };
+        const reads = values.map(async (position2) => {
+          const address = getAddress4(position2.yieldOption.address);
+          try {
+            const [underlying, shares, withdrawable] = await Promise.all([
+              this.getReceiptClient().readContract({ address, abi: erc4626Abi, functionName: "asset", blockNumber }),
+              this.getReceiptClient().readContract({ address, abi: erc20Abi3, functionName: "balanceOf", args: [agentWallet], blockNumber }),
+              this.getReceiptClient().readContract({ address, abi: erc4626Abi, functionName: "maxWithdraw", args: [agentWallet], blockNumber })
+            ]);
+            if (typeof underlying !== "string" || !isAddress3(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n) return null;
+            const verified = { ...position2, assetsRaw: shares.toString(), withdrawableAssetsRaw: withdrawable.toString() };
+            if (shares > 0n && withdrawable === 0n) {
+              let positiveValue = false;
+              const valuations = await Promise.all(["convertToAssets", "previewRedeem"].map(async (functionName) => {
+                try {
+                  const value = await this.getReceiptClient().readContract({
+                    address,
+                    abi: erc4626Abi,
+                    functionName,
+                    args: [shares],
+                    blockNumber
+                  });
+                  if (typeof value !== "bigint" || value < 0n) return null;
+                  if (value > 0n && !positiveValue) {
+                    positiveValue = true;
+                    verifiedPositions.push(verified);
+                  }
+                  return value;
+                } catch {
+                  return null;
+                }
+              }));
+              if (positiveValue) return verified;
+              if (blockNumber === void 0 || valuations.some((value) => value !== 0n)) return null;
+              zeroValuePositions.add(verified);
+            }
+            verifiedPositions.push(verified);
+            return verified;
+          } catch {
+            return null;
+          }
+        });
+        const result = await boundedVerification(Promise.all(reads), timeoutMs);
+        this.assertSession(generation, chainId, asset);
+        return {
+          verified: result !== void 0 && result.every((position2) => position2 !== null),
+          positions: [...verifiedPositions]
+        };
+      };
+      const refreshPositions = async () => {
+        this.assertSession(generation, chainId, asset);
+        const response = await this.walletRequest(
+          state,
+          chainId,
+          this.agentPath(context, "yield-positions")
+        );
+        this.assertSession(generation, chainId, asset);
+        if (!Array.isArray(response?.yieldPositions)) throw this.invalidResponse("yield positions");
+        return validatePositions(response.yieldPositions);
+      };
+      if (amount === void 0) {
+        validatePositions(positions);
+        rememberPositions(positions);
+        positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+      }
+      const deployed = positions.reduce(
         (total, position2) => total + BigInt(position2.withdrawableAssetsRaw),
         0n
       );
-      const totalAvailable = idle + deployed;
+      const grossAvailable = idle + deployed;
+      const totalAvailable = grossAvailable > initialFunds.fees ? grossAvailable - initialFunds.fees : 0n;
       const requested = amount === void 0 ? totalAvailable : BigInt(amount);
       if (requested === 0n) {
         this.invalidateFundingRead(state, chainId, asset);
+        const zeroPayoutCandidates = positions.filter((position2) => BigInt(position2.assetsRaw) > 0n || BigInt(position2.withdrawableAssetsRaw) > 0n);
+        if (amount === void 0 && zeroPayoutCandidates.length) {
+          const deadline = Date.now() + YIELDSEEKER_MAX_POSITION_VERIFICATION_MS;
+          const blockNumber = await boundedVerification(
+            Promise.resolve().then(() => this.getReceiptClient().getBlockNumber()).catch(() => void 0)
+          );
+          const proof = typeof blockNumber === "bigint" ? await verifyKnownPositions(blockNumber, zeroPayoutCandidates, deadline - Date.now()) : { verified: false, positions: [] };
+          positions = proof.positions;
+          positionsStatus = hasPositions(positions) ? "remaining" : proof.verified ? "empty" : "unavailable";
+          if (positionsStatus !== "empty")
+            throw new OwneyError(
+              "WITHDRAW_FAILED",
+              "Yieldseeker vault funds are not currently withdrawable.",
+              { asset, positionsStatus, remainingPositions: positions.map((position2) => position2.yieldOption.address) },
+              this.id
+            );
+        }
+        if (grossAvailable > 0n && totalAvailable === 0n)
+          throw new OwneyError(
+            "WITHDRAW_INSUFFICIENT_BALANCE",
+            "No owner-withdrawable Yieldseeker funds remain after reserved fees.",
+            { asset, available: "0", reason: "YIELDSEEKER_FEES_ONLY", feesReserved: initialFunds.fees.toString() },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "No Yieldseeker funds are available to withdraw.",
@@ -4618,46 +5278,104 @@ var YieldseekerAgent = class {
           this.id
         );
       }
-      let remaining = requested > idle ? requested - idle : 0n;
+      const requiredIdle = requested + initialFunds.fees;
+      let remaining = requiredIdle > idle ? requiredIdle - idle : 0n;
       let grossUnwound = 0n;
-      for (const position2 of portfolio.positions) {
-        if (remaining === 0n) break;
-        const available = BigInt(position2.withdrawableAssetsRaw);
-        if (available <= 0n) continue;
-        const assetsRaw = available < remaining ? available : remaining;
-        const response = await this.walletRequest(
-          state,
-          chainId,
-          this.agentPath(context, "withdraw-from-position"),
-          {
-            method: "POST",
-            body: {
-              chainId,
-              vaultAddress: position2.yieldOption.address,
-              assetsRaw: assetsRaw.toString()
+      let latestUnwindBlock;
+      const unwind = async (position2, assetsRaw) => {
+        this.assertSession(generation, chainId, asset);
+        let unwindTransactionHash;
+        try {
+          const response = await this.walletRequest(
+            state,
+            chainId,
+            this.agentPath(context, "withdraw-from-position"),
+            {
+              method: "POST",
+              body: { chainId, vaultAddress: position2.yieldOption.address, assetsRaw: assetsRaw.toString() }
             }
-          }
-        );
-        if (!this.isTransactionHash(response?.transactionHash)) {
-          throw this.invalidResponse("position withdrawal");
+          );
+          if (!this.isTransactionHash(response?.transactionHash)) throw this.invalidResponse("position withdrawal");
+          unwindTransactionHash = response.transactionHash;
+          const unwindReceipt = await this.waitForReceipt(state, chainId, unwindTransactionHash);
+          if (unwindReceipt) latestUnwindBlock = unwindReceipt.blockNumber;
+        } catch (error) {
+          this.invalidateFundingRead(state, chainId, asset);
+          throw new OwneyError(
+            error instanceof OwneyError ? error.code : "WITHDRAW_FAILED",
+            "Could not confirm the Yieldseeker vault release. No owner transfer was submitted.",
+            {
+              ...error instanceof OwneyError ? error.details : {},
+              withdrawalPhase: "unwind",
+              reason: "YIELDSEEKER_UNWIND_UNRESOLVED",
+              vaultAddress: position2.yieldOption.address,
+              unwindTransactionHash,
+              ownerTransferSubmitted: false
+            },
+            this.id
+          );
         }
-        await this.waitForReceipt(state, chainId, response.transactionHash);
         confirmedMovement = true;
+        this.assertSession(generation, chainId, asset);
         grossUnwound += assetsRaw;
-        remaining -= assetsRaw;
+      };
+      if (amount === void 0) {
+        for (let sweep = 0; sweep < YIELDSEEKER_MAX_WITHDRAW_SWEEPS && hasPositions(positions); sweep++) {
+          const before = new Map(positions.map((position2) => [position2.yieldOption.address.toLowerCase(), BigInt(position2.withdrawableAssetsRaw)]));
+          let unwound = false;
+          for (const position2 of positions) {
+            const available = BigInt(position2.withdrawableAssetsRaw);
+            if (available <= 0n) continue;
+            await unwind(position2, available);
+            unwound = true;
+          }
+          if (!unwound) break;
+          const knownBeforeRefresh = new Set(knownPositions.keys());
+          const [catalog, proof] = await Promise.all([
+            boundedVerification(refreshPositions().catch(() => void 0)),
+            verifyKnownPositions(latestUnwindBlock)
+          ]);
+          if (catalog) rememberPositions(catalog);
+          this.assertSession(generation, chainId, asset);
+          if (proof.verified) {
+            positions = [...proof.positions, ...(catalog ?? []).filter((position2) => !knownBeforeRefresh.has(position2.yieldOption.address.toLowerCase()))];
+          } else if (catalog) positions = catalog;
+          else {
+            positionsStatus = "unavailable";
+            break;
+          }
+          positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+          if (positions.some((position2) => BigInt(position2.withdrawableAssetsRaw) > 0n && before.has(position2.yieldOption.address.toLowerCase()) && BigInt(position2.withdrawableAssetsRaw) >= before.get(position2.yieldOption.address.toLowerCase()))) break;
+        }
+      } else {
+        for (const position2 of positions) {
+          if (remaining === 0n) break;
+          const available = BigInt(position2.withdrawableAssetsRaw);
+          if (available <= 0n) continue;
+          const assetsRaw = available < remaining ? available : remaining;
+          await unwind(position2, assetsRaw);
+          remaining -= assetsRaw;
+        }
       }
-      if (remaining > 0n) {
+      if (amount !== void 0 && remaining > 0n) {
         throw this.invalidResponse("yield positions", {
           reason: "Withdrawable positions could not cover the request.",
           remaining: remaining.toString()
         });
       }
-      const availableForOwner = confirmedMovement ? await readIdle() : idle;
-      const feeRate = portfolio.snapshot.feeRateBps;
+      const availableForOwner = confirmedMovement ? (await readOwnerFunds()).available : initialFunds.available;
+      const feeRate = portfolio.feeRateBps;
       const maxFee = confirmedMovement && Number.isInteger(feeRate) && feeRate >= 0 && feeRate <= 1e3 ? (grossUnwound * BigInt(feeRate) + 9999n) / 10000n : 0n;
       const shortfall = availableForOwner < requested ? requested - availableForOwner : 0n;
       if (availableForOwner === 0n || amount !== void 0 && shortfall > maxFee) {
         this.invalidateFundingRead(state, chainId, asset);
+        if (amount === void 0 && positionsStatus !== "empty")
+          throw new OwneyError(
+            "WITHDRAW_FAILED",
+            "Yieldseeker vault funds could not be cleared for the owner transfer.",
+            { asset, positionsStatus },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "Yieldseeker funds are not available for the owner transfer.",
@@ -4666,7 +5384,11 @@ var YieldseekerAgent = class {
         );
       }
       const payout = amount === void 0 || availableForOwner < requested ? availableForOwner : requested;
-      const plannedMovement = this.snapshotMovement(state, chainId, context, -payout);
+      const plannedMovement = amount === void 0 && maxSettlementBasis ? {
+        ...maxSettlementBasis,
+        delta: maxSettlementBasis.delta - payout,
+        expectedNetDeposits: maxSettlementBasis.expectedNetDeposits - payout
+      } : this.snapshotMovement(state, chainId, context, -payout);
       const account = getAddress4(state.walletAddress);
       let receipt;
       const base6 = { agentId: this.id, chainId, token: asset, walletAddress: state.walletAddress, agentWallet: context.wallet.walletAddress, intendedAmount: amount === void 0 ? "MAX" : payout.toString(), transfer: "pending", registration: "not-applicable", delivery: "pending" };
@@ -4679,7 +5401,6 @@ var YieldseekerAgent = class {
         functionName: "withdrawAssetToUser",
         args: [account, metadata.address, payout]
       });
-      onOwnerTransferAttempted?.();
       let txHash;
       if (sponsor) {
         const submitted = await submitYieldseekerSponsoredWithdrawal({
@@ -4688,16 +5409,22 @@ var YieldseekerAgent = class {
           apiKey: this.owneyApiKey,
           routingApiBaseUrl: this.routingApiBaseUrl,
           yieldseekerSignature: await this.auth.getToken(state, chainId),
+          refreshYieldseekerSignature: (rejected) => this.auth.refreshToken(state, chainId, rejected),
           userId: context.user.userId,
           agentId: context.agent.agentId,
           agentWallet: getAddress4(context.wallet.walletAddress),
           asset: metadata.address,
           callData: data,
-          onPending: (pending) => notifyFunding(onProgress, { ...base6, ...pending })
+          onPending: (pending) => notifyFunding(onProgress, { ...base6, ...pending }),
+          onBeforeSubmission: async (pending) => {
+            await onBeforeSubmission?.({ ...base6, ...pending });
+            onOwnerTransferAttempted?.();
+          }
         });
         txHash = submitted.txHash;
         receipt = submitted.receipt;
       } else {
+        onOwnerTransferAttempted?.();
         txHash = await this.submitTransaction(state, chainId, {
           from: account,
           to: getAddress4(context.wallet.walletAddress),
@@ -4712,6 +5439,46 @@ var YieldseekerAgent = class {
       settlement = plannedMovement;
       const evidence = receipt ? inspectFundingReceipt(receipt, { ...base6, txHash }, metadata.address, "withdraw") : { ...base6, txHash, confirmedAmount: payout.toString(), transfer: "confirmed", delivery: "confirmed" };
       notifyFunding(onProgress, evidence);
+      let completion;
+      if (amount === void 0) {
+        const verificationDeadline = Date.now() + YIELDSEEKER_MAX_POSITION_VERIFICATION_MS;
+        const knownAtPayout = new Set(knownPositions.keys());
+        const [catalogVerified, knownProof] = await Promise.all([
+          boundedVerification(refreshPositions().then((values) => {
+            rememberPositions(values);
+            return true;
+          }).catch(() => false)),
+          verifyKnownPositions(receipt?.blockNumber)
+        ]);
+        const newPositions = [...knownPositions].filter(([address]) => !knownAtPayout.has(address)).map(([, position2]) => position2);
+        const newProof = newPositions.length ? await verifyKnownPositions(receipt?.blockNumber, newPositions, verificationDeadline - Date.now()) : { verified: true, positions: [] };
+        const proof = {
+          verified: catalogVerified === true && knownProof.verified && newProof.verified,
+          positions: [...knownProof.positions, ...newProof.positions]
+        };
+        positions = proof.positions;
+        positionsStatus = hasPositions(positions) ? "remaining" : proof.verified ? "empty" : "unavailable";
+        if (positionsStatus === "remaining") {
+          const result = { txHash, type: "partial", amount: evidence.confirmedAmount ?? payout.toString(), evidence };
+          throw new OwneyError(
+            "WITHDRAW_PARTIAL_FAILURE",
+            "Yieldseeker MAX could not confirm that all vault positions were cleared.",
+            {
+              reason: "YIELDSEEKER_MAX_INCOMPLETE",
+              asset,
+              positionsStatus,
+              remainingPositions: positionsStatus === "remaining" ? positions.filter((position2) => !zeroValuePositions.has(position2) && (BigInt(position2.assetsRaw) > 0n || BigInt(position2.withdrawableAssetsRaw) > 0n)).map((position2) => ({
+                vaultAddress: position2.yieldOption.address,
+                sharesRaw: position2.assetsRaw,
+                withdrawableAmountRaw: position2.withdrawableAssetsRaw
+              })) : void 0,
+              partialResults: { [this.id]: result }
+            },
+            this.id
+          );
+        }
+        if (!proof.verified) completion = "unverified";
+      }
       if (evidence.transfer === "failed" && evidence.confirmedAmount === "0")
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
@@ -4719,7 +5486,13 @@ var YieldseekerAgent = class {
           { asset, available: "0", txHash },
           this.id
         );
-      return { txHash, type: amount === void 0 ? "full" : "partial", amount: evidence.confirmedAmount ?? payout.toString(), evidence };
+      return {
+        txHash,
+        type: amount === void 0 && !completion ? "full" : "partial",
+        ...completion ? { completion } : {},
+        amount: evidence.confirmedAmount ?? payout.toString(),
+        evidence
+      };
     } finally {
       if (confirmedMovement && this.readGeneration === generation) {
         void this.refreshSnapshotAfterMovement(
@@ -4766,6 +5539,23 @@ var YieldseekerAgent = class {
     if (!context) throw new OwneyError("NOT_CONNECTED", "Reconnect the agent before recovering funding.");
     return context.wallet.walletAddress;
   }
+  async hasExistingDepositFunds(state, chainId, asset) {
+    this.assertChain(chainId);
+    this.assertAsset(asset);
+    const generation = this.readGeneration;
+    const context = await this.findAgent(state, chainId, asset);
+    this.assertSession(generation, chainId, asset);
+    if (!context) return void 0;
+    const idle = await withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
+      address: YIELDSEEKER_ASSET_METADATA[asset].address,
+      abi: erc20Abi3,
+      functionName: "balanceOf",
+      args: [getAddress4(context.wallet.walletAddress)]
+    }), chainId, "eth_call", this.id);
+    this.assertSession(generation, chainId, asset);
+    if (typeof idle !== "bigint" || idle < 0n) throw this.invalidResponse("wallet deposit balance");
+    return idle > 0n ? true : void 0;
+  }
   async getEarnings(state, chainId) {
     this.assertChain(chainId);
     return mapYieldseekerEarnings(await this.loadPortfolio(state, chainId, {}));
@@ -4796,7 +5586,7 @@ var YieldseekerAgent = class {
     );
     const vaultAddresses = new Set(
       catalog.flat().filter(
-        (yieldOption) => yieldOption.chainId === chainId && isAddress2(yieldOption.address)
+        (yieldOption) => yieldOption.chainId === chainId && isAddress3(yieldOption.address)
       ).map((yieldOption) => yieldOption.address.toLowerCase())
     );
     return mapYieldseekerHistory(contexts, {
@@ -4923,7 +5713,7 @@ var YieldseekerAgent = class {
       `/users/${user.userId}/agents/${agent.agentId}/wallet`
     ).then((walletResponse) => {
       this.assertSession(generation, chainId, asset);
-      if (!walletResponse?.agentWallet || !isAddress2(walletResponse.agentWallet.walletAddress)) {
+      if (!walletResponse?.agentWallet || !isAddress3(walletResponse.agentWallet.walletAddress)) {
         throw this.invalidResponse("agent wallet");
       }
       const context = {
@@ -5336,7 +6126,7 @@ var YieldseekerAgent = class {
       this.agentPath(context, "deploy"),
       { method: "POST", body: {} }
     );
-    if (!deployed?.agentWallet || !isAddress2(deployed.agentWallet.walletAddress) || deployed.agentWallet.walletAddress.toLowerCase() !== walletAddress) {
+    if (!deployed?.agentWallet || !isAddress3(deployed.agentWallet.walletAddress) || deployed.agentWallet.walletAddress.toLowerCase() !== walletAddress) {
       throw this.invalidResponse("agent deployment", {
         reason: "Deploy did not return the expected Agent Wallet."
       });
@@ -5467,25 +6257,79 @@ var YieldseekerAgent = class {
       value: BigInt(transaction.value)
     });
     onSubmitted?.(hash);
+    let replacement;
     const receipt = await withPaidRpcDiagnostics(
       () => this.getReceiptClient().waitForTransactionReceipt({
         hash,
-        confirmations: 1
+        confirmations: 1,
+        onReplaced: (value) => {
+          replacement = value;
+        }
       }),
       8453,
       "eth_getTransactionReceipt",
       this.id
     );
+    const actualHash = receipt.transactionHash;
+    if (!this.isTransactionHash(actualHash))
+      throw new OwneyError(
+        "WITHDRAW_FAILED",
+        "The confirmed transaction hash could not be verified.",
+        { originalTransactionHash: hash, ownerTransferNotExecuted: false },
+        this.id
+      );
+    if (actualHash.toLowerCase() !== hash.toLowerCase()) {
+      if (!replacement || replacement.transaction.hash.toLowerCase() !== actualHash.toLowerCase()) {
+        try {
+          const [original2, actual2] = await Promise.all([
+            this.getReceiptClient().getTransaction({ hash }),
+            this.getReceiptClient().getTransaction({ hash: actualHash })
+          ]);
+          replacement = { replacedTransaction: original2, transaction: actual2 };
+        } catch {
+          replacement = void 0;
+        }
+      }
+      const original = replacement?.replacedTransaction;
+      const actual = replacement?.transaction;
+      const sameNonce = !!original && !!actual && original.hash.toLowerCase() === hash.toLowerCase() && actual.hash.toLowerCase() === actualHash.toLowerCase() && original.from.toLowerCase() === account.toLowerCase() && actual.from.toLowerCase() === account.toLowerCase() && original.nonce === actual.nonce && (actual.chainId === void 0 || actual.chainId === chainId) && receipt.blockNumber !== null && receipt.blockNumber !== void 0;
+      if (!sameNonce)
+        throw new OwneyError(
+          "WITHDRAW_FAILED",
+          "The replacement transaction could not be verified.",
+          {
+            originalTransactionHash: hash,
+            replacementTransactionHash: actualHash,
+            reason: "TRANSACTION_REPLACEMENT_UNRESOLVED",
+            ownerTransferNotExecuted: false
+          },
+          this.id
+        );
+      const sameCall = actual.to?.toLowerCase() === transaction.to.toLowerCase() && actual.input?.toLowerCase() === transaction.data.toLowerCase() && actual.value === BigInt(transaction.value);
+      if (!sameCall)
+        throw new OwneyError(
+          "WITHDRAW_FAILED",
+          "The transaction was replaced without executing this withdrawal.",
+          {
+            originalTransactionHash: hash,
+            replacementTransactionHash: actualHash,
+            reason: "TRANSACTION_REPLACED_WITH_DIFFERENT_CALL",
+            ownerTransferNotExecuted: true
+          },
+          this.id
+        );
+      onSubmitted?.(actualHash);
+    }
     if (receipt.status !== "success") {
       throw new OwneyError(
         "AGENT_TRANSACTION_REVERTED",
-        `Yieldseeker transaction reverted (${hash}).`,
-        { transactionHash: hash },
+        `Yieldseeker transaction reverted (${actualHash}).`,
+        { transactionHash: actualHash },
         this.id
       );
     }
     onReceipt?.(receipt);
-    return hash;
+    return actualHash;
   }
   async waitForReceipt(state, chainId, transactionHash) {
     if (this.unwindReceiptWaiter) {
@@ -5512,12 +6356,12 @@ var YieldseekerAgent = class {
     return receipt;
   }
   assertTransaction(transaction, state, chainId) {
-    if (!transaction || typeof transaction.from !== "string" || !isAddress2(transaction.from) || typeof transaction.to !== "string" || !isAddress2(transaction.to) || typeof transaction.data !== "string" || !/^0x[a-fA-F0-9]*$/.test(transaction.data) || typeof transaction.value !== "string" || !/^[0-9]+$/.test(transaction.value) || transaction.chainId !== chainId || getAddress4(transaction.from) !== getAddress4(state.walletAddress)) {
+    if (!transaction || typeof transaction.from !== "string" || !isAddress3(transaction.from) || typeof transaction.to !== "string" || !isAddress3(transaction.to) || typeof transaction.data !== "string" || !/^0x[a-fA-F0-9]*$/.test(transaction.data) || typeof transaction.value !== "string" || !/^[0-9]+$/.test(transaction.value) || transaction.chainId !== chainId || getAddress4(transaction.from) !== getAddress4(state.walletAddress)) {
       throw this.invalidResponse("transaction");
     }
   }
   assertAgent(agent) {
-    if (typeof agent.agentId !== "string" || typeof agent.assetAddress !== "string" || !isAddress2(agent.assetAddress) || agent.chainId !== 8453) {
+    if (typeof agent.agentId !== "string" || typeof agent.assetAddress !== "string" || !isAddress3(agent.assetAddress) || agent.chainId !== 8453) {
       throw this.invalidResponse("agent");
     }
   }
@@ -5965,6 +6809,18 @@ var planOf = (transfers) => JSON.stringify(
     amount: BigInt(t.amount).toString()
   }))
 );
+var pendingKey = (i) => `owney.token-batch.v1:${keccak256(toBytes(i.apiKey))}:${i.baseUrl ?? "default"}:${i.chainId}:${i.owner.toLowerCase()}:${i.token.toLowerCase()}`;
+function pendingTokenBatch(i) {
+  try {
+    const saved = read(pendingKey(i));
+    if (!saved) return;
+    const body = JSON.parse(saved);
+    if (!body.serializedTransaction || body.chainId !== i.chainId || !isAddressEqual2(body.from, i.owner) || !isAddressEqual2(body.token, i.token) || !body.transfers?.length) return;
+    return { txHash: keccak256(body.serializedTransaction), transfers: body.transfers.map(({ to, amount }) => ({ to, amount })) };
+  } catch {
+    return;
+  }
+}
 function read(key2) {
   return typeof window === "undefined" ? memory.get(key2) : window.localStorage.getItem(key2);
 }
@@ -5981,11 +6837,11 @@ function clear(key2) {
   else window.localStorage.removeItem(key2);
 }
 function sponsorTokenBatch(i) {
-  const key2 = `owney.token-batch.v1:${keccak256(toBytes(i.apiKey))}:${i.baseUrl ?? "default"}:${i.chainId}:${i.owner.toLowerCase()}:${i.token.toLowerCase()}`;
+  const key2 = pendingKey(i);
   const plan = planOf(i.transfers);
   const active = inflight.get(key2);
   if (active) {
-    if (active.plan !== plan)
+    if (active.plan !== plan || i.resumeTxHash && pendingTokenBatch(i)?.txHash !== i.resumeTxHash)
       return Promise.reject(
         new Error(
           "A token deposit is already in progress. Wait for its result before depositing again."
@@ -6060,6 +6916,8 @@ async function execute(i, key2, plan) {
     }
   };
   const saved = read(key2);
+  if (i.resumeTxHash && pendingTokenBatch(i)?.txHash !== i.resumeTxHash)
+    throw new OwneyError("DEPOSIT_IN_PROGRESS", "The saved deposit changed. Check its status before depositing again.");
   if (saved) {
     const previous = JSON.parse(saved);
     if (previous.chainId !== i.chainId || !isAddressEqual2(previous.from, i.owner) || !isAddressEqual2(previous.token, i.token) || planOf(previous.transfers) !== plan)
@@ -6171,7 +7029,8 @@ function makeSponsoredTokenCallback(deps) {
       pub,
       wallet,
       onApproved: deps.onApproved,
-      onSubmitted: (hash) => deps.onSubmitted?.(hash, transfers)
+      onSubmitted: (hash) => deps.onSubmitted?.(hash, transfers),
+      resumeTxHash: deps.resumeTxHash
     });
   };
   const callback = makeVerificationAwareDepositCallback(
@@ -6257,7 +7116,7 @@ async function runAgentDepositBatch(chainId, legs, transfer) {
 }
 
 // src/lib/sponsored-calls-deposit.ts
-import { encodeFunctionData as encodeFunctionData2, erc20Abi as erc20Abi3, toHex as toHex2 } from "viem";
+import { encodeFunctionData as encodeFunctionData2, erc20Abi as erc20Abi4, toHex as toHex2 } from "viem";
 var DEFAULT_POLL_INTERVAL_MS = 1500;
 var DEFAULT_MAX_POLLS = 30;
 async function paymasterSupported(provider, owner, chainId) {
@@ -6303,7 +7162,7 @@ function makeSponsoredCallsCallback(deps) {
       to: token,
       value: "0x0",
       data: encodeFunctionData2({
-        abi: erc20Abi3,
+        abi: erc20Abi4,
         functionName: "transfer",
         args: [transfer.to, BigInt(transfer.amount)]
       })
@@ -6335,50 +7194,73 @@ function makeSponsoredCallsCallback(deps) {
       url.searchParams.append("owneyIntent", intent);
       paymasterUrl = url.toString();
     }
-    const sendResult = await deps.provider.request({
-      method: "wallet_sendCalls",
-      params: [
-        {
-          version: "2.0.0",
-          from: deps.ownerAddress,
-          chainId: toHex2(chainId),
-          atomicRequired: transfers.length > 1,
-          calls,
-          capabilities: {
-            paymasterService: { url: paymasterUrl }
+    const requestedId = toHex2(globalThis.crypto.getRandomValues(new Uint8Array(32)));
+    const progress = (id, transfer) => {
+      try {
+        deps.onCallsProgress?.(id, transfers, transfer);
+      } catch {
+      }
+    };
+    progress(requestedId, "pending");
+    let sendResult;
+    try {
+      sendResult = await deps.provider.request({
+        method: "wallet_sendCalls",
+        params: [
+          {
+            version: "2.0.0",
+            id: requestedId,
+            from: deps.ownerAddress,
+            chainId: toHex2(chainId),
+            atomicRequired: transfers.length > 1,
+            calls,
+            capabilities: {
+              paymasterService: { url: paymasterUrl }
+            }
           }
-        }
-      ]
-    });
-    deps.onApproved?.();
+        ]
+      });
+    } catch (error) {
+      if (error?.code === 4001 || error?.code === "ACTION_REJECTED")
+        progress(requestedId, "failed");
+      throw error;
+    }
+    try {
+      deps.onApproved?.();
+    } catch {
+    }
     const callsId = typeof sendResult === "string" ? sendResult : sendResult?.id;
     if (!callsId) {
       throw new OwneyError(
         "SPONSORED_CALLS_NO_ID",
         "Wallet accepted wallet_sendCalls but returned no calls id.",
-        { chainId }
+        { chainId, callsId: requestedId }
       );
     }
+    progress(callsId, "pending");
     for (let attempt = 0; attempt < maxPolls; attempt += 1) {
       const status = await deps.provider.request({
         method: "wallet_getCallsStatus",
         params: [callsId]
       });
+      if (status?.id && status.id !== callsId || status?.chainId && Number(status.chainId) !== chainId)
+        throw new OwneyError("SPONSORED_CALLS_NO_RECEIPT", "Wallet returned status for a different deposit batch.", { chainId, callsId });
       const txHash = status?.receipts?.[0]?.transactionHash;
-      if (txHash && !status?.receipts?.some((receipt) => receipt.transactionHash !== txHash)) {
+      if (txHash && /^0x[\da-f]{64}$/i.test(txHash) && !status?.receipts?.some((receipt) => receipt.transactionHash !== txHash)) {
         try {
           deps.onSubmitted?.(txHash, transfers);
         } catch {
         }
       }
-      if (status?.receipts?.some((receipt) => receipt.status === "0x0") || typeof status?.status === "number" && status.status >= 400) {
+      if (status?.status === 400 || status?.status === 500) {
+        progress(callsId, "failed");
         throw new OwneyError(
           "SPONSOR_REQUEST_FAILED",
           "The sponsored deposit did not complete successfully.",
           { chainId, callsId, safeToFallback: false }
         );
       }
-      if (txHash && (transfers.length === 1 || status?.status === 200 || status?.status === "CONFIRMED")) {
+      if (txHash && /^0x[\da-f]{64}$/i.test(txHash) && (transfers.length === 1 || status?.status === 200 || status?.status === "CONFIRMED")) {
         if (status?.receipts?.some(
           (receipt) => receipt.transactionHash !== txHash
         ))
@@ -6594,8 +7476,8 @@ var OwneySDK = class {
     return createPaidRpcClient(VIEM_CHAIN2[chainId], this.rpcUrls);
   }
   /** Builds the default USDC batch callback for the connected wallet. */
-  getDefaultSponsoredCallback(onApproved, onSubmitted) {
-    if (!onApproved && !onSubmitted && this.cachedSponsoredCallback)
+  getDefaultSponsoredCallback(onApproved, onSubmitted, resumeTxHash) {
+    if (!onApproved && !onSubmitted && !resumeTxHash && this.cachedSponsoredCallback)
       return this.cachedSponsoredCallback;
     const provider = this.requireConnectedProvider();
     const owner = this.state.walletAddress;
@@ -6605,6 +7487,7 @@ var OwneySDK = class {
       ownerAddress: owner,
       onApproved,
       onSubmitted,
+      resumeTxHash,
       tokenAddressByChain: SPONSORED_USDC_BY_CHAIN,
       // Casts work around viem's chain-narrowed Client vs the generic
       // PublicClient/WalletClient param types — structurally identical at
@@ -6620,13 +7503,13 @@ var OwneySDK = class {
         transport: custom4(provider)
       })
     });
-    if (!onApproved && !onSubmitted) this.cachedSponsoredCallback = callback;
+    if (!onApproved && !onSubmitted && !resumeTxHash) this.cachedSponsoredCallback = callback;
     return callback;
   }
   /** Builds the wallet-native sponsored calls callback for compatible paymasters. */
-  getDefaultSponsoredCallsCallback(asset, onApproved, onSubmitted) {
+  getDefaultSponsoredCallsCallback(asset, onApproved, onSubmitted, onCallsProgress) {
     const cached = this.cachedSponsoredCallsCallbacks.get(asset);
-    if (!onApproved && !onSubmitted && cached) return cached;
+    if (!onApproved && !onSubmitted && !onCallsProgress && cached) return cached;
     const provider = this.requireConnectedProvider();
     const callback = makeSponsoredCallsCallback({
       apiKey: this.apiKey,
@@ -6636,9 +7519,10 @@ var OwneySDK = class {
       paymasterServiceUrl: this.paymasterServiceUrl,
       onApproved,
       onSubmitted,
+      onCallsProgress,
       tokenAddressByChain: sponsoredTokensFor(asset)
     });
-    if (!onApproved && !onSubmitted) this.cachedSponsoredCallsCallbacks.set(asset, callback);
+    if (!onApproved && !onSubmitted && !onCallsProgress) this.cachedSponsoredCallsCallbacks.set(asset, callback);
     return callback;
   }
   /**
@@ -6647,8 +7531,8 @@ var OwneySDK = class {
    * Mirrors `getDefaultSponsoredCallback()` but signs a Permit2
    * single-use batch authorization instead of an EIP-3009 authorization.
    */
-  getDefaultWethSponsoredCallback(onApproved, onSubmitted) {
-    if (!onApproved && !onSubmitted && this.cachedWethSponsoredCallback)
+  getDefaultWethSponsoredCallback(onApproved, onSubmitted, resumeTxHash) {
+    if (!onApproved && !onSubmitted && !resumeTxHash && this.cachedWethSponsoredCallback)
       return this.cachedWethSponsoredCallback;
     const provider = this.requireConnectedProvider();
     const owner = this.state.walletAddress;
@@ -6658,6 +7542,7 @@ var OwneySDK = class {
       ownerAddress: owner,
       onApproved,
       onSubmitted,
+      resumeTxHash,
       tokenAddressByChain: SPONSORED_WETH_BY_CHAIN,
       // Casts work around viem's chain-narrowed Client vs the generic
       // PublicClient/WalletClient param types — structurally identical at
@@ -6673,7 +7558,7 @@ var OwneySDK = class {
         transport: custom4(provider)
       })
     });
-    if (!onApproved && !onSubmitted) this.cachedWethSponsoredCallback = callback;
+    if (!onApproved && !onSubmitted && !resumeTxHash) this.cachedWethSponsoredCallback = callback;
     return callback;
   }
   getAgent(agentId) {
@@ -6982,6 +7867,7 @@ var OwneySDK = class {
   async deposit(options) {
     const { amount, asset, depositCallback, agentId, onApproved } = options;
     const prepared = /* @__PURE__ */ new Map();
+    const paidFallbackAgents = /* @__PURE__ */ new Set();
     const onProgress = options.onProgress ? (evidence) => {
       if (evidence.agentWallet) prepared.set(evidence.agentWallet.toLowerCase(), evidence);
       notifyFunding(options.onProgress, evidence);
@@ -6992,152 +7878,184 @@ var OwneySDK = class {
         if (evidence) notifyFunding(onProgress, { ...evidence, txHash: hash, transfer: "pending" });
       }
     } : void 0;
+    const onCallsProgress = onProgress ? (callsId, destinations, transfer) => {
+      for (const destination of destinations) {
+        const evidence = prepared.get(destination.to.toLowerCase());
+        if (evidence) notifyFunding(onProgress, { ...evidence, callsId, transfer });
+      }
+    } : void 0;
     if (BigInt(amount) === 0n) {
       return { agentResults: {} };
     }
     const state = this.requireState();
     const chainId = this.requireChainId();
-    const effectiveCallback = depositCallback ?? (this.paymasterServiceUrl ? this.getDefaultSponsoredCallsCallback(asset, onApproved, onSubmitted) : asset === "WETH" ? this.getDefaultWethSponsoredCallback(onApproved, onSubmitted) : this.getDefaultSponsoredCallback(onApproved, onSubmitted));
-    if (agentId) {
-      if (this.isAgentDisabled(agentId)) {
-        throw new OwneyError(
-          "AGENT_DISABLED",
-          `Cannot deposit into disabled agent "${agentId}". Existing balances remain visible and withdrawable.`,
-          { agentId }
-        );
-      }
-      const agent = this.getAgent(agentId);
-      this.validateAssetSupport(agent, chainId, asset);
-      await this.validateMinDepositAmount(agent, state, chainId, asset, amount);
-      return this.depositWithFallback(
-        agent,
-        state,
-        chainId,
-        amount,
-        asset,
-        effectiveCallback,
-        depositCallback,
-        onProgress
-      );
-    }
-    const totalAmount = BigInt(amount);
-    const eligibleAgents = this.getEligibleAgents(chainId, asset, {
-      excludeDisabled: true
-    });
-    const exemptFlags = await Promise.all(
-      eligibleAgents.map(
-        (a) => this.hasExistingBalance(a, state, chainId, asset, true)
-      )
-    );
-    const exempt = new Set(
-      eligibleAgents.filter((_, i) => exemptFlags[i]).map((a) => a.id)
-    );
-    const agentAmounts = this.splitDepositAmount(
-      totalAmount,
-      eligibleAgents,
-      chainId,
-      asset,
-      exempt
-    );
-    if (agentAmounts.length === 0) {
-      const agentsRequiringActivation = eligibleAgents.filter(
-        (agent) => !exempt.has(agent.id)
-      );
-      const perAgentMinimum = agentsRequiringActivation.reduce(
-        (highest, agent) => {
-          const minimum = this.getMinDepositAmount(agent, chainId, asset);
-          return minimum > highest ? minimum : highest;
-        },
-        0n
-      );
-      const minimumRequired = agentsRequiringActivation.length > 0 ? (perAgentMinimum > 0n ? perAgentMinimum : 1n) * BigInt(agentsRequiringActivation.length) : BigInt(eligibleAgents.length);
-      throw new OwneyError(
-        "DEPOSIT_AMOUNT_BELOW_MINIMUM",
-        `Amount "${amount}" cannot activate every eligible agent. The combined minimum is "${minimumRequired.toString()}" for ${asset}.`,
-        {
-          amount,
-          asset,
-          chainId,
-          minDepositAmount: minimumRequired.toString(),
-          perAgentDepositAmount: perAgentMinimum.toString(),
-          agentMinimums: agentsRequiringActivation.map((agent) => ({
-            agentId: agent.id,
-            minDepositAmount: this.getMinDepositAmount(
-              agent,
-              chainId,
-              asset
-            ).toString()
-          }))
-        }
-      );
-    }
-    const batchTransfer = getDepositBatchTransfer(effectiveCallback);
-    if (!depositCallback && batchTransfer) {
-      return runAgentDepositBatch(
-        chainId,
-        agentAmounts.map(({ agent, amount: amount2 }) => ({
-          id: agent.id,
-          amount: amount2,
-          run: (callback) => withFailureReporting(
-            this.apiKey,
-            agent.id,
-            () => onProgress ? agent.deposit(state, chainId, amount2, asset, callback, onProgress) : agent.deposit(state, chainId, amount2, asset, callback),
-            this.routingApiBaseUrl
-          )
-        })),
-        async (cid, transfers) => {
-          try {
-            return await batchTransfer(cid, transfers);
-          } catch (error) {
-            if (!(error instanceof OwneyError) || error.code !== "PERMIT2_APPROVAL_REQUIRED")
-              throw error;
-            const requiredAmount = transfers.reduce(
-              (sum, transfer) => sum + BigInt(transfer.amount),
-              0n
-            );
-            await this.approvePermit2(
-              asset,
-              requiredAmount,
-              cid
-            );
-            return batchTransfer(cid, transfers);
-          }
+    if (options.resumeTxHash && (depositCallback || this.paymasterServiceUrl || !/^0x[\da-f]{64}$/i.test(options.resumeTxHash)))
+      throw new OwneyError("DEPOSIT_IN_PROGRESS", "This deposit cannot resume the saved relayer transaction.");
+    const effectiveCallback = depositCallback ?? (this.paymasterServiceUrl ? this.getDefaultSponsoredCallsCallback(asset, onApproved, onSubmitted, onCallsProgress) : asset === "WETH" ? this.getDefaultWethSponsoredCallback(onApproved, onSubmitted, options.resumeTxHash) : this.getDefaultSponsoredCallback(onApproved, onSubmitted, options.resumeTxHash));
+    try {
+      if (agentId) {
+        if (this.isAgentDisabled(agentId)) {
+          throw new OwneyError(
+            "AGENT_DISABLED",
+            `Cannot deposit into disabled agent "${agentId}". Existing balances remain visible and withdrawable.`,
+            { agentId }
+          );
         }
-      );
-    }
-    const agentResults = {};
-    for (const [
-      index,
-      { agent, amount: agentAmount }
-    ] of agentAmounts.entries()) {
-      try {
-        agentResults[agent.id] = await this.depositWithFallback(
+        const agent = this.getAgent(agentId);
+        this.validateAssetSupport(agent, chainId, asset);
+        await this.validateMinDepositAmount(agent, state, chainId, asset, amount);
+        return await this.depositWithFallback(
           agent,
           state,
           chainId,
-          agentAmount,
+          amount,
           asset,
           effectiveCallback,
           depositCallback,
-          onProgress
+          onProgress,
+          () => paidFallbackAgents.add(agent.id),
+          !!options.resumeTxHash
         );
-      } catch (error) {
-        if (Object.keys(agentResults).length === 0) throw error;
+      }
+      const totalAmount = BigInt(amount);
+      const eligibleAgents = this.getEligibleAgents(chainId, asset, {
+        excludeDisabled: true
+      });
+      const prospectiveShare = totalAmount / BigInt(eligibleAgents.length);
+      const meetsEveryMinimum = eligibleAgents.every((agent) => prospectiveShare >= this.getMinDepositAmount(agent, chainId, asset));
+      const exemptFlags = meetsEveryMinimum ? eligibleAgents.map(() => false) : await Promise.all(eligibleAgents.map((agent) => this.hasExistingBalance(agent, state, chainId, asset, true)));
+      const exempt = new Set(
+        eligibleAgents.filter((_, i) => exemptFlags[i]).map((a) => a.id)
+      );
+      const agentAmounts = this.splitDepositAmount(
+        totalAmount,
+        eligibleAgents,
+        chainId,
+        asset,
+        exempt
+      );
+      if (agentAmounts.length === 0) {
+        const agentsRequiringActivation = eligibleAgents.filter(
+          (agent) => !exempt.has(agent.id)
+        );
+        const perAgentMinimum = agentsRequiringActivation.reduce(
+          (highest, agent) => {
+            const minimum = this.getMinDepositAmount(agent, chainId, asset);
+            return minimum > highest ? minimum : highest;
+          },
+          0n
+        );
+        const minimumRequired = agentsRequiringActivation.length > 0 ? (perAgentMinimum > 0n ? perAgentMinimum : 1n) * BigInt(agentsRequiringActivation.length) : BigInt(eligibleAgents.length);
         throw new OwneyError(
-          "DEPOSIT_PARTIAL_FAILURE",
-          "Some deposits completed before another agent failed. Check activity and balances before depositing again; the failed transfer may still settle.",
+          "DEPOSIT_AMOUNT_BELOW_MINIMUM",
+          `Amount "${amount}" cannot activate every eligible agent. The combined minimum is "${minimumRequired.toString()}" for ${asset}.`,
           {
-            agentResults,
-            failedAgentId: agent.id,
-            failedAmount: agentAmount,
-            unattemptedAgentIds: agentAmounts.slice(index + 1).map(({ agent: agent2 }) => agent2.id),
-            cause: error
-          },
-          agent.id
+            amount,
+            asset,
+            chainId,
+            minDepositAmount: minimumRequired.toString(),
+            perAgentDepositAmount: perAgentMinimum.toString(),
+            agentMinimums: agentsRequiringActivation.map((agent) => ({
+              agentId: agent.id,
+              minDepositAmount: this.getMinDepositAmount(
+                agent,
+                chainId,
+                asset
+              ).toString()
+            }))
+          }
         );
       }
+      const batchTransfer = getDepositBatchTransfer(effectiveCallback);
+      if (!depositCallback && batchTransfer) {
+        return await runAgentDepositBatch(
+          chainId,
+          agentAmounts.map(({ agent, amount: amount2 }) => ({
+            id: agent.id,
+            amount: amount2,
+            run: (callback) => withFailureReporting(
+              this.apiKey,
+              agent.id,
+              () => onProgress ? agent.deposit(state, chainId, amount2, asset, callback, onProgress) : agent.deposit(state, chainId, amount2, asset, callback),
+              this.routingApiBaseUrl
+            )
+          })),
+          async (cid, transfers) => {
+            try {
+              return await batchTransfer(cid, transfers);
+            } catch (error) {
+              if (!(error instanceof OwneyError) || error.code !== "PERMIT2_APPROVAL_REQUIRED")
+                throw error;
+              const requiredAmount = transfers.reduce(
+                (sum, transfer) => sum + BigInt(transfer.amount),
+                0n
+              );
+              await this.approvePermit2(
+                asset,
+                requiredAmount,
+                cid
+              );
+              return batchTransfer(cid, transfers);
+            }
+          }
+        );
+      }
+      const agentResults = {};
+      for (const [
+        index,
+        { agent, amount: agentAmount }
+      ] of agentAmounts.entries()) {
+        try {
+          agentResults[agent.id] = await this.depositWithFallback(
+            agent,
+            state,
+            chainId,
+            agentAmount,
+            asset,
+            effectiveCallback,
+            depositCallback,
+            onProgress,
+            () => paidFallbackAgents.add(agent.id),
+            !!options.resumeTxHash
+          );
+        } catch (error) {
+          if (Object.keys(agentResults).length === 0) throw error;
+          throw new OwneyError(
+            "DEPOSIT_PARTIAL_FAILURE",
+            "Some deposits completed before another agent failed. Check activity and balances before depositing again; the failed transfer may still settle.",
+            {
+              agentResults,
+              failedAgentId: agent.id,
+              failedAmount: agentAmount,
+              unattemptedAgentIds: agentAmounts.slice(index + 1).map(({ agent: agent2 }) => agent2.id),
+              cause: error
+            },
+            agent.id
+          );
+        }
+      }
+      return { agentResults };
+    } catch (error) {
+      if (!depositCallback && onProgress && !options.resumeTxHash) {
+        const ids = agentId ? [agentId] : this.getEligibleAgents(chainId, asset).map((agent) => agent.id);
+        for (const id of ids) {
+          const evidence = [...prepared.values()].find((value) => value.agentId === id);
+          if (paidFallbackAgents.has(id) || evidence?.transfer === "confirmed" || evidence?.transfer === "failed") continue;
+          const rejected = error instanceof OwneyError && error.details?.notSubmitted === true;
+          if (!rejected && (evidence?.txHash || evidence?.userOpHash || evidence?.callsId)) continue;
+          notifyFunding(onProgress, { ...evidence ?? {
+            agentId: id,
+            chainId,
+            token: asset,
+            walletAddress: state.walletAddress,
+            intendedAmount: amount,
+            registration: "unknown",
+            delivery: "not-applicable"
+          }, transfer: "failed" });
+        }
+      }
+      throw error;
     }
-    return { agentResults };
   }
   /**
    * Invokes `agent.deposit` with the resolved sponsored callback, composing
@@ -7166,7 +8084,7 @@ var OwneySDK = class {
    * propagates unchanged. Scoped per agent invocation so one agent's failure
    * doesn't force a retry of sibling agents in a multi-agent split.
    */
-  async depositWithFallback(agent, state, chainId, amount, asset, effectiveCallback, appCallback, onProgress) {
+  async depositWithFallback(agent, state, chainId, amount, asset, effectiveCallback, appCallback, onProgress, onPaidFallback, resumeOnly = false) {
     const attempt = (callback) => withFailureReporting(
       this.apiKey,
       agent.id,
@@ -7178,6 +8096,7 @@ var OwneySDK = class {
       try {
         return await attempt(effectiveCallback);
       } catch (error) {
+        if (resumeOnly) throw error;
         if (!approvalAttempted && appCallback === void 0 && (asset === "WETH" || asset === "USDC") && error instanceof OwneyError && error.code === "PERMIT2_APPROVAL_REQUIRED") {
           approvalAttempted = true;
           console.warn(
@@ -7195,6 +8114,7 @@ var OwneySDK = class {
           `[owney-sdk] ${asset} sponsorship unavailable, falling back to user-paid deposit:`,
           error
         );
+        onPaidFallback?.();
         return attempt(void 0);
       }
     }
@@ -7277,7 +8197,12 @@ var OwneySDK = class {
    */
   async hasExistingBalance(agent, state, chainId, asset, requireReliableRead = false) {
     try {
-      const balance = await agent.getBalances(state, chainId);
+      if (agent.hasExistingDepositFunds && await agent.hasExistingDepositFunds(
+        state,
+        chainId,
+        asset
+      ).catch(() => void 0) === true) return true;
+      const balance = await agent.getBalances(state, chainId, asset);
       const target = asset.toLowerCase();
       const token = balance.tokens.find(
         (t) => t.chainId === chainId && t.asset.toLowerCase() === target
@@ -7390,7 +8315,7 @@ var OwneySDK = class {
     if (direction === "withdraw" && evidence.agentId === "yieldseeker" && verified.transfer === "unknown" && verified.confirmedAmount && BigInt(verified.confirmedAmount) > 0n) {
       const transaction = await rpc2.getTransaction({ hash: evidence.txHash });
       assertCurrent();
-      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address))
+      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address, receipt))
         verified = inspectFundingReceipt(receipt, { ...evidence, agentWallet, intendedAmount: "MAX" }, token.address, direction);
     }
     const key2 = `${state.walletAddress.toLowerCase()}:${chainId}:${evidence.agentId}:${evidence.token}:${evidence.txHash}`;
@@ -7403,7 +8328,8 @@ var OwneySDK = class {
     return verified;
   }
   /** Resolve a saved sponsored-withdrawal ID without opening a wallet prompt. */
-  async resolveSponsoredWithdrawalEvidence(evidence) {
+  async resolveSponsoredWithdrawalEvidence(evidence, options = {}) {
+    if (evidence.callsId && !evidence.userOpHash) return this.resolveWalletCallsFundingEvidence(evidence, "withdraw");
     const { state, chainId, assertCurrent } = this.captureReadScope(evidence.chainId);
     if (evidence.agentId !== "yieldseeker" || chainId !== 8453 || evidence.txHash || state.walletAddress.toLowerCase() !== evidence.walletAddress.toLowerCase()) return evidence;
     const agent = this.getAgent("yieldseeker");
@@ -7419,18 +8345,26 @@ var OwneySDK = class {
           owner: state.walletAddress,
           agentWallet: wallet,
           asset: SupportedAssets.find((t) => t.chainId === chainId && t.symbol === evidence.token)?.address,
-          userOpHash: evidence.userOpHash
+          userOpHash: evidence.userOpHash,
+          ...evidence.userOperation ? { userOperation: Object.fromEntries([
+            "sender",
+            "nonce",
+            "initCode",
+            "callData",
+            "callGasLimit",
+            "verificationGasLimit",
+            "preVerificationGas",
+            "maxFeePerGas",
+            "maxPriorityFeePerGas",
+            "paymasterAndData"
+          ].map((key2) => [key2, evidence.userOperation[key2]])) } : {},
+          ...Number.isFinite(options.submittedAt) && options.submittedAt > 0 ? { submittedAt: options.submittedAt } : {}
         })
       });
       if (!response.ok) throw new OwneyError("AGENT_API_ERROR", "Could not resolve sponsored withdrawal status.");
       const payload = await response.json();
       txHash = payload.data?.txHash ?? void 0;
       executionFailed = payload.data?.executionFailed === true;
-    } else if (evidence.callsId) {
-      const status = await state.provider.request({ method: "wallet_getCallsStatus", params: [evidence.callsId] });
-      if (status?.id && status.id !== evidence.callsId || status?.chainId && Number(status.chainId) !== chainId) return evidence;
-      executionFailed = status?.status === 400 || status?.status === 500;
-      txHash = status?.receipts?.[0]?.transactionHash;
     }
     assertCurrent();
     if (executionFailed) return {
@@ -7441,6 +8375,60 @@ var OwneySDK = class {
     };
     return txHash && /^0x[0-9a-fA-F]{64}$/.test(txHash) ? { ...evidence, txHash } : evidence;
   }
+  /** Recover an EIP-5792 deposit or payout using this account's exact batch ID. */
+  async resolveWalletCallsFundingEvidence(evidence, direction) {
+    const { state, chainId, assertCurrent } = this.captureReadScope(evidence.chainId);
+    if (!evidence.callsId || evidence.txHash || state.walletAddress.toLowerCase() !== evidence.walletAddress.toLowerCase()) return evidence;
+    const agent = this.getAgent(evidence.agentId);
+    const wallet = agent.getFundingWallet ? await agent.getFundingWallet(state, chainId, evidence.token) : (await agent.getUserProfile(state, chainId)).smartWallet;
+    if (!wallet || wallet.toLowerCase() !== evidence.agentWallet?.toLowerCase()) return evidence;
+    const status = await state.provider.request({ method: "wallet_getCallsStatus", params: [evidence.callsId] });
+    assertCurrent();
+    if (status?.id !== void 0 && status.id !== evidence.callsId || status?.chainId !== void 0 && Number(status.chainId) !== chainId) return evidence;
+    const statusCode2 = Number(status?.status);
+    if (statusCode2 === 400 || statusCode2 === 500) return {
+      ...evidence,
+      transfer: "failed",
+      delivery: direction === "withdraw" ? "failed" : "not-applicable"
+    };
+    const hashes = [...new Set((status?.receipts ?? []).map((receipt) => receipt.transactionHash?.toLowerCase()).filter((hash) => !!hash && /^0x[\da-f]{64}$/i.test(hash)))];
+    if (hashes.length === 1) return { ...evidence, txHash: hashes[0] };
+    if (hashes.length > 16) return evidence;
+    const matches = [];
+    for (const txHash of hashes) {
+      const inspected = await this.inspectFunding({ ...evidence, txHash }, direction);
+      assertCurrent();
+      if (inspected.transfer === "confirmed") matches.push(inspected);
+    }
+    return matches.length === 1 ? matches[0] : evidence;
+  }
+  /** Whether a foreground deposit can resume the same signed batch, never a
+   * fresh authorization. The batch rail independently rechecks the exact plan. */
+  async canResumePendingDeposit(evidences, amount) {
+    if (this.paymasterServiceUrl || !evidences.length || !/^\d+$/.test(amount)) return false;
+    const first = evidences[0];
+    const { state, chainId, assertCurrent } = this.captureReadScope(first.chainId);
+    const token = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === first.token);
+    if (!token) return false;
+    const pending = pendingTokenBatch({
+      apiKey: this.apiKey,
+      baseUrl: this.routingApiBaseUrl,
+      owner: state.walletAddress,
+      chainId,
+      token: token.address
+    });
+    if (!pending || pending.transfers.length !== evidences.length || pending.transfers.reduce((sum, transfer) => sum + BigInt(transfer.amount), 0n).toString() !== amount) return false;
+    const destinations = /* @__PURE__ */ new Set();
+    for (const evidence of evidences) {
+      if (evidence.chainId !== chainId || evidence.token !== first.token || evidence.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || evidence.callsId || evidence.userOpHash || evidence.txHash?.toLowerCase() !== pending.txHash.toLowerCase()) return false;
+      const agent = this.getAgent(evidence.agentId);
+      const wallet = agent.getFundingWallet ? await agent.getFundingWallet(state, chainId, evidence.token) : (await agent.getUserProfile(state, chainId)).smartWallet;
+      if (!wallet || destinations.has(wallet.toLowerCase()) || !pending.transfers.some((transfer) => transfer.to.toLowerCase() === wallet.toLowerCase() && transfer.amount === evidence.intendedAmount)) return false;
+      destinations.add(wallet.toLowerCase());
+    }
+    assertCurrent();
+    return true;
+  }
   /** A display acknowledgement controls polling only; it never confirms a financial outcome. */
   endFundingBalanceRefresh(evidence, read2) {
     const { state, chainId } = this.captureReadScope(evidence.chainId);
@@ -7541,6 +8529,30 @@ var OwneySDK = class {
       }
     };
     const token = asset;
+    const agentFailures = {};
+    const recordAgentFailure = (id, error) => {
+      if (!(error instanceof OwneyError)) return;
+      const details = error.details ?? {};
+      const codeValue = (value) => typeof value === "string" && /^[A-Z][A-Z0-9_]{0,79}$/.test(value) ? value : void 0;
+      const revertNames = ["InsufficientBalance", "InvalidAsset", "Unauthorized", "Error", "Panic", "FailedOp", "FailedOpWithRevert"];
+      const panicCodes = [0, 1, 17, 18, 33, 34, 49, 50, 65, 81];
+      agentFailures[id] = {
+        code: error.code,
+        phase: ["prepare", "send", "observe"].includes(String(details.phase)) ? details.phase : void 0,
+        failureCode: codeValue(details.failureCode),
+        reason: codeValue(details.reason),
+        withdrawalPhase: details.withdrawalPhase === "unwind" ? "unwind" : void 0,
+        statusCode: typeof details.statusCode === "number" ? details.statusCode : void 0,
+        rpcCode: typeof details.rpcCode === "number" ? details.rpcCode : void 0,
+        rpcMethod: typeof details.rpcMethod === "string" && /^[A-Za-z_]{1,80}$/.test(details.rpcMethod) ? details.rpcMethod : void 0,
+        revertSelector: typeof details.revertSelector === "string" && /^0x[0-9a-f]{8}$/i.test(details.revertSelector) ? details.revertSelector : void 0,
+        revertName: typeof details.revertName === "string" && revertNames.includes(details.revertName) ? details.revertName : void 0,
+        aaCode: typeof details.aaCode === "string" && /^AA[0-9]{2}$/.test(details.aaCode) ? details.aaCode : void 0,
+        panicCode: typeof details.panicCode === "string" && /^0x[0-9a-f]{1,2}$/i.test(details.panicCode) && panicCodes.includes(Number.parseInt(details.panicCode.slice(2), 16)) ? details.panicCode : void 0,
+        safeToFallback: typeof details.safeToFallback === "boolean" ? details.safeToFallback : void 0,
+        executionFailed: typeof details.executionFailed === "boolean" ? details.executionFailed : void 0
+      };
+    };
     const submissionEvidence = /* @__PURE__ */ new Map();
     const submit = async (agent, requested2) => {
       attempted.add(agent.id);
@@ -7561,9 +8573,19 @@ var OwneySDK = class {
       };
       progress(evidence);
       try {
+        if (options.onBeforeSubmission)
+          return await agent.withdraw(
+            state,
+            chainId,
+            token,
+            requested2,
+            progress,
+            options.gasMode ?? "auto",
+            (next) => options.onBeforeSubmission({ ...evidence, ...next })
+          );
         return await (options.gasMode === void 0 ? agent.withdraw(state, chainId, token, requested2, progress) : agent.withdraw(state, chainId, token, requested2, progress, options.gasMode));
       } catch (error) {
-        if (!evidence.txHash && (this.isUserRejectedWithdrawal(error) || /insufficient (balance|funds)/i.test(error instanceof Error ? error.message : "")))
+        if (!evidence.txHash && !evidence.userOpHash && !evidence.callsId && (this.isUserRejectedWithdrawal(error) || /insufficient (balance|funds)/i.test(error instanceof Error ? error.message : "")))
           progress({ ...evidence, transfer: "failed", delivery: "failed" });
         throw error;
       }
@@ -7594,6 +8616,7 @@ var OwneySDK = class {
     if (!amount) {
       const results2 = {};
       const agentErrors2 = {};
+      const incompleteWithdrawals = {};
       for (const agent of withdrawalAgents) {
         try {
           results2[agent.id] = await submit(agent);
@@ -7602,8 +8625,17 @@ var OwneySDK = class {
           if (err instanceof OwneyError && err.code === "SPONSOR_REQUEST_FAILED" && err.details?.safeToFallback === true) throw err;
           if (this.isUserRejectedWithdrawal(err)) throw err;
           if (err instanceof OwneyError && err.code === "WITHDRAW_INSUFFICIENT_BALANCE" && err.details?.available === "0" && submissionEvidence.get(agent.id)?.transfer === "failed") continue;
+          if (agent.id === "yieldseeker" && err instanceof OwneyError && err.code === "WITHDRAW_PARTIAL_FAILURE" && err.details?.reason === "YIELDSEEKER_MAX_INCOMPLETE") {
+            incompleteWithdrawals[agent.id] = { positionsStatus: err.details.positionsStatus };
+            const evidence = submissionEvidence.get(agent.id);
+            if (evidence?.agentId === agent.id && evidence.chainId === chainId && evidence.token === token && evidence.walletAddress.toLowerCase() === state.walletAddress.toLowerCase() && evidence.intendedAmount === "MAX" && evidence.transfer === "confirmed" && evidence.delivery === "confirmed" && evidence.txHash && /^0x[\da-f]{64}$/i.test(evidence.txHash) && evidence.confirmedAmount && /^\d+$/.test(evidence.confirmedAmount) && BigInt(evidence.confirmedAmount) > 0n) {
+              results2[agent.id] = { txHash: evidence.txHash, type: "partial", amount: evidence.confirmedAmount, evidence };
+              notifyAgentResult(agent.id, results2[agent.id]);
+            }
+          }
           console.error(`withdraw failed for agent "${agent.id}":`, err);
           agentErrors2[agent.id] = err instanceof Error ? err.message : String(err);
+          recordAgentFailure(agent.id, err);
           const code = err instanceof OwneyError ? err.code : "SDK_AGENT_FAILURE";
           void reportAgentFailure(
             this.apiKey,
@@ -7614,17 +8646,23 @@ var OwneySDK = class {
         }
       }
       if (Object.keys(results2).length === 0) {
+        if (Object.keys(agentErrors2).length === 0)
+          throw new OwneyError(
+            "WITHDRAW_INSUFFICIENT_BALANCE",
+            "No funds are currently available to withdraw for this asset.",
+            { asset, available: "0" }
+          );
         throw new OwneyError(
           "WITHDRAW_ALL_FAILED",
           `Failed to withdraw "${asset}" from all eligible agents.`,
-          { asset, agentErrors: agentErrors2 }
+          { asset, agentErrors: agentErrors2, agentFailures }
         );
       }
       if (Object.keys(agentErrors2).length > 0) {
         throw new OwneyError(
           "WITHDRAW_PARTIAL_FAILURE",
           "Some agents could not complete the withdrawal.",
-          { asset, partialResults: results2, agentErrors: agentErrors2 }
+          { asset, partialResults: results2, agentErrors: agentErrors2, agentFailures, ...Object.keys(incompleteWithdrawals).length ? { incompleteWithdrawals } : {} }
         );
       }
       const amountsKnown = Object.values(results2).every(
@@ -7705,6 +8743,7 @@ var OwneySDK = class {
         if (this.isUserRejectedWithdrawal(err)) throw err;
         console.error(`withdraw failed for agent "${p.agent.id}":`, err);
         agentErrors[p.agent.id] = err instanceof Error ? err.message : String(err);
+        recordAgentFailure(p.agent.id, err);
         const code = err instanceof OwneyError ? err.code : "SDK_AGENT_FAILURE";
         void reportAgentFailure(
           this.apiKey,
@@ -7725,7 +8764,8 @@ var OwneySDK = class {
         {
           asset,
           amount,
-          agentErrors
+          agentErrors,
+          agentFailures
         }
       );
     }
@@ -7740,6 +8780,7 @@ var OwneySDK = class {
           withdrawn: withdrawn.toString(),
           partialResults: results,
           agentErrors,
+          agentFailures,
           ...unavailableAgentIds.length > 0 ? { unavailableAgents: unavailableAgentIds } : {}
         }
       );