@owney/sdk 0.7.25-beta.19 → 0.7.25-beta.20

package/dist/index.js

@@ -16,6 +16,29 @@ var accountExecutionAbi = parseAbi([
 ]);
 var entryPoint06 = "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789";
 var entryPoint07 = "0x0000000071727de22e5e9d8baf0edac6f37da032";
+function yieldseekerExecution(receipt, evidence) {
+  const operationEvents = receipt.logs.flatMap((log) => {
+    if (![entryPoint06, entryPoint07].includes(log.address.toLowerCase())) return [];
+    try {
+      const event = decodeEventLog({ abi: entryPoint06Abi, data: log.data, topics: log.topics });
+      return event.eventName === "UserOperationEvent" ? [{ ...event.args, logIndex: log.logIndex }] : [];
+    } catch {
+      return [];
+    }
+  }).sort((a, b) => a.logIndex - b.logIndex);
+  const bundled = !!evidence.userOpHash || !!evidence.callsId || operationEvents.length > 0 || [entryPoint06, entryPoint07].includes(receipt.to?.toLowerCase() ?? "");
+  if (!bundled) return { status: "confirmed", logs: receipt.logs };
+  const senders = evidence.userOperation?.sender ? [evidence.userOperation.sender.toLowerCase()] : evidence.callsId ? [evidence.walletAddress.toLowerCase()] : [evidence.walletAddress.toLowerCase(), evidence.agentWallet?.toLowerCase()];
+  const matches = operationEvents.filter((event) => senders.includes(event.sender.toLowerCase()) && (!evidence.userOpHash || event.userOpHash.toLowerCase() === evidence.userOpHash.toLowerCase()));
+  if (matches.length !== 1) return { status: "unknown", logs: [] };
+  const operation = matches[0];
+  if (!operation.success) return { status: "failed", logs: [] };
+  const previous = operationEvents.filter((event) => event.logIndex < operation.logIndex).at(-1)?.logIndex ?? -1;
+  return {
+    status: "confirmed",
+    logs: receipt.logs.filter((log) => log.logIndex > previous && log.logIndex < operation.logIndex)
+  };
+}
 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) => {
@@ -61,8 +84,27 @@ function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress, receip
     return false;
   }
 }
-function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
+function inspectFundingReceipt(receipt, evidence, tokenAddress, direction, options = {}) {
+  evidence = {
+    ...evidence,
+    confirmedAmount: void 0,
+    amountCompletion: void 0,
+    shortfallAmount: void 0,
+    blockNumber: void 0,
+    logIndexes: void 0,
+    transferLogs: void 0
+  };
+  if (evidence.txHash && receipt.transactionHash && evidence.txHash.toLowerCase() !== receipt.transactionHash.toLowerCase())
+    return { ...evidence, transfer: "unknown", delivery: direction === "withdraw" ? "unknown" : "not-applicable" };
   if (receipt.status !== "success") return { ...evidence, transfer: "failed", delivery: "failed" };
+  const execution = direction === "withdraw" && evidence.agentId === "yieldseeker" ? yieldseekerExecution(receipt, evidence) : { status: "confirmed", logs: receipt.logs };
+  if (execution.status !== "confirmed") return {
+    ...evidence,
+    blockNumber: receipt.blockNumber.toString(),
+    ...execution.status === "failed" ? { confirmedAmount: "0" } : {},
+    transfer: execution.status,
+    delivery: execution.status
+  };
   let amount = 0n;
   const seen = /* @__PURE__ */ new Set();
   const attributed = /* @__PURE__ */ new Map();
@@ -73,7 +115,7 @@ function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
   const logIndexes = [];
   const transferLogs = [];
   const zeroTransferLogs = [];
-  for (const log of [...receipt.logs].sort((a, b) => a.logIndex - b.logIndex)) {
+  for (const log of [...execution.logs].sort((a, b) => a.logIndex - b.logIndex)) {
     if (log.address.toLowerCase() !== tokenAddress.toLowerCase()) continue;
     if (seen.has(log.logIndex)) continue;
     seen.add(log.logIndex);
@@ -99,7 +141,7 @@ function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
     }
   }
   const expected = /^\d+$/.test(evidence.intendedAmount) ? BigInt(evidence.intendedAmount) : void 0;
-  const emptyPayout = direction === "withdraw" && evidence.agentId === "yieldseeker" && amount === 0n && zeroTransferLogs.length > 0 && receipt.logs.some((log) => {
+  const emptyPayout = direction === "withdraw" && evidence.agentId === "yieldseeker" && amount === 0n && zeroTransferLogs.length > 0 && execution.logs.some((log) => {
     if (log.address.toLowerCase() !== agent) return false;
     try {
       const { args } = decodeEventLog({ abi: withdrawalEventAbi, data: log.data, topics: log.topics });
@@ -117,18 +159,30 @@ function inspectFundingReceipt(receipt, evidence, tokenAddress, direction) {
     transfer: "failed",
     delivery: "failed"
   };
-  const delivered = amount > 0n && (expected === void 0 || amount >= expected);
+  const exactReceipt = !!evidence.txHash && /^0x[\da-f]{64}$/i.test(evidence.txHash) && receipt.transactionHash?.toLowerCase() === evidence.txHash.toLowerCase();
+  const delivered = amount > 0n && (options.requireAmountMatch ? expected === void 0 || amount === expected : direction === "withdraw" && exactReceipt || expected === void 0 || amount >= expected);
   return {
     ...evidence,
     blockNumber: receipt.blockNumber.toString(),
     logIndexes,
     transferLogs,
     ...amount > 0n ? { confirmedAmount: amount.toString() } : {},
+    ...delivered && direction === "withdraw" && expected !== void 0 ? {
+      amountCompletion: amount < expected ? "shortfall" : "complete",
+      shortfallAmount: (amount < expected ? expected - amount : 0n).toString()
+    } : {},
     transfer: delivered ? "confirmed" : "unknown",
     delivery: direction === "withdraw" ? delivered ? "confirmed" : "unknown" : "not-applicable"
   };
 }
 
+// src/lib/helpers/funding-amount.ts
+function isFundingAmount(value, allowZero = false) {
+  if (typeof value !== "string" || !/^\d{1,78}$/.test(value)) return false;
+  const amount = BigInt(value);
+  return (allowZero ? amount >= 0n : amount > 0n) && amount <= (1n << 256n) - 1n;
+}
+
 // src/lib/deposit-batch-callback.ts
 var batchCallbacks = /* @__PURE__ */ new WeakMap();
 var getDepositBatchTransfer = (callback) => callback ? batchCallbacks.get(callback) : void 0;
@@ -345,7 +399,7 @@ var AgentReads = class {
 
 // src/agents/zyfai/zyfai.withdraw-submission.ts
 var listenersByClient = /* @__PURE__ */ new WeakMap();
-function observeWithdrawalSubmission(sdk, chainId, token) {
+function observeWithdrawalSubmission(sdk, chainId, token, assertCurrent) {
   const client = sdk.httpClient;
   if (!client || typeof client.get !== "function" || typeof client.post !== "function")
     return { attempted: () => void 0, rejected: () => false, request: () => void 0, stop: () => {
@@ -362,6 +416,7 @@ function observeWithdrawalSubmission(sdk, chainId, token) {
         const withdrawal = method === "get" && url === "/users/withdraw" || method === "post" && url === "/users/partial-withdraw";
         const payload = method === "get" ? options?.params : options;
         const matching = withdrawal ? [...observers].filter((observer) => observer.chainId === payload?.chainId && observer.token === payload?.tokenSymbol) : [];
+        for (const observer of matching) observer.assertCurrent?.();
         const startedAt = Date.now();
         const request2 = {
           attempted: true,
@@ -406,7 +461,7 @@ function observeWithdrawalSubmission(sdk, chainId, token) {
           const status = error?.response?.status;
           if (request2.httpStatus === void 0 && typeof status === "number" && Number.isInteger(status) && status >= 100 && status <= 599)
             request2.httpStatus = status;
-          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" : method === "post" && request2.httpStatus === 400 && message === "Partial withdrawal already in progress" ? "withdrawal-in-progress" : message === "Network error: Unable to reach the server" ? "network" : "other";
+          request2.failure = message === "Unauthorized: Invalid API key" ? "unauthorized" : message === "Forbidden: Access denied" ? "forbidden" : message === "Rate limit exceeded. Please try again later." ? "rate-limited" : request2.httpStatus === 400 && message === "No balance to withdraw" ? "insufficient-balance" : /^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" : method === "post" && request2.httpStatus === 400 && message === "Partial withdrawal already in progress" ? "withdrawal-in-progress" : message === "Network error: Unable to reach the server" ? "network" : "other";
           if (["unauthorized", "forbidden", "rate-limited", "insufficient-balance", "session-key-missing", "withdrawal-in-progress"].includes(request2.failure) && (request2.httpStatus === void 0 || request2.httpStatus >= 400 && request2.httpStatus < 500)) notify("rejected");
           throw error;
         } finally {
@@ -419,7 +474,7 @@ function observeWithdrawalSubmission(sdk, chainId, token) {
   let submitted = false;
   let rejected = false;
   let request = { attempted: false };
-  const listener = { chainId, token, notify: (outcome, evidence) => {
+  const listener = { chainId, token, assertCurrent, notify: (outcome, evidence) => {
     request = evidence;
     if (outcome === "attempted") submitted = true;
     else if (outcome === "rejected") rejected = true;
@@ -470,10 +525,8 @@ function hasEmptyWithdrawalSnapshot(raw2, chainId, token) {
   return true;
 }
 
-// src/agents/zyfai/zyfai.agent.ts
-import { SMART_SESSIONS_VALIDATOR, ZyfaiSDK } from "@zyfai/sdk";
-import { erc20Abi as erc20Abi2, formatUnits as formatUnits2, isAddress, parseAbi as parseAbi2 } from "viem";
-import { base, arbitrum, mainnet } from "viem/chains";
+// src/agents/zyfai/zyfai.deposit.ts
+import { createWalletClient, custom, encodeFunctionData, erc20Abi as erc20Abi2, isAddress } from "viem";
 
 // src/types/config.ts
 var P_SUPPORTED_CHAINS = {
@@ -522,6 +575,43 @@ var SupportedAssets = [
   }
 ];
 
+// src/agents/zyfai/zyfai.deposit.ts
+async function submitZyfaiDeposit({ sdk, state, chain, amount, asset, smartWallet, assertCurrent }) {
+  const owner = state.walletAddress;
+  const provider = state.provider;
+  const token = SupportedAssets.find((value) => value.chainId === chain.id && value.symbol === asset);
+  if (!token || !isAddress(owner) || !isAddress(smartWallet) || !/^\d+$/.test(amount) || BigInt(amount) <= 0n)
+    throw new OwneyError("AGENT_INVALID_RESPONSE", "Invalid Zyfai deposit transfer.", { chainId: chain.id, asset }, "zyfai");
+  assertCurrent();
+  const prepared = await sdk.prepareEnterPosition({ userAddress: owner, chainId: chain.id, amount, asset, strategy: "aggressive" });
+  assertCurrent();
+  const expectedData = encodeFunctionData({ abi: erc20Abi2, functionName: "transfer", args: [smartWallet, BigInt(amount)] });
+  const transfer = prepared?.transfer;
+  if (!transfer || transfer.safeAddress?.toLowerCase() !== smartWallet.toLowerCase() || transfer.tokenAddress?.toLowerCase() !== token.address.toLowerCase() || transfer.to?.toLowerCase() !== token.address.toLowerCase() || transfer.data?.toLowerCase() !== expectedData.toLowerCase() || transfer.value !== "0")
+    throw new OwneyError("AGENT_INVALID_RESPONSE", "Zyfai prepared a different deposit transfer.", { chainId: chain.id, asset }, "zyfai");
+  const wallet = createWalletClient({ account: owner, chain, transport: custom({
+    request: async (args) => {
+      assertCurrent();
+      if (args.method === "eth_sendTransaction") {
+        const [accounts, chainId] = await Promise.all([
+          provider.request({ method: "eth_accounts" }),
+          provider.request({ method: "eth_chainId" })
+        ]);
+        assertCurrent();
+        if (!Array.isArray(accounts) || typeof accounts[0] !== "string" || accounts[0].toLowerCase() !== owner.toLowerCase() || Number(chainId) !== chain.id)
+          throw new OwneyError("NOT_CONNECTED", "Wallet changed while preparing Zyfai deposit.", void 0, "zyfai");
+      }
+      return provider.request(args);
+    }
+  }, { retryCount: 0 }) });
+  return wallet.sendTransaction({ account: owner, chain, to: token.address, data: expectedData, value: 0n });
+}
+
+// src/agents/zyfai/zyfai.agent.ts
+import { SMART_SESSIONS_VALIDATOR, ZyfaiSDK } from "@zyfai/sdk";
+import { erc20Abi as erc20Abi3, formatUnits as formatUnits2, isAddress as isAddress2, parseAbi as parseAbi2 } from "viem";
+import { base, arbitrum, mainnet } from "viem/chains";
+
 // src/lib/debug.ts
 var configuredDebug = false;
 function setOwneyDebug(enabled) {
@@ -581,13 +671,6 @@ function tokenDecimals(symbol, explicit) {
     return explicit;
   return DECIMALS_BY_SYMBOL[(symbol ?? "").toLowerCase()] ?? 6;
 }
-function mapDeposit(raw2) {
-  return {
-    txHash: raw2.txHash,
-    smartWallet: raw2.smartWallet,
-    amount: raw2.amount
-  };
-}
 function mapWithdraw(raw2) {
   return {
     txHash: raw2.txHash,
@@ -1490,6 +1573,14 @@ var POOL_POLICY_CHAIN_IDS = [8453, 42161, 1];
 var EARNINGS_REFRESH_COOLDOWN_MS = 60 * 60 * 1e3;
 var WITHDRAW_BALANCE_TIMEOUT_MS = 2e3;
 var ZyfaiAgent = class _ZyfaiAgent {
+  constructor(apiKey, rpcUrls, referralSource) {
+    this.apiKey = apiKey;
+    this.referralSource = referralSource;
+    this.rpcUrls = resolveRpcUrls(rpcUrls);
+    this.sdk = this.createSdk();
+  }
+  apiKey;
+  referralSource;
   id = "zyfai";
   supportedChainIds = [8453, 42161, 1];
   supportedAssets = [
@@ -1534,6 +1625,9 @@ var ZyfaiAgent = class _ZyfaiAgent {
    */
   sessionKeyAttempts = /* @__PURE__ */ new Set();
   connectAuthPromise = null;
+  connectAuthScope = null;
+  connectionGeneration = 0;
+  sdkHasConnected = false;
   rpcUrls;
   publicClients = /* @__PURE__ */ new Map();
   // Receipt-derived amounts and log identities, scoped to the owner and asset.
@@ -1544,17 +1638,20 @@ var ZyfaiAgent = class _ZyfaiAgent {
   earningsSnapshot = null;
   earningsGeneration = 0;
   balanceSnapshots = /* @__PURE__ */ new WeakMap();
-  constructor(apiKey, rpcUrls, referralSource) {
-    this.rpcUrls = resolveRpcUrls(rpcUrls);
-    this.sdk = new ZyfaiSDK({
-      apiKey,
+  /** A replaced wallet session gets its own vendor client. In-flight calls
+   * keep their original client; authentication must never change owners under
+   * an operation that is waiting for provider reads or an HTTP response. */
+  createSdk() {
+    const sdk = new ZyfaiSDK({
+      apiKey: this.apiKey,
       rpcUrls: this.rpcUrls,
       // Forwarded to /auth/login by the SDK's own SIWE handshake, so
       // attribution survives without the AppKit SIWX config (which carried it
       // via `createOwneySIWX({ referralSource })` when apps used the modal).
-      referralSource
+      referralSource: this.referralSource
     });
-    this.installAuthCache();
+    this.installAuthCache(sdk);
+    return sdk;
   }
   getPublicClient(chainId) {
     const cached = this.publicClients.get(chainId);
@@ -1653,9 +1750,9 @@ var ZyfaiAgent = class _ZyfaiAgent {
    * No-op on the server (no `window`) — the SDK is constructed during SSR
    * for some apps and the patch only matters in the browser anyway.
    */
-  installAuthCache() {
+  installAuthCache(sdk = this.sdk) {
     if (typeof window === "undefined") return;
-    const internals = this.sdk;
+    const internals = sdk;
     const original = internals.authenticateUser.bind(internals);
     internals.authenticateUser = async () => {
       if (internals.authenticatedUserId !== null) return;
@@ -1700,25 +1797,41 @@ var ZyfaiAgent = class _ZyfaiAgent {
   /** Light connect: SIWE auth only. Re-auths if chain changed. */
   async connectAuth(state, chainId) {
     const validChainId = isValidChainId(chainId);
-    if (this.connectedAddress && this.connectedChainId === validChainId) {
+    const owner = state.walletAddress.toLowerCase();
+    const scope = `${owner}:${validChainId}`;
+    if (this.connectedAddress?.toLowerCase() === owner && this.connectedChainId === validChainId) {
       return;
     }
-    if (this.connectAuthPromise) {
+    if (this.connectAuthPromise && this.connectAuthScope === scope) {
       await this.connectAuthPromise;
-      return;
+      return this.connectAuth(state, chainId);
     }
-    this.connectAuthPromise = (async () => {
+    if (this.sdkHasConnected || this.connectedAddress) this.sdk = this.createSdk();
+    this.sdkHasConnected = true;
+    const executionSdk = this.sdk;
+    const generation = ++this.connectionGeneration;
+    this.connectedAddress = null;
+    this.connectedChainId = null;
+    const pending = (async () => {
       const address = await this.connectAccountWithRetry(
         state.provider,
-        validChainId
+        validChainId,
+        executionSdk
       );
+      if (generation !== this.connectionGeneration || address.toLowerCase() !== owner)
+        throw new OwneyError("NOT_CONNECTED", "Wallet changed while connecting Zyfai.", void 0, this.id);
       this.connectedAddress = address;
       this.connectedChainId = validChainId;
     })();
+    this.connectAuthPromise = pending;
+    this.connectAuthScope = scope;
     try {
-      await this.connectAuthPromise;
+      await pending;
     } finally {
-      this.connectAuthPromise = null;
+      if (this.connectAuthPromise === pending) {
+        this.connectAuthPromise = null;
+        this.connectAuthScope = null;
+      }
     }
   }
   /**
@@ -1730,16 +1843,16 @@ var ZyfaiAgent = class _ZyfaiAgent {
    * JWT from a misconfigured API key; we retry once either way, and if the
    * second attempt still fails the original error propagates.
    */
-  async connectAccountWithRetry(provider, chainId) {
+  async connectAccountWithRetry(provider, chainId, executionSdk = this.sdk) {
     try {
-      return await this.sdk.connectAccount(provider, chainId);
+      return await executionSdk.connectAccount(provider, chainId);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (!message.toLowerCase().includes("unauthorized")) throw error;
-      const internals = this.sdk;
+      const internals = executionSdk;
       const address = internals.walletClient?.account?.address;
       if (address) clearSession(address, chainId);
-      return await this.sdk.connectAccount(provider, chainId);
+      return await executionSdk.connectAccount(provider, chainId);
     }
   }
   /**
@@ -1751,11 +1864,17 @@ var ZyfaiAgent = class _ZyfaiAgent {
    * withdrawFunds) fail with "No account connected".
    */
   async ensureConnected(state, chainId) {
+    const assertOwner = () => {
+      if (this.connectedAddress?.toLowerCase() !== state.walletAddress.toLowerCase() || this.connectedChainId !== chainId)
+        throw new OwneyError("NOT_CONNECTED", "Wallet changed while connecting Zyfai.", void 0, this.id);
+    };
     await this.connectAuth(state, chainId);
+    assertOwner();
     const internals = this.sdk;
     if (!internals.walletClient || internals.authenticatedUserId === null) {
       this.connectedChainId = null;
       await this.connectAuth(state, chainId);
+      assertOwner();
     }
   }
   /** A rejected execution session must not be reused by the next foreground attempt. */
@@ -1816,6 +1935,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
   }
   // --- IAgent: Connection lifecycle ---
   async disconnect() {
+    const executionSdk = this.sdk;
+    this.connectionGeneration++;
     this.earningsGeneration++;
     this.earningsReads.clear();
     this.earningsRefreshes.clear();
@@ -1823,10 +1944,14 @@ var ZyfaiAgent = class _ZyfaiAgent {
     if (this.connectedAddress && this.connectedChainId !== null) {
       clearSession(this.connectedAddress, this.connectedChainId);
     }
-    await this.sdk.disconnectAccount();
     this.connectedAddress = null;
     this.connectedChainId = null;
+    this.connectAuthPromise = null;
+    this.connectAuthScope = null;
     this.smartWalletCache.clear();
+    this.sdk = this.createSdk();
+    this.sdkHasConnected = false;
+    await executionSdk.disconnectAccount();
   }
   // --- IAgent: Account lifecycle ---
   async activateAgent(state, chainId) {
@@ -2315,93 +2440,79 @@ var ZyfaiAgent = class _ZyfaiAgent {
     return redeployed.address;
   }
   async deposit(state, chainId, amount, asset, depositCallback, onProgress) {
+    const validChainId = isValidChainId(chainId);
+    const owner = state.walletAddress;
+    const provider = state.provider;
+    await this.ensureConnected(state, validChainId);
+    const executionSdk = this.sdk;
+    const generation = this.connectionGeneration;
+    const assertCurrent = () => {
+      const account = executionSdk.walletClient?.account?.address;
+      if (generation !== this.connectionGeneration || executionSdk !== this.sdk || this.connectedAddress?.toLowerCase() !== owner.toLowerCase() || this.connectedChainId !== validChainId || state.walletAddress.toLowerCase() !== owner.toLowerCase() || state.provider !== provider || state.chainId !== null && state.chainId !== validChainId || account && account.toLowerCase() !== owner.toLowerCase())
+        throw new OwneyError("NOT_CONNECTED", "Wallet changed while preparing Zyfai deposit.", void 0, this.id);
+    };
+    assertCurrent();
+    const smartWallet = await this.ensureWalletDeployed(owner, validChainId);
+    assertCurrent();
+    notifyFunding(onProgress, {
+      agentId: this.id,
+      chainId,
+      token: asset,
+      walletAddress: owner,
+      agentWallet: smartWallet,
+      intendedAmount: amount,
+      transfer: "pending",
+      registration: "pending",
+      delivery: "not-applicable"
+    });
+    const txHash = depositCallback ? await depositCallback(smartWallet, validChainId, amount) : await submitZyfaiDeposit({
+      sdk: executionSdk,
+      state: { ...state, walletAddress: owner, provider },
+      chain: VIEM_CHAIN[validChainId],
+      amount,
+      asset,
+      smartWallet,
+      assertCurrent
+    });
+    let evidence = {
+      agentId: this.id,
+      chainId,
+      token: asset,
+      walletAddress: owner,
+      agentWallet: smartWallet,
+      intendedAmount: amount,
+      txHash,
+      transfer: "pending",
+      registration: "pending",
+      delivery: "not-applicable"
+    };
+    notifyFunding(onProgress, evidence);
     try {
-      const validChainId = isValidChainId(chainId);
-      await this.ensureConnected(state, validChainId);
-      if (depositCallback) {
-        const smartWallet = await this.ensureWalletDeployed(
-          this.getAddress(),
-          validChainId
-        );
-        notifyFunding(onProgress, {
-          agentId: this.id,
-          chainId,
-          token: asset,
-          walletAddress: state.walletAddress,
-          agentWallet: smartWallet,
-          intendedAmount: amount,
-          transfer: "pending",
-          registration: "pending",
-          delivery: "not-applicable"
-        });
-        const txHash = await depositCallback(smartWallet, validChainId, amount);
-        let evidence2 = {
-          agentId: this.id,
-          chainId,
-          token: asset,
-          walletAddress: state.walletAddress,
-          agentWallet: smartWallet,
-          intendedAmount: amount,
-          txHash,
-          transfer: "pending",
-          registration: "pending",
-          delivery: "not-applicable"
-        };
-        notifyFunding(onProgress, evidence2);
-        try {
-          const receipt = await this.getPublicClient(validChainId).getTransactionReceipt({ hash: txHash });
-          const token = SupportedAssets.find((token2) => token2.chainId === chainId && token2.symbol === asset);
-          evidence2 = inspectFundingReceipt(receipt, evidence2, token.address, "deposit");
-        } catch {
-          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));
-          evidence2 = { ...evidence2, registration: "confirmed" };
-        } catch {
-          evidence2 = { ...evidence2, registration: "unknown" };
-        }
-        notifyFunding(onProgress, evidence2);
-        return { txHash, smartWallet, amount, evidence: evidence2 };
-      }
-      await this.ensureWalletDeployed(this.getAddress(), validChainId);
-      const raw2 = await this.sdk.sendDeposit(
-        this.getAddress(),
-        validChainId,
-        amount,
-        asset,
-        "aggressive"
-      );
-      let evidence = {
-        agentId: this.id,
-        chainId,
-        token: asset,
-        walletAddress: state.walletAddress,
-        agentWallet: raw2.smartWallet,
-        intendedAmount: amount,
-        txHash: raw2.txHash,
-        transfer: "unknown",
-        registration: raw2.registration ? "confirmed" : "unknown",
-        delivery: "not-applicable"
-      };
-      notifyFunding(onProgress, evidence);
-      try {
-        const receipt = await this.getPublicClient(validChainId).getTransactionReceipt({ hash: raw2.txHash });
-        const token = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === asset);
-        evidence = inspectFundingReceipt(receipt, evidence, token.address, "deposit");
-      } 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;
+      const receipt = await this.getPublicClient(validChainId).waitForTransactionReceipt({
+        hash: txHash,
+        confirmations: 1,
+        timeout: 9e4,
+        checkReplacement: false
+      });
+      const token = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === asset);
+      evidence = inspectFundingReceipt(receipt, evidence, token.address, "deposit");
+    } catch {
+      evidence = { ...evidence, transfer: "unknown" };
+    }
+    notifyFunding(onProgress, evidence);
+    if (evidence.transfer === "failed")
+      throw new OwneyError("AGENT_TRANSACTION_REVERTED", "Zyfai deposit transaction reverted.", { txHash }, this.id);
+    if (evidence.transfer !== "confirmed") return { txHash, smartWallet, amount, evidence };
+    try {
+      assertCurrent();
+      const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
+      await (tokenAddress ? executionSdk.logDeposit(validChainId, txHash, amount, tokenAddress) : executionSdk.logDeposit(validChainId, txHash, amount));
+      evidence = { ...evidence, registration: "confirmed" };
+    } catch {
+      evidence = { ...evidence, registration: "unknown" };
     }
+    notifyFunding(onProgress, evidence);
+    return { txHash, smartWallet, amount, evidence };
   }
   // --- IAgent: Fund operations ---
   /** Only after a definitive endpoint rejection, combine a new provider
@@ -2431,7 +2542,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
         this.sdk.getPortfolio(owner).catch(() => void 0)
       ]);
       assertScope();
-      if (!isAddress(wallet.address) || !registered.smartWallet || registered.smartWallet.toLowerCase() !== wallet.address.toLowerCase())
+      if (!isAddress2(wallet.address) || !registered.smartWallet || registered.smartWallet.toLowerCase() !== wallet.address.toLowerCase())
         throw new OwneyError(
           "AGENT_AUTH_FAILED",
           "Could not verify Zyfai's withdrawal wallet.",
@@ -2442,7 +2553,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
         const asset = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === token);
         const idle = asset ? await this.getPublicClient(chainId).readContract({
           address: asset.address,
-          abi: erc20Abi2,
+          abi: erc20Abi3,
           functionName: "balanceOf",
           args: [wallet.address]
         }).catch(() => void 0) : void 0;
@@ -2471,11 +2582,12 @@ var ZyfaiAgent = class _ZyfaiAgent {
   /** 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 generation = this.connectionGeneration;
     await this.assertNotEmptyRejectedWithdrawal(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())
+      if (generation !== this.connectionGeneration || 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();
@@ -2504,6 +2616,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
     }
   }
   async withdraw(state, chainId, token, amount, onProgress) {
+    if (amount !== void 0 && (typeof amount !== "string" || !/^[0-9]+$/.test(amount) || BigInt(amount) <= 0n))
+      throw new OwneyError("WITHDRAW_INVALID_AMOUNT", "Withdrawal amount must be a positive integer in token base units.", void 0, this.id);
     const validChainId = isValidChainId(chainId);
     try {
       await this.ensureConnected(state, validChainId);
@@ -2520,16 +2634,40 @@ var ZyfaiAgent = class _ZyfaiAgent {
       });
       throw error;
     }
-    let observation = observeWithdrawalSubmission(this.sdk, validChainId, token);
-    const authToken = this.sdk.httpClient?.authToken;
-    const owner = this.getAddress();
+    const executionSdk = this.sdk;
+    const internals = executionSdk;
+    const generation = this.connectionGeneration;
+    const owner = state.walletAddress;
+    let staleSessionError;
+    const assertCurrent = () => {
+      const account = internals.walletClient?.account?.address;
+      if (generation !== this.connectionGeneration || this.connectedAddress?.toLowerCase() !== owner.toLowerCase() || this.connectedChainId !== validChainId || state.chainId !== null && state.chainId !== validChainId || account && account.toLowerCase() !== owner.toLowerCase()) {
+        staleSessionError = new OwneyError(
+          "NOT_CONNECTED",
+          "Wallet changed before Zyfai withdrawal submission.",
+          { phase: "prepare", rejectedBeforeSubmission: true },
+          this.id
+        );
+        throw staleSessionError;
+      }
+    };
+    let observation = observeWithdrawalSubmission(executionSdk, validChainId, token, assertCurrent);
+    const authToken = internals.httpClient?.authToken;
     let raw2;
     try {
       for (let attempt = 0; attempt < 2; attempt++) {
         try {
-          raw2 = await this.sdk.withdrawFunds(owner, validChainId, amount, token);
+          assertCurrent();
+          raw2 = await executionSdk.withdrawFunds(owner, validChainId, amount, token);
           break;
         } catch (error) {
+          if (observation.rejected()) {
+            try {
+              assertCurrent();
+            } catch {
+              throw error;
+            }
+          }
           if (!amount && observation.rejected() && observation.request()?.failure === "insufficient-balance") {
             try {
               await this.assertNotEmptyRejectedWithdrawal(state, validChainId, token, owner);
@@ -2547,7 +2685,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
             );
           await this.recoverWithdrawalSession(state, validChainId, token, owner);
           observation.stop();
-          observation = observeWithdrawalSubmission(this.sdk, validChainId, token);
+          observation = observeWithdrawalSubmission(executionSdk, validChainId, token, assertCurrent);
         }
       }
       if (!raw2) throw new OwneyError(
@@ -2557,6 +2695,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
         this.id
       );
     } catch (error) {
+      if (staleSessionError && observation.attempted() === false) error = staleSessionError;
       this.invalidateRejectedWithdrawalSession(error, state, validChainId, authToken);
       if (observation.attempted() !== void 0) {
         const failed = observation.attempted() === false || observation.rejected();
@@ -2577,7 +2716,6 @@ var ZyfaiAgent = class _ZyfaiAgent {
       observation.stop();
     }
     if (!raw2.success) {
-      const unresolved = !!raw2.txHash || /already|pending|queued|in.progress/i.test(raw2.message ?? "");
       notifyFunding(onProgress, {
         agentId: this.id,
         chainId,
@@ -2585,9 +2723,9 @@ var ZyfaiAgent = class _ZyfaiAgent {
         walletAddress: state.walletAddress,
         intendedAmount: amount ?? "MAX",
         txHash: raw2.txHash,
-        transfer: unresolved ? "unknown" : "failed",
+        transfer: "unknown",
         registration: "not-applicable",
-        delivery: unresolved ? "unknown" : "failed",
+        delivery: "unknown",
         withdrawalRequest: observation.request()
       });
       throw new OwneyError(
@@ -2614,8 +2752,9 @@ var ZyfaiAgent = class _ZyfaiAgent {
   }
   /** Registration recovery never signs, transfers, activates, or refreshes authentication. */
   async retryDepositRegistration(state, evidence) {
-    const internals = this.sdk;
-    if (!internals.httpClient.authToken || internals.authenticatedUserId === null || this.connectedAddress?.toLowerCase() !== state.walletAddress.toLowerCase() || this.connectedChainId !== evidence.chainId) {
+    const executionSdk = this.sdk;
+    const internals = executionSdk;
+    if (evidence.agentId !== this.id || evidence.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || evidence.chainId !== state.chainId || !internals.httpClient.authToken || internals.authenticatedUserId === null || this.connectedAddress?.toLowerCase() !== state.walletAddress.toLowerCase() || this.connectedChainId !== evidence.chainId) {
       throw new OwneyError("NOT_CONNECTED", "Reconnect the wallet before recovering deposit registration.");
     }
     if (evidence.transfer !== "confirmed" || !evidence.txHash) {
@@ -2623,16 +2762,16 @@ var ZyfaiAgent = class _ZyfaiAgent {
     }
     const cid = isValidChainId(evidence.chainId);
     const tokenAddress = evidence.token === "WETH" ? WETH_ADDRESS_BY_CHAIN[cid] : void 0;
-    await this.sdk.logDeposit(cid, evidence.txHash, evidence.intendedAmount, tokenAddress);
+    await executionSdk.logDeposit(cid, evidence.txHash, evidence.intendedAmount, tokenAddress);
     return { ...evidence, registration: "confirmed" };
   }
   // --- IAgent: Portfolio reads ---
   async getFundingWallet(state, chainId) {
     return (await this.sdk.getSmartWalletAddress(state.walletAddress, isValidChainId(chainId))).address;
   }
-  /** A positive Safe balance is a withdrawal planning floor when the portfolio
-   * index reports zero. Idle zero cannot prove that Zyfai's protocol positions
-   * are empty: its SDK does not expose a complete contract catalog for them. */
+  /** A positive deployed Safe balance is a conservative planning floor. Zero
+   * requires both the mapped Safe's exact idle balance and a fresh complete
+   * empty portfolio, including for an undeployed counterfactual Safe. */
   async getWithdrawableBalance(state, chainId, token) {
     const validChainId = isValidChainId(chainId);
     const asset = SupportedAssets.find((value) => value.chainId === validChainId && value.symbol === token);
@@ -2661,20 +2800,27 @@ var ZyfaiAgent = class _ZyfaiAgent {
         this.sdk.getSmartWalletByEOA(owner)
       ]);
       assertScope();
-      if (!isAddress(wallet.address) || wallet.isDeployed !== true || wallet.isOwner !== true || !registered.smartWallet || registered.smartWallet.toLowerCase() !== wallet.address.toLowerCase()) throw unavailable();
+      if (!isAddress2(wallet.address) || wallet.isDeployed !== false && (wallet.isDeployed !== true || wallet.isOwner !== true) || !registered.smartWallet || registered.smartWallet.toLowerCase() !== wallet.address.toLowerCase()) throw unavailable();
       const client = this.getPublicClient(validChainId);
       const blockNumber = await client.getBlockNumber({ cacheTime: 0 });
       assertScope();
       const idle = await client.readContract({
         address: asset.address,
-        abi: erc20Abi2,
+        abi: erc20Abi3,
         functionName: "balanceOf",
         args: [wallet.address],
         blockNumber
       });
       assertScope();
-      if (typeof idle !== "bigint" || idle <= 0n) throw unavailable();
-      return idle;
+      if (typeof idle !== "bigint" || idle < 0n) throw unavailable();
+      if (idle > 0n) {
+        if (wallet.isDeployed !== true || wallet.isOwner !== true) throw unavailable();
+        return idle;
+      }
+      const portfolio = await this.sdk.getPortfolio(owner);
+      assertScope();
+      if (!hasEmptyWithdrawalSnapshot(portfolio, validChainId, token)) throw unavailable();
+      return 0n;
     };
     try {
       return await Promise.race([read2(), new Promise((_, reject) => {
@@ -2717,7 +2863,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
     if (blockNumber < BigInt(evidence.blockNumber)) return void 0;
     const idle = await client.readContract({
       address: asset.address,
-      abi: erc20Abi2,
+      abi: erc20Abi3,
       functionName: "balanceOf",
       args: [balance.smartWallet],
       blockNumber
@@ -2924,15 +3070,15 @@ var ZyfaiAgent = class _ZyfaiAgent {
 // src/agents/yieldseeker/yieldseeker.agent.ts
 import {
   createPublicClient as createPublicClient3,
-  createWalletClient as createWalletClient3,
-  custom as custom3,
+  createWalletClient as createWalletClient4,
+  custom as custom4,
   decodeEventLog as decodeEventLog2,
   encodeEventTopics,
-  encodeFunctionData,
-  erc20Abi as erc20Abi4,
+  encodeFunctionData as encodeFunctionData2,
+  erc20Abi as erc20Abi5,
   erc4626Abi as erc4626Abi2,
   getAddress as getAddress5,
-  isAddress as isAddress3,
+  isAddress as isAddress4,
   parseUnits
 } from "viem";
 import { base as base4 } from "viem/chains";
@@ -3175,8 +3321,8 @@ function makeVerificationAwareDepositCallback(implementation) {
 import { SiweMessage, generateNonce } from "siwe";
 import {
   createPublicClient as createPublicClient2,
-  createWalletClient,
-  custom,
+  createWalletClient as createWalletClient2,
+  custom as custom2,
   getAddress
 } from "viem";
 import { base as base2 } from "viem/chains";
@@ -3380,12 +3526,12 @@ var YieldseekerAuth = class {
     const account = getAddress(state.walletAddress);
     const publicClient = createPublicClient2({
       chain: base2,
-      transport: custom(state.provider)
+      transport: custom2(state.provider)
     });
-    const walletClient = createWalletClient({
+    const walletClient = createWalletClient2({
       account,
       chain: base2,
-      transport: custom(state.provider)
+      transport: custom2(state.provider)
     });
     await ensureWalletOnChain(
       publicClient,
@@ -3552,7 +3698,7 @@ var YieldseekerApiClient = class {
 };
 
 // src/agents/yieldseeker/yieldseeker.mapper.ts
-import { formatUnits as formatUnits3, isAddress as isAddress2 } from "viem";
+import { formatUnits as formatUnits3, isAddress as isAddress3 } from "viem";
 
 // src/lib/helpers/snapshot-apy.ts
 var DAY_MS = 864e5;
@@ -3621,6 +3767,14 @@ function raw(value, endpoint) {
 function decimal(value, decimals, endpoint) {
   return formatUnits3(raw(value, endpoint), decimals);
 }
+function balanceRaw(value, endpoint) {
+  const amount = raw(value, endpoint);
+  if (amount < 0n) return invalid(endpoint, "expected a non-negative balance");
+  return amount;
+}
+function balanceDecimal(value, decimals, endpoint) {
+  return formatUnits3(balanceRaw(value, endpoint), decimals);
+}
 function usd(rawAmount, decimals, price) {
   return Number(formatUnits3(rawAmount, decimals)) * price;
 }
@@ -3648,7 +3802,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" || !isAddress2(option.address)) {
+  if (!option || typeof option.provider !== "string" || typeof option.name !== "string" || typeof option.address !== "string" || !isAddress3(option.address)) {
     return invalid("yield positions", "missing vault metadata");
   }
   return {
@@ -3662,13 +3816,13 @@ function position(value, asset, baseAssetDecimals) {
     // underlying base-asset units in `assetsBase`; pair that value with the
     // snapshot's corresponding `baseAssetDecimals` for display. Keep the raw
     // share quantity separate from the withdrawable underlying asset amount.
-    amount: decimal(
+    amount: balanceDecimal(
       value.assetsBase,
       baseAssetDecimals,
       "yield positions"
     ),
-    amountRaw: String(value.assetsRaw),
-    withdrawableAmountRaw: String(value.withdrawableAssetsRaw),
+    amountRaw: balanceRaw(value.assetsRaw, "yield positions").toString(),
+    withdrawableAmountRaw: balanceRaw(value.withdrawableAssetsRaw, "yield positions").toString(),
     apy: percent(option.riskAdjustedApy),
     tvl: Number(option.totalDepositsUsd),
     liquidity: Number(option.withdrawableDepositsUsd)
@@ -3685,7 +3839,7 @@ function mapYieldseekerBalances(contexts) {
       chain: "BASE",
       chainId: 8453,
       asset: context.asset,
-      amount: decimal(context.snapshot.totalValueBase, context.snapshot.baseAssetDecimals, "snapshot")
+      amount: balanceDecimal(context.snapshot.totalValueBase, context.snapshot.baseAssetDecimals, "snapshot")
     });
     const idle = assetAddressValue(
       context.snapshot.tokenBalances,
@@ -3695,7 +3849,7 @@ function mapYieldseekerBalances(contexts) {
       chain: "BASE",
       chainId: 8453,
       asset: context.asset,
-      amount: decimal(idle, metadata.decimals, "snapshot")
+      amount: balanceDecimal(idle, metadata.decimals, "snapshot")
     });
     positions.push(
       ...context.positions.map(
@@ -3707,7 +3861,7 @@ function mapYieldseekerBalances(contexts) {
       )
     );
     totalUsd += usd(
-      raw(context.snapshot.totalValueBase, "snapshot"),
+      balanceRaw(context.snapshot.totalValueBase, "snapshot"),
       context.snapshot.baseAssetDecimals,
       context.snapshot.baseAssetPriceUsd
     );
@@ -3899,7 +4053,7 @@ function allocationEntry(action, context) {
     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;
+    if (typeof leg.vaultAddress !== "string" || !isAddress3(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;
@@ -4131,7 +4285,7 @@ function mapYieldseekerAgentApy(options, days) {
 }
 
 // src/lib/remaining-vault-balance.ts
-import { erc20Abi as erc20Abi3, erc4626Abi, getAddress as getAddress2 } from "viem";
+import { erc20Abi as erc20Abi4, erc4626Abi, getAddress as getAddress2 } from "viem";
 async function remainingVaultBalance(client, wallet, asset, vaults, blockNumber) {
   const addresses = [...new Set(vaults.map((value) => value.toLowerCase()))];
   if (addresses.length > 64) return void 0;
@@ -4143,7 +4297,7 @@ async function remainingVaultBalance(client, wallet, asset, vaults, blockNumber)
       allowFailure: true,
       contracts: batch.map((address) => ({
         address: getAddress2(address),
-        abi: erc20Abi3,
+        abi: erc20Abi4,
         functionName: "balanceOf",
         args: [wallet]
       }))
@@ -4243,8 +4397,8 @@ var YIELDSEEKER_UPGRADE_ABI = walletAbi;
 
 // src/agents/yieldseeker/yieldseeker.sponsored-withdraw.ts
 import {
-  createWalletClient as createWalletClient2,
-  custom as custom2,
+  createWalletClient as createWalletClient3,
+  custom as custom3,
   getAddress as getAddress4,
   toHex
 } from "viem";
@@ -4594,10 +4748,10 @@ async function submitEoa(input) {
   const userOpHash = operationHash(operation);
   await assertOwnerSession(input.state, input.owner);
   assertIntentFresh(input.expiresAt);
-  const wallet = createWalletClient2({
+  const wallet = createWalletClient3({
     account: input.owner,
     chain: base3,
-    transport: custom2(input.state.provider)
+    transport: custom3(input.state.provider)
   });
   const signature = await wallet.signMessage({ message: { raw: userOpHash } });
   operation = { ...operation, signature };
@@ -4899,6 +5053,7 @@ var YieldseekerAgent = class {
   receiptClient;
   // A client preparation hint only; the routing API still checks live identity.
   withdrawalVersionCache = /* @__PURE__ */ new Map();
+  pendingUpgrades = /* @__PURE__ */ new Map();
   transactionExecutor;
   unwindReceiptWaiter;
   agentContexts = /* @__PURE__ */ new Map();
@@ -5014,10 +5169,30 @@ var YieldseekerAgent = class {
     } catch {
       storage5 = void 0;
     }
-    const clearConfirmedUpgrade = () => {
+    const clearRecordedUpgrade = () => {
+      this.pendingUpgrades.delete(pendingKey2);
       try {
         storage5?.removeItem(pendingKey2);
       } catch {
+        this.pendingUpgrades.set(pendingKey2, null);
+      }
+    };
+    const pendingUpgrade = (hash) => new OwneyError(
+      "WITHDRAW_IN_PROGRESS",
+      "Yieldseeker wallet upgrade is awaiting confirmation. Retry to check its status.",
+      { txHash: hash, reason: "UPGRADE_CONFIRMATION_PENDING", phase: "observe", safeToFallback: false },
+      this.id
+    );
+    const terminalUpgradeFailure = (error) => error instanceof OwneyError && (error.code === "AGENT_TRANSACTION_REVERTED" || error.details?.reason === "TRANSACTION_REPLACED_WITH_DIFFERENT_CALL");
+    const readUpgradeReceipt = async (hash) => {
+      try {
+        return await this.waitForReceipt(state, chainId, hash);
+      } catch (error) {
+        if (terminalUpgradeFailure(error)) {
+          clearRecordedUpgrade();
+          throw error;
+        }
+        throw pendingUpgrade(hash);
       }
     };
     if (!storage5 && (gasMode === "sponsored" || before.ownerPath === "smart"))
@@ -5029,7 +5204,7 @@ var YieldseekerAgent = class {
       );
     let prior = null;
     try {
-      const saved = storage5?.getItem(pendingKey2);
+      const saved = this.pendingUpgrades.has(pendingKey2) ? JSON.stringify(this.pendingUpgrades.get(pendingKey2)) : storage5?.getItem(pendingKey2);
       try {
         prior = JSON.parse(saved ?? "null");
       } catch {
@@ -5073,7 +5248,7 @@ var YieldseekerAgent = class {
             this.id
           );
         if (Number(callsStatus?.status) === 400 || Number(callsStatus?.status) === 500) {
-          storage5.removeItem(pendingKey2);
+          clearRecordedUpgrade();
           throw new OwneyError(
             "SPONSOR_REQUEST_FAILED",
             "The earlier sponsored upgrade failed.",
@@ -5085,8 +5260,8 @@ var YieldseekerAgent = class {
         earlierHash = hashes.length === 1 ? hashes[0] : void 0;
       }
       if (earlierHash) {
-        const recovered = await confirmUpgrade(earlierHash, await this.waitForReceipt(state, chainId, earlierHash));
-        clearConfirmedUpgrade();
+        const recovered = await confirmUpgrade(earlierHash, await readUpgradeReceipt(earlierHash));
+        clearRecordedUpgrade();
         return recovered;
       }
       throw new OwneyError(
@@ -5103,7 +5278,7 @@ var YieldseekerAgent = class {
         { version: before.version },
         this.id
       );
-    const data = encodeFunctionData({ abi: YIELDSEEKER_UPGRADE_ABI, functionName: "upgradeToLatest" });
+    const data = encodeFunctionData2({ abi: YIELDSEEKER_UPGRADE_ABI, functionName: "upgradeToLatest" });
     let txHash;
     let receipt;
     if (gasMode === "sponsored") {
@@ -5130,33 +5305,52 @@ var YieldseekerAgent = class {
           asset: YIELDSEEKER_ASSET_METADATA[asset].address,
           callData: data,
           onPending: (pending) => {
-            const current = storage5.getItem(pendingKey2);
-            storage5.setItem(pendingKey2, JSON.stringify({
-              startedAt: Date.now(),
-              ...current ? JSON.parse(current) : {},
-              ...pending
-            }));
+            const current = this.pendingUpgrades.has(pendingKey2) ? this.pendingUpgrades.get(pendingKey2) : JSON.parse(storage5.getItem(pendingKey2) ?? "null");
+            const next = { startedAt: Date.now(), ...current, ...pending };
+            storage5.setItem(pendingKey2, JSON.stringify(next));
+            this.pendingUpgrades.delete(pendingKey2);
           }
         });
         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(pendingKey2);
+        if (error?.code === 4001 || terminalUpgradeFailure(error) || error instanceof OwneyError && error.code === "SPONSOR_REQUEST_FAILED" && (error.details?.safeToFallback === true || error.details?.executionFailed === true)) clearRecordedUpgrade();
         throw error;
       }
     } else {
-      txHash = await this.submitTransaction(state, chainId, {
-        from: getAddress5(state.walletAddress),
-        to: before.agentWallet,
-        data,
-        value: "0",
-        chainId
-      }, void 0, (value) => {
-        receipt = value;
-      });
+      let submittedHash;
+      try {
+        txHash = await this.submitTransaction(state, chainId, {
+          from: getAddress5(state.walletAddress),
+          to: before.agentWallet,
+          data,
+          value: "0",
+          chainId
+        }, (hash) => {
+          submittedHash = hash;
+          const pending = { txHash: hash };
+          this.pendingUpgrades.set(pendingKey2, pending);
+          try {
+            if (storage5) {
+              storage5.setItem(pendingKey2, JSON.stringify(pending));
+              this.pendingUpgrades.delete(pendingKey2);
+            }
+          } catch {
+          }
+        }, (value) => {
+          receipt = value;
+        });
+      } catch (error) {
+        if (terminalUpgradeFailure(error)) {
+          clearRecordedUpgrade();
+          throw error;
+        }
+        if (submittedHash) throw pendingUpgrade(submittedHash);
+        throw error;
+      }
     }
-    const confirmed = await confirmUpgrade(txHash, receipt ?? await this.waitForReceipt(state, chainId, txHash));
-    if (gasMode === "sponsored") clearConfirmedUpgrade();
+    const confirmed = await confirmUpgrade(txHash, receipt ?? await readUpgradeReceipt(txHash));
+    clearRecordedUpgrade();
     return confirmed;
   }
   async disconnect() {
@@ -5235,8 +5429,8 @@ var YieldseekerAgent = class {
         txHash = await this.submitTransaction(state, chainId, {
           from: getAddress5(state.walletAddress),
           to: YIELDSEEKER_ASSET_METADATA[asset].address,
-          data: encodeFunctionData({
-            abi: erc20Abi4,
+          data: encodeFunctionData2({
+            abi: erc20Abi5,
             functionName: "transfer",
             args: [getAddress5(context.wallet.walletAddress), BigInt(amount)]
           }),
@@ -5381,12 +5575,12 @@ var YieldseekerAgent = class {
           blockNumber
         }), chainId, "eth_call", this.id);
         this.assertSession(generation, chainId, asset);
-        if (!isAddress3(feeTracker) || /^0x0{40}$/i.test(feeTracker))
+        if (!isAddress4(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: erc20Abi4,
+            abi: erc20Abi5,
             functionName: "balanceOf",
             args: [agentWallet],
             blockNumber
@@ -5440,7 +5634,7 @@ var YieldseekerAgent = class {
             if (!active || group.length !== 3 || group.some((value) => value.status !== "success")) return null;
             this.assertSession(generation, chainId, asset);
             const [underlying, shares, withdrawable] = group.map((value) => value.result);
-            if (typeof underlying !== "string" || !isAddress3(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n) return null;
+            if (typeof underlying !== "string" || !isAddress4(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;
@@ -5538,6 +5732,18 @@ var YieldseekerAgent = class {
         );
       }
       if (requested > totalAvailable) {
+        if (!funds.complete)
+          throw new OwneyError(
+            "WITHDRAW_BALANCE_UNAVAILABLE",
+            "Yieldseeker withdrawal liquidity could not be verified for the requested amount.",
+            {
+              asset,
+              requested: requested.toString(),
+              verifiedAvailable: totalAvailable.toString(),
+              reason: "YIELDSEEKER_LIQUIDITY_UNVERIFIED"
+            },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           `Requested withdrawal "${requested}" exceeds available Yieldseeker balance "${totalAvailable}" for asset "${asset}".`,
@@ -5552,6 +5758,7 @@ var YieldseekerAgent = class {
       const requiredIdle = requested + initialFunds.fees;
       let remaining = requiredIdle > idle ? requiredIdle - idle : 0n;
       let grossUnwound = 0n;
+      let confirmedUnwinds = 0n;
       let latestUnwindBlock;
       const unwind = async (position2, assetsRaw) => {
         this.assertSession(generation, chainId, asset);
@@ -5569,7 +5776,10 @@ var YieldseekerAgent = class {
           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;
+          if (unwindReceipt) {
+            latestUnwindBlock = unwindReceipt.blockNumber;
+            confirmedUnwinds++;
+          }
         } catch (error) {
           this.invalidateFundingRead(state, chainId, asset);
           throw new OwneyError(
@@ -5639,7 +5849,7 @@ var YieldseekerAgent = class {
       const feeRate = feeRateBps ?? 0;
       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) {
+      if (availableForOwner === 0n || amount !== void 0 && shortfall > maxFee + confirmedUnwinds) {
         this.invalidateFundingRead(state, chainId, asset);
         if (amount === void 0 && positionsStatus !== "empty")
           throw new OwneyError(
@@ -5663,12 +5873,13 @@ var YieldseekerAgent = class {
       } : this.snapshotMovement(state, chainId, context, -payout);
       const account = getAddress5(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" };
-      const data = amount === void 0 ? encodeFunctionData({
+      const base6 = { agentId: this.id, chainId, token: asset, walletAddress: state.walletAddress, agentWallet: context.wallet.walletAddress, intendedAmount: amount ?? "MAX", transfer: "pending", registration: "not-applicable", delivery: "pending" };
+      let submissionEvidence = base6;
+      const data = amount === void 0 ? encodeFunctionData2({
         abi: YIELDSEEKER_AGENT_WALLET_ABI,
         functionName: "withdrawAllAssetToUser",
         args: [account, metadata.address]
-      }) : encodeFunctionData({
+      }) : encodeFunctionData2({
         abi: YIELDSEEKER_AGENT_WALLET_ABI,
         functionName: "withdrawAssetToUser",
         args: [account, metadata.address, payout]
@@ -5687,7 +5898,10 @@ var YieldseekerAgent = class {
           agentWallet: getAddress5(context.wallet.walletAddress),
           asset: metadata.address,
           callData: data,
-          onPending: (pending) => notifyFunding(onProgress, { ...base6, ...pending }),
+          onPending: (pending) => {
+            submissionEvidence = { ...submissionEvidence, ...pending };
+            notifyFunding(onProgress, submissionEvidence);
+          },
           onBeforeSubmission: async (pending) => {
             await onBeforeSubmission?.({ ...base6, ...pending });
             onOwnerTransferAttempted?.();
@@ -5707,10 +5921,20 @@ var YieldseekerAgent = class {
           receipt = value;
         });
       }
-      confirmedMovement = true;
-      settlement = plannedMovement;
-      const evidence = receipt ? inspectFundingReceipt(receipt, { ...base6, txHash }, metadata.address, "withdraw") : { ...base6, txHash, confirmedAmount: payout.toString(), transfer: "confirmed", delivery: "confirmed" };
+      const evidence = receipt ? inspectFundingReceipt(receipt, { ...submissionEvidence, txHash }, metadata.address, "withdraw") : { ...submissionEvidence, txHash, transfer: "pending", delivery: "pending" };
       notifyFunding(onProgress, evidence);
+      const explicitEmptyPayout = evidence.transfer === "failed" && evidence.confirmedAmount === "0" && evidence.transferLogs?.some((log) => log.amountRaw === "0");
+      if (evidence.transfer === "failed" && !explicitEmptyPayout)
+        throw new OwneyError(
+          "AGENT_TRANSACTION_REVERTED",
+          "The Yieldseeker withdrawal completed without transferring funds.",
+          { asset, available: "0", txHash },
+          this.id
+        );
+      if (!explicitEmptyPayout && (evidence.transfer !== "confirmed" || evidence.delivery !== "confirmed" || !evidence.confirmedAmount))
+        return { txHash, type: "partial", completion: "unverified", amount: "0", evidence };
+      confirmedMovement = true;
+      settlement = evidence.confirmedAmount === payout.toString() ? plannedMovement : null;
       let completion = maxLiquidity && !maxLiquidity.complete ? "unverified" : void 0;
       if (amount === void 0) {
         const verificationDeadline = Date.now() + YIELDSEEKER_MAX_POSITION_VERIFICATION_MS;
@@ -5731,7 +5955,7 @@ var YieldseekerAgent = class {
         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 };
+          const result = { txHash, type: "partial", amount: evidence.confirmedAmount ?? "0", evidence };
           throw new OwneyError(
             "WITHDRAW_PARTIAL_FAILURE",
             "Yieldseeker MAX could not confirm that all vault positions were cleared.",
@@ -5751,7 +5975,7 @@ var YieldseekerAgent = class {
         }
         if (!proof.verified) completion = "unverified";
       }
-      if (evidence.transfer === "failed" && evidence.confirmedAmount === "0")
+      if (explicitEmptyPayout)
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "The Yieldseeker withdrawal completed without transferring funds.",
@@ -5766,7 +5990,7 @@ var YieldseekerAgent = class {
         type: amount === void 0 && !completion ? "full" : "partial",
         ...completion ? { completion } : {},
         ...feeAdjustment ? { feeAdjustment } : {},
-        amount: evidence.confirmedAmount ?? payout.toString(),
+        amount: evidence.confirmedAmount ?? "0",
         evidence
       };
     } finally {
@@ -5816,7 +6040,7 @@ var YieldseekerAgent = class {
         const address = getAddress5(option.address);
         return [
           { address, abi: erc4626Abi2, functionName: "asset" },
-          { address, abi: erc20Abi4, functionName: "balanceOf", args: [owner] },
+          { address, abi: erc20Abi5, functionName: "balanceOf", args: [owner] },
           { address, abi: erc4626Abi2, functionName: "maxWithdraw", args: [owner] }
         ];
       })
@@ -5828,7 +6052,7 @@ var YieldseekerAgent = class {
     const seen = /* @__PURE__ */ new Set();
     for (const value of values) {
       const option = value?.yieldOption;
-      if (!option || typeof option.address !== "string" || !isAddress3(option.address) || seen.has(option.address.toLowerCase()) || option.chainId !== void 0 && option.chainId !== chainId || option.assetAddress !== void 0 && (typeof option.assetAddress !== "string" || option.assetAddress.toLowerCase() !== underlying) || typeof value.assetsRaw !== "string" || !/^\d+$/.test(value.assetsRaw) || typeof value.withdrawableAssetsRaw !== "string" || !/^\d+$/.test(value.withdrawableAssetsRaw))
+      if (!option || typeof option.address !== "string" || !isAddress4(option.address) || seen.has(option.address.toLowerCase()) || option.chainId !== void 0 && option.chainId !== chainId || option.assetAddress !== void 0 && (typeof option.assetAddress !== "string" || option.assetAddress.toLowerCase() !== underlying) || typeof value.assetsRaw !== "string" || !/^\d+$/.test(value.assetsRaw) || typeof value.withdrawableAssetsRaw !== "string" || !/^\d+$/.test(value.withdrawableAssetsRaw))
         throw this.invalidResponse("yield positions");
       seen.add(option.address.toLowerCase());
     }
@@ -5841,7 +6065,7 @@ var YieldseekerAgent = class {
     const historic = this.readCache.get(`historic:${key2}`)?.value?.position;
     const receivedAssets = new Set((historic?.movements ?? []).filter((movement) => movement.chainId === chainId && movement.agentWalletId === context.wallet.agentWalletId && movement.toAddress?.toLowerCase() === context.wallet.walletAddress.toLowerCase()).filter((movement) => typeof movement.assetAddress === "string").map((movement) => movement.assetAddress.toLowerCase()));
     for (const option of this.yieldOptions.get(context.asset)?.value ?? []) {
-      if (option.chainId !== chainId || typeof option.assetAddress !== "string" || option.assetAddress.toLowerCase() !== YIELDSEEKER_ASSET_METADATA[context.asset].address.toLowerCase() || !isAddress3(option.address) || !receivedAssets.has(option.address.toLowerCase()) || hints.has(option.address.toLowerCase())) continue;
+      if (option.chainId !== chainId || typeof option.assetAddress !== "string" || option.assetAddress.toLowerCase() !== YIELDSEEKER_ASSET_METADATA[context.asset].address.toLowerCase() || !isAddress4(option.address) || !receivedAssets.has(option.address.toLowerCase()) || hints.has(option.address.toLowerCase())) continue;
       hints.set(option.address.toLowerCase(), {
         yieldOption: option,
         assetsRaw: "0",
@@ -5903,11 +6127,11 @@ var YieldseekerAgent = class {
       for (const position2 of indexedPositions) candidates.set(position2.yieldOption.address.toLowerCase(), position2.yieldOption);
       const options = [...candidates.values()];
       if (options.length > YIELDSEEKER_WITHDRAWAL_CANDIDATE_LIMIT) throw unavailable();
-      const [checks, idle, feeTracker] = await Promise.all([
-        this.readVaultLiquidity(options, wallet, blockNumber),
+      const checksRead = this.readVaultLiquidity(options, wallet, blockNumber).then((value) => ({ value }), (error) => ({ error }));
+      const [idle, feeTracker] = await Promise.all([
         client.readContract({
           address: metadata.address,
-          abi: erc20Abi4,
+          abi: erc20Abi5,
           functionName: "balanceOf",
           args: [wallet],
           blockNumber
@@ -5919,7 +6143,7 @@ var YieldseekerAgent = class {
           blockNumber
         })
       ]);
-      if (typeof idle !== "bigint" || idle < 0n || !isAddress3(feeTracker) || /^0x0{40}$/i.test(feeTracker)) throw unavailable();
+      if (typeof idle !== "bigint" || idle < 0n || !isAddress4(feeTracker) || /^0x0{40}$/i.test(feeTracker)) throw unavailable();
       assertReadCurrent();
       const fees = await client.readContract({
         address: getAddress5(feeTracker),
@@ -5932,6 +6156,18 @@ var YieldseekerAgent = class {
       const verified = [];
       const verifiedVaults = [];
       let deployed = 0n;
+      const proof = (complete) => ({
+        blockNumber,
+        idle,
+        fees,
+        available: idle + deployed > fees ? idle + deployed - fees : 0n,
+        positions: [...verified],
+        verifiedVaults: [...verifiedVaults],
+        indexedPositions,
+        complete
+      });
+      assertReadCurrent();
+      knownProof = proof(false);
       const collect = (options2, results) => {
         assertReadCurrent();
         const known = this.balanceVaults.get(contextKey) ?? /* @__PURE__ */ new Set();
@@ -5947,7 +6183,7 @@ var YieldseekerAgent = class {
             return;
           }
           const [underlying, shares, withdrawable] = group.map((value) => value.result);
-          if (typeof underlying !== "string" || !isAddress3(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n || shares === 0n && withdrawable > 0n) {
+          if (typeof underlying !== "string" || !isAddress4(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n || shares === 0n && withdrawable > 0n) {
             valid2 = false;
             return;
           }
@@ -5964,17 +6200,10 @@ var YieldseekerAgent = class {
         });
         return valid2;
       };
-      const allKnownVerified = collect(options, checks);
-      const proof = (complete) => ({
-        blockNumber,
-        idle,
-        fees,
-        available: idle + deployed > fees ? idle + deployed - fees : 0n,
-        positions: [...verified],
-        verifiedVaults: [...verifiedVaults],
-        indexedPositions,
-        complete
-      });
+      const checks = await checksRead;
+      assertReadCurrent();
+      if ("error" in checks) throw checks.error;
+      const allKnownVerified = collect(options, checks.value);
       knownProof = proof(false);
       const indexed = new Map(indexedPositions.map((position2) => [position2.yieldOption.address.toLowerCase(), position2]));
       const discrepancy = verified.some((position2) => {
@@ -5991,7 +6220,7 @@ var YieldseekerAgent = class {
       assertReadCurrent();
       const eligible = /* @__PURE__ */ new Map();
       for (const option of catalog ?? []) {
-        if (option?.chainId === chainId && typeof option.assetAddress === "string" && option.assetAddress.toLowerCase() === metadata.address.toLowerCase() && isAddress3(option.address))
+        if (option?.chainId === chainId && typeof option.assetAddress === "string" && option.assetAddress.toLowerCase() === metadata.address.toLowerCase() && isAddress4(option.address))
           eligible.set(option.address.toLowerCase(), option);
       }
       const extra = [...eligible].filter(([address]) => !candidates.has(address)).map(([, option]) => option);
@@ -6050,10 +6279,10 @@ var YieldseekerAgent = class {
     const vaults = [...this.balanceVaults.get(key2) ?? []];
     const [invested, idle, tracker] = await Promise.all([
       remainingVaultBalance(client, wallet, asset.address, vaults, blockNumber),
-      client.readContract({ address: asset.address, abi: erc20Abi4, functionName: "balanceOf", args: [wallet], blockNumber }),
+      client.readContract({ address: asset.address, abi: erc20Abi5, functionName: "balanceOf", args: [wallet], blockNumber }),
       client.readContract({ address: wallet, abi: YIELDSEEKER_AGENT_WALLET_ABI, functionName: "feeTracker", blockNumber })
     ]);
-    if (invested === void 0 || typeof idle !== "bigint" || idle < 0n || !isAddress3(tracker) || /^0x0{40}$/i.test(tracker)) return void 0;
+    if (invested === void 0 || typeof idle !== "bigint" || idle < 0n || !isAddress4(tracker) || /^0x0{40}$/i.test(tracker)) return void 0;
     const fees = await client.readContract({
       address: tracker,
       abi: YIELDSEEKER_FEE_TRACKER_ABI,
@@ -6112,7 +6341,7 @@ var YieldseekerAgent = class {
     if (!context) return void 0;
     const idle = await withPaidRpcDiagnostics(() => this.getReceiptClient().readContract({
       address: YIELDSEEKER_ASSET_METADATA[asset].address,
-      abi: erc20Abi4,
+      abi: erc20Abi5,
       functionName: "balanceOf",
       args: [getAddress5(context.wallet.walletAddress)]
     }), chainId, "eth_call", this.id);
@@ -6122,7 +6351,7 @@ var YieldseekerAgent = class {
   }
   async getEarnings(state, chainId) {
     this.assertChain(chainId);
-    return mapYieldseekerEarnings(await this.loadPortfolio(state, chainId, {}));
+    return mapYieldseekerEarnings(await this.loadPortfolio(state, chainId, { includePositions: false }));
   }
   async getAccountApy(state, chainId, days, tokenSymbol) {
     this.assertChain(chainId);
@@ -6161,7 +6390,7 @@ var YieldseekerAgent = class {
     );
     const vaultAddresses = new Set(
       catalog.flat().filter(
-        (yieldOption) => yieldOption.chainId === chainId && isAddress3(yieldOption.address)
+        (yieldOption) => yieldOption.chainId === chainId && isAddress4(yieldOption.address)
       ).map((yieldOption) => yieldOption.address.toLowerCase())
     );
     return mapYieldseekerHistory(contexts, {
@@ -6290,7 +6519,7 @@ var YieldseekerAgent = class {
       `/users/${user.userId}/agents/${agent.agentId}/wallet`
     ).then((walletResponse) => {
       this.assertSession(generation, chainId, asset);
-      if (!walletResponse?.agentWallet || !isAddress3(walletResponse.agentWallet.walletAddress)) {
+      if (!walletResponse?.agentWallet || !isAddress4(walletResponse.agentWallet.walletAddress)) {
         throw this.invalidResponse("agent wallet");
       }
       const context = {
@@ -6704,7 +6933,7 @@ var YieldseekerAgent = class {
       this.agentPath(context, "deploy"),
       { method: "POST", body: {} }
     );
-    if (!deployed?.agentWallet || !isAddress3(deployed.agentWallet.walletAddress) || deployed.agentWallet.walletAddress.toLowerCase() !== walletAddress) {
+    if (!deployed?.agentWallet || !isAddress4(deployed.agentWallet.walletAddress) || deployed.agentWallet.walletAddress.toLowerCase() !== walletAddress) {
       throw this.invalidResponse("agent deployment", {
         reason: "Deploy did not return the expected Agent Wallet."
       });
@@ -6807,20 +7036,20 @@ var YieldseekerAgent = class {
   }
   async submitTransaction(state, chainId, transaction, onSubmitted, onReceipt) {
     if (this.transactionExecutor) {
-      const hash2 = await this.transactionExecutor(state, chainId, transaction);
+      const hash2 = await this.transactionExecutor(state, chainId, transaction, onReceipt);
       onSubmitted?.(hash2);
       return hash2;
     }
     this.assertTransaction(transaction, state, chainId);
     const account = getAddress5(state.walletAddress);
-    const walletClient = createWalletClient3({
+    const walletClient = createWalletClient4({
       account,
       chain: base4,
-      transport: custom3(state.provider)
+      transport: custom4(state.provider)
     });
     const walletChainClient = createPublicClient3({
       chain: base4,
-      transport: custom3(state.provider)
+      transport: custom4(state.provider)
     });
     await ensureWalletOnChain(
       walletChainClient,
@@ -6934,12 +7163,12 @@ var YieldseekerAgent = class {
     return receipt;
   }
   assertTransaction(transaction, state, chainId) {
-    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 || getAddress5(transaction.from) !== getAddress5(state.walletAddress)) {
+    if (!transaction || typeof transaction.from !== "string" || !isAddress4(transaction.from) || typeof transaction.to !== "string" || !isAddress4(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 || getAddress5(transaction.from) !== getAddress5(state.walletAddress)) {
       throw this.invalidResponse("transaction");
     }
   }
   assertAgent(agent) {
-    if (typeof agent.agentId !== "string" || typeof agent.assetAddress !== "string" || !isAddress3(agent.assetAddress) || agent.chainId !== 8453) {
+    if (typeof agent.agentId !== "string" || typeof agent.assetAddress !== "string" || !isAddress4(agent.assetAddress) || agent.chainId !== 8453) {
       throw this.invalidResponse("agent");
     }
   }
@@ -7097,11 +7326,20 @@ import { parseUnits as parseUnits2 } from "viem";
 function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decimals) {
   const target = asset.toUpperCase();
   return agents.map((agent) => {
+    let invalidBalance = false;
+    const readAmount = (value, raw2 = false) => {
+      if (typeof value !== "string" || !(raw2 ? /^\d+$/ : /^\d+(?:\.\d+)?$/).test(value)) {
+        invalidBalance = true;
+        return 0n;
+      }
+      const [whole, fraction] = value.split(".");
+      return raw2 ? BigInt(value) : parseUnits2(fraction === void 0 ? whole : `${whole}.${fraction.slice(0, decimals)}`, decimals);
+    };
     const agentBalance = aggregated[agent.id];
     const tokenBalance = agentBalance?.tokens.find(
       (t) => t.chainId === chainId && t.asset.toUpperCase() === target
     );
-    let balance = tokenBalance ? parseUnits2(tokenBalance.amount, decimals) : 0n;
+    let balance = tokenBalance ? readAmount(tokenBalance.amount) : 0n;
     if (agent.balanceComposition === "tokens-plus-positions") {
       const chainNameById = {
         1: "ETHEREUM",
@@ -7113,20 +7351,22 @@ function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decima
         const positionChain = position2.chain.trim().toUpperCase();
         const matchesChain = positionChain === String(chainId) || targetChain !== void 0 && positionChain === targetChain;
         if (!matchesChain || position2.asset.toUpperCase() !== target) continue;
-        balance += position2.withdrawableAmountRaw !== void 0 ? BigInt(position2.withdrawableAmountRaw) : parseUnits2(position2.amount, decimals);
+        balance += position2.withdrawableAmountRaw !== void 0 ? readAmount(position2.withdrawableAmountRaw, true) : readAmount(position2.amount);
       }
     }
     const assetTotal = agentBalance?.assetBalances?.find(
       (t) => t.chainId === chainId && t.asset.toUpperCase() === target
     );
     if (assetTotal) {
-      const total = parseUnits2(assetTotal.amount, decimals);
+      const total = readAmount(assetTotal.amount);
       if (total < balance) balance = total > 0n ? total : 0n;
     }
-    return { agent, balance };
+    return invalidBalance ? { agent, balance: 0n, invalidBalance: true } : { agent, balance };
   });
 }
 function planProportionalShares(balances, requested, totalAvailable) {
+  if (requested < 0n || totalAvailable < 0n || balances.some((entry) => entry.balance < 0n) || balances.reduce((sum, entry) => sum + entry.balance, 0n) !== totalAvailable || requested > totalAvailable)
+    throw new Error("Invalid withdrawal planning amounts.");
   const plans = balances.map(({ agent, balance }) => ({
     agent,
     balance,
@@ -7149,6 +7389,8 @@ function planProportionalShares(balances, requested, totalAvailable) {
   return plans;
 }
 function planDisabledDrain(disabled, requested) {
+  if (requested < 0n || disabled.some((entry) => entry.balance < 0n))
+    throw new Error("Invalid withdrawal planning amounts.");
   const sorted = [...disabled].filter((d) => d.balance > 0n).sort(
     (a, b) => b.balance > a.balance ? 1 : b.balance < a.balance ? -1 : 0
   );
@@ -7166,6 +7408,7 @@ function planDisabledDrain(disabled, requested) {
   return { plans, remaining };
 }
 function redistributeShare(plans, fromIndex, amount, candidatePool) {
+  if (amount <= 0n) return;
   const pool = candidatePool ?? plans.slice(fromIndex + 1);
   const candidates = pool.filter((c) => c.balance - c.planned > 0n);
   const totalHeadroom = candidates.reduce(
@@ -7192,7 +7435,13 @@ function redistributeShare(plans, fromIndex, amount, candidatePool) {
   }
 }
 function sumWithdrawnAmount(results) {
-  return Object.values(results).reduce((sum, r) => sum + BigInt(r.amount), 0n);
+  return Object.values(results).reduce((sum, result) => sum + (confirmedWithdrawalAmount(result) ?? 0n), 0n);
+}
+function confirmedWithdrawalAmount(result) {
+  const evidence = result.evidence;
+  if (evidence && (evidence.transfer !== "confirmed" || evidence.delivery !== "confirmed")) return void 0;
+  const value = evidence ? evidence.confirmedAmount : result.amount;
+  return typeof value === "string" && /^\d+$/.test(value) ? BigInt(value) : void 0;
 }
 
 // src/lib/helpers/account-apy-helper.ts
@@ -7319,15 +7568,17 @@ function aggregateDailyEarnings(series, tokenSymbol) {
 import {
   parseUnits as parseUnits3,
   createPublicClient as createPublicClient4,
-  createWalletClient as createWalletClient4,
-  custom as custom4
+  createWalletClient as createWalletClient5,
+  custom as custom5
 } from "viem";
 import { base as base5, arbitrum as arbitrum2, mainnet as mainnet2 } from "viem/chains";
 
 // src/lib/sponsored-token-batch.ts
 import {
   isAddressEqual as isAddressEqual2,
+  encodeFunctionData as encodeFunctionData3,
   keccak256,
+  parseTransaction,
   toBytes
 } from "viem";
 
@@ -7415,9 +7666,29 @@ function batchTypedData(b, spender) {
     }
   };
 }
+var BATCH_WITNESS_TYPE = "Deposit witness)Deposit(address[] recipients)TokenPermissions(address token,uint256 amount)";
+function batchWitness(b) {
+  return hashStruct({
+    types: PERMIT_BATCH_TYPES,
+    primaryType: "Deposit",
+    data: { recipients: b.transfers.map((t) => t.to) }
+  });
+}
+function batchArgs(b) {
+  return [
+    batchPermit(b),
+    b.transfers.map((t) => ({ to: t.to, requestedAmount: BigInt(t.amount) })),
+    b.from,
+    batchWitness(b),
+    BATCH_WITNESS_TYPE,
+    b.signature
+  ];
+}
 
 // src/lib/sponsored-token-batch.ts
 var memory = /* @__PURE__ */ new Map();
+var settledRecords = /* @__PURE__ */ new Map();
+var expiredRecords = /* @__PURE__ */ new Map();
 var inflight = /* @__PURE__ */ new Map();
 var planOf = (transfers) => JSON.stringify(
   transfers.map((t) => ({
@@ -7437,20 +7708,97 @@ function pendingTokenBatch(i) {
     return;
   }
 }
+async function releaseExpiredTokenBatch(i) {
+  const key2 = pendingKey(i);
+  let timer;
+  let expired = false;
+  const check = async () => {
+    let active = read(key2);
+    if (active && i.expectedTxHash) {
+      const current = JSON.parse(active);
+      if (!current.serializedTransaction || keccak256(current.serializedTransaction).toLowerCase() !== i.expectedTxHash.toLowerCase())
+        active = void 0;
+    }
+    const archiveKey = i.expectedTxHash ? `${key2}:expired:${i.expectedTxHash.toLowerCase()}` : void 0;
+    const saved = active ?? (archiveKey && (expiredRecords.get(archiveKey) ?? (typeof window === "undefined" ? void 0 : window.localStorage.getItem(archiveKey))));
+    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;
+    const txHash = keccak256(body.serializedTransaction);
+    if (i.expectedTxHash && txHash.toLowerCase() !== i.expectedTxHash.toLowerCase()) return;
+    const transaction = parseTransaction(body.serializedTransaction);
+    if (transaction.chainId !== i.chainId || !transaction.to || !isAddressEqual2(transaction.to, BATCH_PERMIT2_ADDRESS) || (transaction.value ?? 0n) !== 0n || transaction.data !== encodeFunctionData3({
+      abi: PERMIT2_BATCH_ABI,
+      functionName: "permitWitnessTransferFrom",
+      args: batchArgs(body)
+    })) return;
+    const nonce = BigInt(body.nonce);
+    const deadline = BigInt(body.deadline);
+    if (nonce < 0n || nonce > MAX_UINT256 || deadline < 0n) return;
+    const block = await i.pub.getBlock({ blockTag: "finalized" });
+    if (expired || typeof block.number !== "bigint" || typeof block.timestamp !== "bigint" || block.timestamp <= deadline) return;
+    const bitmap = await i.pub.readContract({
+      address: BATCH_PERMIT2_ADDRESS,
+      abi: PERMIT2_BATCH_ABI,
+      functionName: "nonceBitmap",
+      args: [i.owner, nonce >> 8n],
+      blockNumber: block.number
+    });
+    if (expired || typeof bitmap !== "bigint" || bitmap < 0n || bitmap > MAX_UINT256 || (bitmap & 1n << (nonce & 255n)) !== 0n || active && read(key2) !== active) return;
+    if (active) {
+      const terminalKey = `${key2}:expired:${txHash.toLowerCase()}`;
+      expiredRecords.set(terminalKey, saved);
+      let persisted = typeof window === "undefined";
+      try {
+        if (typeof window !== "undefined") {
+          window.localStorage.setItem(terminalKey, saved);
+          persisted = window.localStorage.getItem(terminalKey) === saved;
+        }
+      } catch {
+      }
+      if (!persisted) settledRecords.set(key2, saved);
+      else clear(key2, body);
+    }
+    return { txHash, transfers: body.transfers.map(({ to, amount }) => ({ to, amount })), blockNumber: block.number };
+  };
+  try {
+    return await Promise.race([check(), new Promise((resolve) => {
+      timer = setTimeout(() => {
+        expired = true;
+        resolve(void 0);
+      }, 8e3);
+    })]);
+  } catch {
+    return;
+  } finally {
+    expired = true;
+    if (timer) clearTimeout(timer);
+  }
+}
 function read(key2) {
-  return typeof window === "undefined" ? memory.get(key2) : window.localStorage.getItem(key2);
+  const value = typeof window === "undefined" ? memory.get(key2) : window.localStorage.getItem(key2);
+  return value && settledRecords.get(key2) === value ? void 0 : value;
 }
-function save(key2, body) {
-  const value = JSON.stringify({
+function storedBody(body) {
+  return JSON.stringify({
     ...body,
     transfers: body.transfers.map(({ to, amount }) => ({ to, amount }))
   });
+}
+function save(key2, body) {
+  const value = storedBody(body);
   if (typeof window === "undefined") memory.set(key2, value);
   else window.localStorage.setItem(key2, value);
+  settledRecords.delete(key2);
 }
-function clear(key2) {
-  if (typeof window === "undefined") memory.delete(key2);
-  else window.localStorage.removeItem(key2);
+function clear(key2, body) {
+  try {
+    if (typeof window === "undefined") memory.delete(key2);
+    else window.localStorage.removeItem(key2);
+    settledRecords.delete(key2);
+  } catch {
+    settledRecords.set(key2, storedBody(body));
+  }
 }
 function sponsorTokenBatch(i) {
   const key2 = pendingKey(i);
@@ -7558,7 +7906,7 @@ async function execute(i, key2, plan) {
       if (existing) {
         assertReceipt(existing, "deposit");
         void post().catch(() => void 0);
-        clear(key2);
+        clear(key2, body);
         return hash;
       }
       let result = await postSigned("deposit", hash);
@@ -7573,11 +7921,11 @@ async function execute(i, key2, plan) {
         if (result.status === "pending") await waitForConfirmation("deposit", hash);
       }
       if (!result || result.status === "pending") void post().catch(() => void 0);
-      clear(key2);
+      clear(key2, body);
       return hash;
     } catch (error) {
       if (!body.serializedTransaction && !body.serializedPermitTransaction || rejectedPreparation(error) || error instanceof OwneyError && error.details?.notSubmitted === true)
-        clear(key2);
+        clear(key2, body);
       throw error;
     }
   };
@@ -7590,6 +7938,12 @@ async function execute(i, key2, plan) {
       throw new Error(
         "Retry the previous token deposit and agent split first to reconcile its status."
       );
+    if (await releaseExpiredTokenBatch({ ...i, expectedTxHash: previous.serializedTransaction ? keccak256(previous.serializedTransaction) : void 0 }))
+      throw new OwneyError(
+        "SPONSOR_REQUEST_FAILED",
+        "The deposit authorization expired without transferring funds. Start a new deposit.",
+        { notSubmitted: true, safeToFallback: false }
+      );
     i.onApproved?.();
     return send({ ...previous, transfers: i.transfers });
   }
@@ -7782,7 +8136,7 @@ async function runAgentDepositBatch(chainId, legs, transfer) {
 }
 
 // src/lib/sponsored-calls-deposit.ts
-import { encodeFunctionData as encodeFunctionData2, erc20Abi as erc20Abi5, toHex as toHex2 } from "viem";
+import { encodeFunctionData as encodeFunctionData4, erc20Abi as erc20Abi6, toHex as toHex2 } from "viem";
 var DEFAULT_POLL_INTERVAL_MS = 1500;
 var DEFAULT_MAX_POLLS = 30;
 async function paymasterSupported(provider, owner, chainId) {
@@ -7827,8 +8181,8 @@ function makeSponsoredCallsCallback(deps) {
     const calls = transfers.map((transfer) => ({
       to: token,
       value: "0x0",
-      data: encodeFunctionData2({
-        abi: erc20Abi5,
+      data: encodeFunctionData4({
+        abi: erc20Abi6,
         functionName: "transfer",
         args: [transfer.to, BigInt(transfer.amount)]
       })
@@ -8010,6 +8364,8 @@ var OwneySDK = class {
    */
   disabledAgents = /* @__PURE__ */ new Set();
   state = null;
+  connectionRevision = 0;
+  disconnectingAgents = null;
   apiKey;
   // The org's agent policy, fetched once per client. Applied to each agent on
   // activation (ROUT-229). `undefined` means "not fetched yet", `null` means
@@ -8031,6 +8387,9 @@ var OwneySDK = class {
   recoveredFundingReads = /* @__PURE__ */ new Set();
   fundingBalanceChecks = /* @__PURE__ */ new WeakMap();
   activationChecks = /* @__PURE__ */ new Map();
+  // Protect the SDK entry point as well as the mini-app hook. This owns only
+  // a running call, never a saved/pending provider outcome or a later retry.
+  withdrawalSubmissions = /* @__PURE__ */ new Set();
   readAgent(agent, method, fetch2, params = null) {
     const key2 = JSON.stringify([
       this.state?.walletAddress.toLowerCase() ?? null,
@@ -8063,9 +8422,10 @@ var OwneySDK = class {
    */
   // TODO: replace with a proper EIP-1193 Provider type
   async connect(provider) {
-    const accounts = await provider.request({
-      method: "eth_accounts"
-    });
+    const revision = ++this.connectionRevision;
+    const accounts = await provider.request({ method: "eth_accounts" });
+    if (revision !== this.connectionRevision)
+      throw new OwneyError("NOT_CONNECTED", "Wallet connection changed while connecting.");
     const walletAddress = accounts[0];
     if (!walletAddress) {
       throw new OwneyError(
@@ -8073,33 +8433,46 @@ var OwneySDK = class {
         "No accounts found. Ensure the wallet is unlocked and connected."
       );
     }
-    this.agentReads.clearInFlight();
-    this.activationChecks.clear();
-    this.fundingBalanceChecks = /* @__PURE__ */ new WeakMap();
+    const replacingOwner = this.state !== null && this.state.walletAddress.toLowerCase() !== walletAddress.toLowerCase();
+    this.clearConnectionState();
+    await (replacingOwner ? this.disconnectAgents() : this.disconnectingAgents);
+    if (revision !== this.connectionRevision)
+      throw new OwneyError("NOT_CONNECTED", "Wallet connection changed while connecting.");
     this.state = { provider, walletAddress, chainId: null };
-    this.cachedSponsoredCallback = null;
-    this.cachedWethSponsoredCallback = null;
-    this.cachedSponsoredCallsCallbacks.clear();
   }
   /**
    * Disconnect from all agents and clear connection state.
    * After calling this, `connect()` must be called again before using agent methods.
    */
   async disconnect() {
+    ++this.connectionRevision;
+    this.clearConnectionState();
+    await this.disconnectAgents();
+  }
+  clearConnectionState() {
     this.state = null;
     this.fundingBalanceChecks = /* @__PURE__ */ new WeakMap();
-    for (const agent of this.agents.values()) {
-      await agent.disconnect();
-    }
     this.activeAgents.clear();
-    this.disabledAgents.clear();
     this.agentReads.clearInFlight();
     this.activationChecks.clear();
-    this.state = null;
     this.cachedSponsoredCallback = null;
     this.cachedWethSponsoredCallback = null;
     this.cachedSponsoredCallsCallbacks.clear();
   }
+  disconnectAgents() {
+    if (this.disconnectingAgents) return this.disconnectingAgents;
+    const pending = Promise.allSettled([...this.agents.values()].map(async (agent) => agent.disconnect())).then((results) => {
+      const failure = results.find((result) => result.status === "rejected");
+      if (failure?.status === "rejected") throw failure.reason;
+    });
+    this.disconnectingAgents = pending;
+    void pending.then(() => {
+      if (this.disconnectingAgents === pending) this.disconnectingAgents = null;
+    }, () => {
+      if (this.disconnectingAgents === pending) this.disconnectingAgents = null;
+    });
+    return pending;
+  }
   isAgentDisabled(agentId) {
     return this.disabledAgents.has(agentId);
   }
@@ -8164,12 +8537,12 @@ var OwneySDK = class {
       getPublicClient: (cid) => this.getPaidRpcClient(cid),
       getWalletChainClient: (cid) => createPublicClient4({
         chain: VIEM_CHAIN2[cid],
-        transport: custom4(provider)
+        transport: custom5(provider)
       }),
-      getWalletClient: (cid) => createWalletClient4({
+      getWalletClient: (cid) => createWalletClient5({
         account: owner,
         chain: VIEM_CHAIN2[cid],
-        transport: custom4(provider)
+        transport: custom5(provider)
       })
     });
     if (!onApproved && !onSubmitted && !resumeTxHash) this.cachedSponsoredCallback = callback;
@@ -8219,12 +8592,12 @@ var OwneySDK = class {
       getPublicClient: (cid) => this.getPaidRpcClient(cid),
       getWalletChainClient: (cid) => createPublicClient4({
         chain: VIEM_CHAIN2[cid],
-        transport: custom4(provider)
+        transport: custom5(provider)
       }),
-      getWalletClient: (cid) => createWalletClient4({
+      getWalletClient: (cid) => createWalletClient5({
         account: owner,
         chain: VIEM_CHAIN2[cid],
-        transport: custom4(provider)
+        transport: custom5(provider)
       })
     });
     if (!onApproved && !onSubmitted && !resumeTxHash) this.cachedWethSponsoredCallback = callback;
@@ -8535,6 +8908,12 @@ var OwneySDK = class {
    */
   async deposit(options) {
     const { amount, asset, depositCallback, agentId, onApproved } = options;
+    if (!isFundingAmount(amount, true))
+      throw new OwneyError(
+        "DEPOSIT_INVALID_AMOUNT",
+        "Deposit amount must be an unsigned base-unit integer.",
+        { phase: "prepare", rejectedBeforeSubmission: true }
+      );
     const prepared = /* @__PURE__ */ new Map();
     const paidFallbackAgents = /* @__PURE__ */ new Set();
     const onProgress = options.onProgress ? (evidence) => {
@@ -8562,6 +8941,47 @@ var OwneySDK = class {
       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 (options.resumeTxHash) {
+        const token = SupportedAssets.find((value) => value.chainId === chainId && value.symbol === asset);
+        const pending = token && pendingTokenBatch({
+          apiKey: this.apiKey,
+          baseUrl: this.routingApiBaseUrl,
+          owner: state.walletAddress,
+          chainId,
+          token: token.address
+        });
+        const invalid2 = () => new OwneyError("DEPOSIT_IN_PROGRESS", "The saved deposit does not match this request. Check its status before depositing again.");
+        if (!pending || pending.txHash.toLowerCase() !== options.resumeTxHash.toLowerCase() || pending.transfers.some((transfer) => !/^\d+$/.test(transfer.amount) || BigInt(transfer.amount) <= 0n) || pending.transfers.reduce((sum, transfer) => sum + BigInt(transfer.amount), 0n) !== BigInt(amount)) throw invalid2();
+        const candidates = agentId ? [this.getAgent(agentId)] : this.getEligibleAgents(chainId, asset);
+        const wallets = await Promise.all(candidates.map(async (agent) => {
+          this.validateAssetSupport(agent, chainId, asset);
+          const wallet = await (agent.getFundingWallet ? agent.getFundingWallet(state, chainId, asset) : agent.getUserProfile(state, chainId).then((profile) => profile.smartWallet)).catch(() => void 0);
+          return { agent, wallet };
+        }));
+        if (this.state !== state || this.state.chainId !== chainId)
+          throw new OwneyError("NOT_CONNECTED", "Wallet changed while recovering the deposit.");
+        const usedAgents = /* @__PURE__ */ new Set();
+        const legs = pending.transfers.map((transfer) => {
+          const matches = wallets.filter((value) => value.wallet?.toLowerCase() === transfer.to.toLowerCase());
+          if (matches.length !== 1 || usedAgents.has(matches[0].agent.id)) throw invalid2();
+          const { agent } = matches[0];
+          usedAgents.add(agent.id);
+          return {
+            id: agent.id,
+            amount: transfer.amount,
+            run: (callback) => withFailureReporting(
+              this.apiKey,
+              agent.id,
+              () => agent.deposit(state, chainId, transfer.amount, asset, callback, onProgress),
+              this.routingApiBaseUrl
+            )
+          };
+        });
+        const batchTransfer2 = getDepositBatchTransfer(effectiveCallback);
+        if (!batchTransfer2) throw invalid2();
+        const result = await runAgentDepositBatch(chainId, legs, batchTransfer2);
+        return agentId ? result.agentResults[agentId] : result;
+      }
       if (agentId) {
         if (this.isAgentDisabled(agentId)) {
           throw new OwneyError(
@@ -8978,9 +9398,36 @@ var OwneySDK = class {
     const token = SupportedAssets.find((t) => t.chainId === chainId && t.symbol === evidence.token);
     if (!token) throw new OwneyError("CHAIN_UNSUPPORTED", "Unsupported funding asset.");
     const rpc2 = this.getPaidRpcClient(chainId);
-    const receipt = await rpc2.getTransactionReceipt({ hash: evidence.txHash });
+    let receipt;
+    try {
+      receipt = await rpc2.getTransactionReceipt({ hash: evidence.txHash });
+    } catch (error) {
+      if (direction === "deposit") {
+        const expired = await releaseExpiredTokenBatch({
+          apiKey: this.apiKey,
+          baseUrl: this.routingApiBaseUrl,
+          owner: state.walletAddress,
+          chainId,
+          token: token.address,
+          pub: rpc2,
+          expectedTxHash: evidence.txHash
+        });
+        assertCurrent();
+        if (expired?.transfers.some((transfer) => transfer.to.toLowerCase() === agentWallet.toLowerCase() && transfer.amount === evidence.intendedAmount))
+          return {
+            ...evidence,
+            agentWallet,
+            transfer: "failed",
+            delivery: "not-applicable",
+            registration: "not-applicable",
+            confirmedAmount: "0",
+            blockNumber: expired.blockNumber.toString()
+          };
+      }
+      throw error;
+    }
     assertCurrent();
-    let verified = inspectFundingReceipt(receipt, { ...evidence, agentWallet }, token.address, direction);
+    let verified = inspectFundingReceipt(receipt, { ...evidence, agentWallet }, token.address, direction, options);
     if (direction === "withdraw" && evidence.agentId === "yieldseeker" && verified.transfer === "unknown" && verified.confirmedAmount && BigInt(verified.confirmedAmount) > 0n) {
       const transaction = await rpc2.getTransaction({ hash: evidence.txHash });
       assertCurrent();
@@ -9154,9 +9601,11 @@ var OwneySDK = class {
     return page;
   }
   async recoverDepositRegistration(evidence) {
+    const { state, assertCurrent } = this.captureReadScope(evidence.chainId);
     const verified = await this.inspectFunding(evidence, "deposit");
+    assertCurrent();
     if (verified.agentId !== "zyfai") return verified;
-    return this.getAgent("zyfai").retryDepositRegistration(this.requireState(), verified);
+    return this.getAgent("zyfai").retryDepositRegistration(state, verified);
   }
   // --- Fund operations ---
   /** On-chain version and ownership status for this owner's Yieldseeker agent. */
@@ -9202,10 +9651,24 @@ var OwneySDK = class {
    * @returns {AgentWithdrawResult} for a single agent, or {OwneyWithdrawResult} with per-agent results
    */
   async withdraw(options) {
+    if (options.amount !== void 0 && !isFundingAmount(options.amount))
+      throw new OwneyError(
+        "WITHDRAW_INVALID_AMOUNT",
+        "Withdrawal amount must be a positive base-unit integer.",
+        { phase: "prepare", rejectedBeforeSubmission: true }
+      );
     const state = this.requireState();
     const chainId = this.requireChainId();
+    const submissionKey = `${state.walletAddress.toLowerCase()}:${chainId}:${options.asset.toUpperCase()}`;
+    if (this.withdrawalSubmissions.has(submissionKey))
+      throw new OwneyError(
+        "WITHDRAW_IN_PROGRESS",
+        "A withdrawal request is already running.",
+        { chainId, asset: options.asset, phase: "prepare", rejectedBeforeSubmission: true }
+      );
     const ids = options.agentId ? [options.agentId] : this.getActiveAgentIds().filter((id) => !options.excludeAgentIds?.includes(id));
     const attempted = /* @__PURE__ */ new Set();
+    this.withdrawalSubmissions.add(submissionKey);
     try {
       return await this.withdrawFromAgents(options, state, chainId, attempted);
     } catch (error) {
@@ -9222,6 +9685,8 @@ var OwneySDK = class {
         });
       }
       throw error;
+    } finally {
+      this.withdrawalSubmissions.delete(submissionKey);
     }
   }
   async withdrawFromAgents(options, state, chainId, attempted) {
@@ -9260,7 +9725,19 @@ var OwneySDK = class {
       };
     };
     const submissionEvidence = /* @__PURE__ */ new Map();
+    const pendingSubmissions = () => Object.fromEntries([...submissionEvidence].filter(([id, evidence]) => evidence.agentId === id && evidence.chainId === chainId && evidence.token === token && evidence.walletAddress.toLowerCase() === state.walletAddress.toLowerCase() && evidence.transfer !== "failed" && evidence.delivery !== "failed" && (evidence.transfer === "unknown" || evidence.txHash || evidence.userOpHash || evidence.callsId)));
+    const throwUnconfirmed = (agentErrors2) => {
+      const pending = pendingSubmissions();
+      if (Object.keys(pending).length)
+        throw new OwneyError(
+          "WITHDRAW_UNCONFIRMED",
+          "The withdrawal was submitted, but its outcome could not be confirmed yet.",
+          { asset, amount, agentErrors: agentErrors2, agentFailures, pendingSubmissions: pending }
+        );
+    };
     const submit = async (agent, requested2) => {
+      if (this.state !== state || this.state.chainId !== chainId)
+        throw new OwneyError("NOT_CONNECTED", "Wallet connection changed before withdrawal submission.");
       attempted.add(agent.id);
       let evidence = {
         agentId: agent.id,
@@ -9272,12 +9749,16 @@ var OwneySDK = class {
         registration: "not-applicable",
         delivery: "pending"
       };
+      let adapterReported = false;
       const progress = (next) => {
+        if (next.agentId !== agent.id || next.chainId !== chainId || next.token !== token || next.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase()) return;
+        adapterReported = true;
         evidence = { ...evidence, ...next };
         submissionEvidence.set(agent.id, evidence);
         notifyFunding(options.onProgress, evidence);
       };
       progress(evidence);
+      adapterReported = false;
       try {
         if (options.onBeforeSubmission)
           return await agent.withdraw(
@@ -9291,7 +9772,7 @@ var OwneySDK = class {
           );
         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 && !evidence.userOpHash && !evidence.callsId && (this.isUserRejectedWithdrawal(error) || /insufficient (balance|funds)/i.test(error instanceof Error ? error.message : "")))
+        if (!adapterReported && !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;
       }
@@ -9352,6 +9833,7 @@ var OwneySDK = class {
         }
       }
       if (Object.keys(results2).length === 0) {
+        throwUnconfirmed(agentErrors2);
         if (Object.keys(agentErrors2).length === 0)
           throw new OwneyError(
             "WITHDRAW_INSUFFICIENT_BALANCE",
@@ -9372,7 +9854,7 @@ var OwneySDK = class {
         );
       }
       const amountsKnown = Object.values(results2).every(
-        (result) => typeof result.amount === "string" && /^\d+$/.test(result.amount)
+        (result) => confirmedWithdrawalAmount(result) !== void 0
       );
       return {
         agentResult: results2,
@@ -9391,6 +9873,13 @@ var OwneySDK = class {
       asset,
       assetInfo.decimals
     );
+    for (const entry of balances) if (entry.invalidBalance) {
+      if (!unavailableAgents.includes(entry.agent)) unavailableAgents.push(entry.agent);
+      aggregated.agentErrors = {
+        ...aggregated.agentErrors,
+        [entry.agent.id]: "Provider returned an invalid withdrawal balance."
+      };
+    }
     const indexedAvailable = balances.reduce((sum, entry) => sum + entry.balance, 0n);
     await Promise.all(balances.map(async (entry) => {
       if (entry.balance !== 0n && indexedAvailable >= requested || !entry.agent.getWithdrawableBalance) return;
@@ -9430,12 +9919,15 @@ var OwneySDK = class {
       throw new OwneyError("NOT_CONNECTED", "Account changed while planning withdrawal.");
     const unavailableAgentIds = unavailableAgents.map((agent) => agent.id);
     const totalAvailable = balances.reduce((sum, x) => sum + x.balance, 0n);
-    if (totalAvailable === 0n && unavailableAgents.length > 0) {
+    if (totalAvailable < requested && unavailableAgents.length > 0) {
       throw new OwneyError(
         "WITHDRAW_BALANCE_UNAVAILABLE",
-        `Cannot safely plan the withdrawal because balance data is unavailable for: ${unavailableAgentIds.join(", ")}.`,
+        `Cannot cover the requested withdrawal with verified available balances: ${unavailableAgentIds.join(", ")}.`,
         {
           asset,
+          requested: amount,
+          available: totalAvailable.toString(),
+          rejectedBeforeSubmission: true,
           unavailableAgents: unavailableAgentIds,
           agentErrors: aggregated.agentErrors
         }
@@ -9452,7 +9944,7 @@ var OwneySDK = class {
         }
       );
     }
-    const plannedTarget = totalAvailable < requested ? totalAvailable : requested;
+    const plannedTarget = requested;
     const disabledBalances = balances.filter(
       (b) => this.isAgentDisabled(b.agent.id)
     );
@@ -9471,13 +9963,23 @@ var OwneySDK = class {
     }));
     const plans = [...disabledPlans, ...enabledPlans];
     const orderedPlans = this.orderAgentsForWithdrawal(plans.map((p) => p.agent)).map((agent) => plans.find((plan) => plan.agent === agent));
+    const assertPlan = () => {
+      if (orderedPlans.some((plan) => plan.planned < 0n || plan.planned > plan.balance) || orderedPlans.reduce((sum, plan) => sum + plan.planned, 0n) > plannedTarget)
+        throw new OwneyError(
+          "WITHDRAW_BALANCE_UNAVAILABLE",
+          "Withdrawal plan failed amount validation.",
+          { asset, rejectedBeforeSubmission: true }
+        );
+    };
+    assertPlan();
     const results = {};
     const agentErrors = {
       ...aggregated.agentErrors ?? {}
     };
     for (let i = 0; i < orderedPlans.length; i++) {
       const p = orderedPlans[i];
-      if (p.planned === 0n) continue;
+      assertPlan();
+      if (p.planned <= 0n) continue;
       try {
         results[p.agent.id] = await submit(p.agent, p.planned.toString());
         notifyAgentResult(p.agent.id, results[p.agent.id]);
@@ -9501,6 +10003,7 @@ var OwneySDK = class {
       }
     }
     if (Object.keys(results).length === 0) {
+      throwUnconfirmed(agentErrors);
       throw new OwneyError(
         "WITHDRAW_ALL_FAILED",
         `Failed to withdraw "${amount}" of "${asset}" from all eligible agents.`,
@@ -9518,13 +10021,17 @@ var OwneySDK = class {
       const adjustment = result?.feeAdjustment;
       const evidence = result?.evidence;
       const submitted = submissionEvidence.get(plan.agent.id);
-      if (plan.agent.id !== "yieldseeker" || !adjustment || !evidence || !submitted || typeof result.amount !== "string" || !/^\d+$/.test(result.amount) || typeof adjustment.grossAmount !== "string" || !/^\d+$/.test(adjustment.grossAmount) || typeof adjustment.feeAmount !== "string" || !/^\d+$/.test(adjustment.feeAmount) || evidence.agentId !== plan.agent.id || evidence.chainId !== chainId || evidence.token !== token || typeof evidence.walletAddress !== "string" || evidence.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || typeof evidence.agentWallet !== "string" || !/^0x[\da-f]{40}$/i.test(evidence.agentWallet) || typeof result.txHash !== "string" || !/^0x[\da-f]{64}$/i.test(result.txHash) || typeof evidence.txHash !== "string" || typeof submitted.txHash !== "string" || evidence.txHash?.toLowerCase() !== result.txHash.toLowerCase() || submitted.txHash?.toLowerCase() !== result.txHash.toLowerCase() || submitted.agentId !== evidence.agentId || submitted.chainId !== chainId || submitted.token !== token || typeof submitted.walletAddress !== "string" || typeof submitted.agentWallet !== "string" || submitted.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || submitted.agentWallet?.toLowerCase() !== evidence.agentWallet.toLowerCase() || evidence.transfer !== "confirmed" || evidence.delivery !== "confirmed" || submitted.transfer !== "confirmed" || submitted.delivery !== "confirmed" || evidence.confirmedAmount !== result.amount || submitted.confirmedAmount !== result.amount || evidence.intendedAmount !== result.amount || submitted.intendedAmount !== result.amount) return total;
+      if (plan.agent.id !== "yieldseeker" || !adjustment || !evidence || !submitted || typeof result.amount !== "string" || !/^\d+$/.test(result.amount) || typeof adjustment.grossAmount !== "string" || !/^\d+$/.test(adjustment.grossAmount) || typeof adjustment.feeAmount !== "string" || !/^\d+$/.test(adjustment.feeAmount) || evidence.agentId !== plan.agent.id || evidence.chainId !== chainId || evidence.token !== token || typeof evidence.walletAddress !== "string" || evidence.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || typeof evidence.agentWallet !== "string" || !/^0x[\da-f]{40}$/i.test(evidence.agentWallet) || typeof result.txHash !== "string" || !/^0x[\da-f]{64}$/i.test(result.txHash) || typeof evidence.txHash !== "string" || typeof submitted.txHash !== "string" || evidence.txHash?.toLowerCase() !== result.txHash.toLowerCase() || submitted.txHash?.toLowerCase() !== result.txHash.toLowerCase() || submitted.agentId !== evidence.agentId || submitted.chainId !== chainId || submitted.token !== token || typeof submitted.walletAddress !== "string" || typeof submitted.agentWallet !== "string" || submitted.walletAddress.toLowerCase() !== state.walletAddress.toLowerCase() || submitted.agentWallet?.toLowerCase() !== evidence.agentWallet.toLowerCase() || evidence.transfer !== "confirmed" || evidence.delivery !== "confirmed" || submitted.transfer !== "confirmed" || submitted.delivery !== "confirmed" || evidence.confirmedAmount !== result.amount || submitted.confirmedAmount !== result.amount || ![result.amount, adjustment.grossAmount].includes(evidence.intendedAmount) || ![result.amount, adjustment.grossAmount].includes(submitted.intendedAmount)) return total;
       const fee = BigInt(adjustment.feeAmount);
       const net = BigInt(result.amount);
       const gross = BigInt(adjustment.grossAmount);
       return fee > 0n && net > 0n && gross === plan.planned && net + fee === gross ? total + fee : total;
     }, 0n);
-    if (withdrawn + verifiedFeeDeductions < requested) {
+    const pendingAmount = orderedPlans.reduce((sum, plan) => {
+      const evidence = results[plan.agent.id]?.evidence;
+      return evidence && (evidence.transfer === "pending" || evidence.transfer === "unknown") && evidence.delivery !== "failed" ? sum + plan.planned : sum;
+    }, 0n);
+    if (withdrawn + verifiedFeeDeductions + pendingAmount < requested) {
       throw new OwneyError(
         "WITHDRAW_PARTIAL_FAILURE",
         `Withdrew "${withdrawn.toString()}" of requested "${amount}" of "${asset}". One or more agents failed; remaining balance could not cover the shortfall.`,
@@ -9532,6 +10039,7 @@ var OwneySDK = class {
           asset,
           requested: amount,
           withdrawn: withdrawn.toString(),
+          pendingAmount: pendingAmount.toString(),
           partialResults: results,
           agentErrors,
           agentFailures,
@@ -9539,7 +10047,7 @@ var OwneySDK = class {
         }
       );
     }
-    return { agentResult: results, totalWithdrawn: withdrawn.toString() };
+    return { agentResult: results, totalWithdrawn: Object.values(results).every((result) => confirmedWithdrawalAmount(result) !== void 0) ? withdrawn.toString() : null };
   }
   // --- Portfolio reads ---
   /**
@@ -9999,14 +10507,14 @@ var OwneySDK = class {
     const provider = this.requireConnectedProvider();
     const walletChainClient = createPublicClient4({
       chain: VIEM_CHAIN2[chainId],
-      transport: custom4(provider)
+      transport: custom5(provider)
     });
     const publicClient = this.getPaidRpcClient(chainId);
     const approvalAmount = permit2ApprovalAmount(requiredAmount);
-    const wallet = createWalletClient4({
+    const wallet = createWalletClient5({
       account: state.walletAddress,
       chain: VIEM_CHAIN2[chainId],
-      transport: custom4(provider)
+      transport: custom5(provider)
     });
     await ensureWalletOnChain(walletChainClient, wallet, chainId);
     const hash = await wallet.writeContract({