@owney/sdk 0.7.28-beta.2 → 0.7.28-beta.4

package/dist/index.cjs

@@ -1116,6 +1116,13 @@ function protocolsPolicyNeedsUpdate(current, desiredProtocols, desiredAutoSelect
   if (desiredProtocols === null) return false;
   return !protocolListsEqual(current.protocols, desiredProtocols);
 }
+function mergeScopedPoolNames(current, scoped, allAvailableNames) {
+  const managed = new Set(scoped.flatMap((entry) => entry.availablePools));
+  const existing = current.autoselect ? allAvailableNames : current.pools;
+  const preserved = existing.filter((name) => !managed.has(name));
+  const selected = scoped.flatMap((entry) => entry.pools);
+  return [.../* @__PURE__ */ new Set([...preserved, ...selected])];
+}
 function mapAvailablePools(raw) {
   const byChain = raw ?? {};
   if (typeof byChain !== "object" || byChain === null) return [];
@@ -1712,14 +1719,73 @@ var ZyfaiAgent = class _ZyfaiAgent {
     return assemblePoolCatalog(universe, poolsByProtocol, params.asset);
   }
   /**
-   * Apply a user's own pool selection (the deposit-time Pools step) to their
-   * Zyfai profile. Same two writes as the org path — this is `applyPoolPolicy`
-   * driven by the user's `policy` instead of the organization's, with the
-   * deposit's chosen `strategy` passed through so pool names validate against
-   * the strategy the user just picked rather than their stored one.
+   * Persist an explicitly saved deposit-time draft at Zyfai profile level.
+   * Pool choices are merged into protocol/chain records and each active asset
+   * is kept at aggressive unless the draft includes a yieldmaxxing-only pool.
    */
-  async setPoolSelection(policy, opts = {}) {
-    await this.applyPoolPolicy(policy, opts);
+  async setPoolSelection(selection) {
+    try {
+      const byPair = /* @__PURE__ */ new Map();
+      for (const entry of selection.selections) {
+        const pair = `${entry.protocolId}:${entry.chainId}`;
+        const group = byPair.get(pair) ?? [];
+        group.push(entry);
+        byPair.set(pair, group);
+      }
+      const customizations = (await Promise.all(
+        [...byPair.values()].map(async (scoped) => {
+          const { protocolId, chainId } = scoped[0];
+          try {
+            const [current, rawAvailable] = await Promise.all([
+              this.sdk.getSelectedPools(protocolId, chainId),
+              this.sdk.getAvailablePools(protocolId, "yieldmaxxing")
+            ]);
+            const allAvailableNames = mapAvailablePools(rawAvailable).filter((pool) => pool.chainId === chainId).map((pool) => pool.name);
+            return {
+              protocolId,
+              chainId,
+              pools: mergeScopedPoolNames(
+                {
+                  pools: current.pools ?? [],
+                  autoselect: current.autoselect
+                },
+                scoped,
+                allAvailableNames
+              ),
+              // An explicit Save freezes exactly the choices the user saw.
+              // This also lets an empty list disable the pair deliberately.
+              autoselect: false
+            };
+          } catch (error) {
+            console.warn(
+              `[zyfai] setPoolSelection: preserving ${protocolId}/${chainId} failed; skipping the pair:`,
+              error instanceof Error ? error.message : String(error)
+            );
+            return null;
+          }
+        })
+      )).filter((value) => value !== null);
+      if (customizations.length > 0) {
+        await this.sdk.customizeBatch(customizations);
+      }
+      await Promise.all(
+        selection.strategies.map(async ({ asset, strategy }) => {
+          const current = await this.sdk.getUserDetails(asset);
+          const selectedProtocols = selection.selections.filter(
+            (entry) => entry.asset === asset && entry.pools.length > 0
+          ).map((entry) => entry.protocolId);
+          const protocols = [
+            .../* @__PURE__ */ new Set([...current.protocols ?? [], ...selectedProtocols])
+          ];
+          await this.sdk.updateUserProfile({ asset, strategy, protocols });
+        })
+      );
+    } catch (error) {
+      console.warn(
+        "[zyfai] setPoolSelection failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
   }
   /**
    * True when `smartWallet` is the backend-managed pool wallet Zyfai assigned
@@ -3008,6 +3074,10 @@ var DEFAULT_POLL_MS2 = 5e3;
 var MAX_BACKOFF_MS = 3e4;
 var backoffFor = (failures, base4) => Math.min(base4 * 2 ** Math.min(failures, 5), MAX_BACKOFF_MS);
 var DEFAULT_TIMEOUT_MS2 = 15 * 60 * 1e3;
+var NOT_FOUND_GRACE_MS = 2 * 60 * 1e3;
+function isNotFound(error) {
+  return error instanceof OwneyError && error.details?.statusCode === 404;
+}
 async function runFusionOrder(deps, options) {
   const {
     orderHash,
@@ -3018,6 +3088,7 @@ async function runFusionOrder(deps, options) {
   } = options;
   const deadline = deps.now() + timeoutMs;
   let failures = 0;
+  let notFoundSince;
   const published = /* @__PURE__ */ new Set();
   onStage?.("swapping");
   for (; ; ) {
@@ -3059,7 +3130,20 @@ async function runFusionOrder(deps, options) {
     try {
       ({ status } = await deps.orderStatus(orderHash));
       failures = 0;
-    } catch {
+      notFoundSince = void 0;
+    } catch (error) {
+      if (isNotFound(error)) {
+        notFoundSince ??= deps.now();
+        if (deps.now() - notFoundSince >= NOT_FOUND_GRACE_MS) {
+          throw new OwneyError(
+            "SWAP_ORDER_NOT_FOUND",
+            "The swap provider has no record of this order, so nothing was exchanged.",
+            { orderHash }
+          );
+        }
+      } else {
+        notFoundSince = void 0;
+      }
       failures += 1;
       await deps.sleep(backoffFor(failures, pollIntervalMs));
       continue;
@@ -3117,9 +3201,9 @@ async function runSameChainOrder(deps, options) {
   for (; ; ) {
     if (deps.now() >= deadline) {
       throw new OwneyError(
-        "SWAP_ORDER_EXPIRED",
-        "No one filled the swap in time. Nothing was exchanged and your funds are still in your wallet.",
-        { orderHash }
+        "SWAP_REQUEST_FAILED",
+        "Timed out waiting for the swap to fill. It may still complete \u2014 if it does, the swapped funds will be in your wallet. Check before retrying.",
+        { orderHash, settlementUnconfirmed: true }
       );
     }
     let status;
@@ -3467,10 +3551,16 @@ async function runFusion(deps, options, walletAddress) {
   debugLog("owney-sdk", "swap: awaiting signature in wallet", {
     signingOnChain: quote.src.chainId
   });
-  const signature = await awaitWalletPrompt(
-    () => deps.signTypedData(built.typedData),
-    "sign the swap"
-  );
+  let signature;
+  try {
+    signature = await awaitWalletPrompt(
+      () => deps.signTypedData(built.typedData),
+      "sign the swap"
+    );
+  } catch (error) {
+    clearOrder(built.orderHash);
+    throw error;
+  }
   debugLog("owney-sdk", "swap: signed, submitting to relayer");
   await deps.api.submitOrder({
     srcChainId: quote.src.chainId,
@@ -3498,7 +3588,7 @@ async function runFusion(deps, options, walletAddress) {
       ...onStage ? { onStage } : {}
     });
   } catch (error) {
-    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
       clearOrder(built.orderHash);
     }
     throw error;
@@ -5733,7 +5823,7 @@ var OwneySDK = class {
           status: "completed"
         });
       } catch (error) {
-        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
           clearOrder(order.orderHash);
           updateWithdrawSwap(order.orderHash, { status: "refunded" });
         } else {
@@ -6461,7 +6551,10 @@ var OwneySDK = class {
             agent,
             "dailyEarnings",
             () => agent.getDailyEarnings(state, legChainId, days, tokenSymbol),
-            { days, tokenSymbol }
+            // The leg's chain must be in the key: the read key otherwise names
+            // only the CONNECTION chain, so every leg shared the first leg's
+            // request and the sum counted that chain once per leg. (ROUT-561)
+            { days, tokenSymbol, chainId: legChainId }
           )
         )
       );
@@ -6525,8 +6618,8 @@ var OwneySDK = class {
   }
   /**
    * Apply a user's deposit-time pool selection to their account (ROUT-569).
-   * `strategy` is the one chosen in the deposit flow, passed through so pool
-   * names validate against it rather than the user's stored strategy.
+   * The request carries explicit pool choices plus the resulting strategy for
+   * each asset reviewed in the deposit flow.
    */
   async setPoolSelection(params) {
     await this.ensureAgentsInitialized();
@@ -6537,7 +6630,7 @@ var OwneySDK = class {
         `Agent ${agent.id} does not support pool customization`
       );
     }
-    await agent.setPoolSelection(params.policy, { strategy: params.strategy });
+    await agent.setPoolSelection(params.selection);
   }
   async getAccountApy({
     agentId,
@@ -6661,7 +6754,8 @@ var OwneySDK = class {
             agent,
             "history",
             () => agent.getHistory(state, leg.chainId, legFilters),
-            legFilters
+            // Keyed per leg for the same reason as getDailyEarnings' fan-out.
+            { ...legFilters, chainId: leg.chainId }
           );
           return { leg, page };
         })

package/dist/index.d.cts

@@ -543,6 +543,26 @@ type AvailablePool = {
     /** Per-pool deep link (e.g. the Morpho vault page). null when absent. */
     link: string | null;
 };
+/** Public Zyfai strategies used by deposit-time pool customization. */
+type PoolSelectionStrategy = "aggressive" | "yieldmaxxing";
+/** One asset's explicit choice for a protocol on one chain. */
+type UserPoolSelection = {
+    asset: "USDC" | "WETH";
+    protocolId: string;
+    chainId: number;
+    /** Names enabled by the user for this asset/protocol/chain. */
+    pools: string[];
+    /** Every name shown for this asset/protocol/chain in the superset catalog. */
+    availablePools: string[];
+};
+/** The complete saved draft for the asset/chain legs selected in the deposit. */
+type UserPoolSelectionRequest = {
+    strategies: Array<{
+        asset: "USDC" | "WETH";
+        strategy: PoolSelectionStrategy;
+    }>;
+    selections: UserPoolSelection[];
+};
 /** One protocol with its pools for the deposit asset — what the Pools step
  *  renders: a protocol row that opens to a list of selectable pools. */
 type PoolCatalogProtocol = {
@@ -886,16 +906,14 @@ interface IAgent {
      */
     getPoolCatalog?(params: {
         asset: string;
-        strategy: "conservative" | "aggressive";
+        strategy: "conservative" | "aggressive" | "yieldmaxxing";
     }): Promise<PoolCatalogProtocol[]>;
     /**
      * Apply a user's own pool selection to their account, driven by the
      * deposit-time Pools step. Optional, and non-fatal like `applyOrgPolicy`.
      * (ROUT-569)
      */
-    setPoolSelection?(policy: OrgPoolPolicy, opts?: {
-        strategy?: "conservative" | "aggressive";
-    }): Promise<void>;
+    setPoolSelection?(selection: UserPoolSelectionRequest): Promise<void>;
     deposit(state: ConnectionState, chainId: number, amount: string, asset: OwneySupportedTokens, depositCallback?: DepositCallback): Promise<OwneyDepositResult>;
     withdraw(state: ConnectionState, chainId: number, token: OwneySupportedTokens, amount?: string): Promise<AgentWithdrawResult>;
     getBalances(state: ConnectionState, chainId: number): Promise<AgentBalance>;
@@ -946,7 +964,7 @@ type AgentApyOptions = {
     chainId?: number;
 };
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "SWAP_ORDER_NOT_FOUND" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;
@@ -1728,17 +1746,16 @@ declare class OwneySDK {
      */
     getPoolCatalog(params: {
         asset: OwneySupportedTokens;
-        strategy: "conservative" | "aggressive";
+        strategy: "conservative" | "aggressive" | "yieldmaxxing";
         agentId?: AgentId;
     }): Promise<PoolCatalogProtocol[]>;
     /**
      * Apply a user's deposit-time pool selection to their account (ROUT-569).
-     * `strategy` is the one chosen in the deposit flow, passed through so pool
-     * names validate against it rather than the user's stored strategy.
+     * The request carries explicit pool choices plus the resulting strategy for
+     * each asset reviewed in the deposit flow.
      */
     setPoolSelection(params: {
-        policy: OrgPoolPolicy;
-        strategy?: "conservative" | "aggressive";
+        selection: UserPoolSelectionRequest;
         agentId?: AgentId;
     }): Promise<void>;
     getAccountApy({ agentId, days, tokenSymbol, chainId: scope, }: AccountApyOptions): Promise<OwneyAccountApy | AccountAgentApy>;
@@ -1883,4 +1900,4 @@ type StoredOrder = {
  */
 declare function listOrders(now?: number): StoredOrder[];
 
-export { type AccountAgentApy, type AccountApyOptions, type AccountDailyEarnings, type AgentApy, type AgentApyDetails, type AgentBalance, AgentChainIncompatibleError, type AgentEarnings, type AgentHistoryEntry, type AgentHistoryPosition, type AgentId, AgentNotFoundError, type AgentSupportedAsset, type AgentSupportedAssets, type AgentUserProfile, type AgentWithdrawResult, type AgentsApyOptions, type AllocationAgentApy, type AllocationApyOptions, type ApyByChainAndAsset, type ApyCoverage, type ApyHistoryPoint, type Asset, type AssetDailyEarnings, type AvailableAgent, type AvailableAgentsOptions, type AvailablePool, type ConnectionState, type DailyApyDays, type DailyEarningsOptions, type DailyEarningsPoint, type DepositCallback, type DepositOptions, type HistoryAction, type HistoryFilters, type HistoryOptions, type HistoryTransaction, type IAgent, InvalidHistoryCursorError, type LookbackDays, NotConnectedError, type OrgPoolPolicy, type OrgPoolSelection, type OwneyAccountApy, type OwneyAgentApy, type OwneyAgentHistory, type OwneyAllocationApy, type OwneyBalances, type OwneyDepositResult, type OwneyEarnings, OwneyError, type OwneyErrorCode, type OwneyMultiDepositResult, type OwneyPosition, OwneySDK, type OwneySDKConfig, type OwneySIWXConfig, type OwneySupportedChainId, type OwneySupportedChains, type OwneySupportedTokens, type OwneyToken, type OwneyUserProfile, type OwneyWithdrawAllLeg, type OwneyWithdrawAllResult, type OwneyWithdrawResult, type PendingDeposit, type PoolCatalogProtocol, type RebalanceLog, type SwapChainTokens, type SwapDirection, type SwapOrderStatus, type SwapQuote, type SwapQuoteParams, type SwapRail, type SwapStage, type SwapTokenInfo, type SwapTokenSearchResult, type WithdrawOptions, type WithdrawSwapRecord, type WithdrawSwapStatus, clearWithdrawSwap, createOwneySIWX, listPendingDeposits, listOrders as listPendingSwaps, listWithdrawSwaps, saveWithdrawSwap, setOwneyDebug, subscribeWithdrawSwaps, updateWithdrawSwap };
+export { type AccountAgentApy, type AccountApyOptions, type AccountDailyEarnings, type AgentApy, type AgentApyDetails, type AgentBalance, AgentChainIncompatibleError, type AgentEarnings, type AgentHistoryEntry, type AgentHistoryPosition, type AgentId, AgentNotFoundError, type AgentSupportedAsset, type AgentSupportedAssets, type AgentUserProfile, type AgentWithdrawResult, type AgentsApyOptions, type AllocationAgentApy, type AllocationApyOptions, type ApyByChainAndAsset, type ApyCoverage, type ApyHistoryPoint, type Asset, type AssetDailyEarnings, type AvailableAgent, type AvailableAgentsOptions, type AvailablePool, type ConnectionState, type DailyApyDays, type DailyEarningsOptions, type DailyEarningsPoint, type DepositCallback, type DepositOptions, type HistoryAction, type HistoryFilters, type HistoryOptions, type HistoryTransaction, type IAgent, InvalidHistoryCursorError, type LookbackDays, NotConnectedError, type OrgPoolPolicy, type OrgPoolSelection, type OwneyAccountApy, type OwneyAgentApy, type OwneyAgentHistory, type OwneyAllocationApy, type OwneyBalances, type OwneyDepositResult, type OwneyEarnings, OwneyError, type OwneyErrorCode, type OwneyMultiDepositResult, type OwneyPosition, OwneySDK, type OwneySDKConfig, type OwneySIWXConfig, type OwneySupportedChainId, type OwneySupportedChains, type OwneySupportedTokens, type OwneyToken, type OwneyUserProfile, type OwneyWithdrawAllLeg, type OwneyWithdrawAllResult, type OwneyWithdrawResult, type PendingDeposit, type PoolCatalogProtocol, type PoolSelectionStrategy, type RebalanceLog, type SwapChainTokens, type SwapDirection, type SwapOrderStatus, type SwapQuote, type SwapQuoteParams, type SwapRail, type SwapStage, type SwapTokenInfo, type SwapTokenSearchResult, type UserPoolSelection, type UserPoolSelectionRequest, type WithdrawOptions, type WithdrawSwapRecord, type WithdrawSwapStatus, clearWithdrawSwap, createOwneySIWX, listPendingDeposits, listOrders as listPendingSwaps, listWithdrawSwaps, saveWithdrawSwap, setOwneyDebug, subscribeWithdrawSwaps, updateWithdrawSwap };

package/dist/index.d.ts

@@ -543,6 +543,26 @@ type AvailablePool = {
     /** Per-pool deep link (e.g. the Morpho vault page). null when absent. */
     link: string | null;
 };
+/** Public Zyfai strategies used by deposit-time pool customization. */
+type PoolSelectionStrategy = "aggressive" | "yieldmaxxing";
+/** One asset's explicit choice for a protocol on one chain. */
+type UserPoolSelection = {
+    asset: "USDC" | "WETH";
+    protocolId: string;
+    chainId: number;
+    /** Names enabled by the user for this asset/protocol/chain. */
+    pools: string[];
+    /** Every name shown for this asset/protocol/chain in the superset catalog. */
+    availablePools: string[];
+};
+/** The complete saved draft for the asset/chain legs selected in the deposit. */
+type UserPoolSelectionRequest = {
+    strategies: Array<{
+        asset: "USDC" | "WETH";
+        strategy: PoolSelectionStrategy;
+    }>;
+    selections: UserPoolSelection[];
+};
 /** One protocol with its pools for the deposit asset — what the Pools step
  *  renders: a protocol row that opens to a list of selectable pools. */
 type PoolCatalogProtocol = {
@@ -886,16 +906,14 @@ interface IAgent {
      */
     getPoolCatalog?(params: {
         asset: string;
-        strategy: "conservative" | "aggressive";
+        strategy: "conservative" | "aggressive" | "yieldmaxxing";
     }): Promise<PoolCatalogProtocol[]>;
     /**
      * Apply a user's own pool selection to their account, driven by the
      * deposit-time Pools step. Optional, and non-fatal like `applyOrgPolicy`.
      * (ROUT-569)
      */
-    setPoolSelection?(policy: OrgPoolPolicy, opts?: {
-        strategy?: "conservative" | "aggressive";
-    }): Promise<void>;
+    setPoolSelection?(selection: UserPoolSelectionRequest): Promise<void>;
     deposit(state: ConnectionState, chainId: number, amount: string, asset: OwneySupportedTokens, depositCallback?: DepositCallback): Promise<OwneyDepositResult>;
     withdraw(state: ConnectionState, chainId: number, token: OwneySupportedTokens, amount?: string): Promise<AgentWithdrawResult>;
     getBalances(state: ConnectionState, chainId: number): Promise<AgentBalance>;
@@ -946,7 +964,7 @@ type AgentApyOptions = {
     chainId?: number;
 };
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "SWAP_ORDER_NOT_FOUND" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;
@@ -1728,17 +1746,16 @@ declare class OwneySDK {
      */
     getPoolCatalog(params: {
         asset: OwneySupportedTokens;
-        strategy: "conservative" | "aggressive";
+        strategy: "conservative" | "aggressive" | "yieldmaxxing";
         agentId?: AgentId;
     }): Promise<PoolCatalogProtocol[]>;
     /**
      * Apply a user's deposit-time pool selection to their account (ROUT-569).
-     * `strategy` is the one chosen in the deposit flow, passed through so pool
-     * names validate against it rather than the user's stored strategy.
+     * The request carries explicit pool choices plus the resulting strategy for
+     * each asset reviewed in the deposit flow.
      */
     setPoolSelection(params: {
-        policy: OrgPoolPolicy;
-        strategy?: "conservative" | "aggressive";
+        selection: UserPoolSelectionRequest;
         agentId?: AgentId;
     }): Promise<void>;
     getAccountApy({ agentId, days, tokenSymbol, chainId: scope, }: AccountApyOptions): Promise<OwneyAccountApy | AccountAgentApy>;
@@ -1883,4 +1900,4 @@ type StoredOrder = {
  */
 declare function listOrders(now?: number): StoredOrder[];
 
-export { type AccountAgentApy, type AccountApyOptions, type AccountDailyEarnings, type AgentApy, type AgentApyDetails, type AgentBalance, AgentChainIncompatibleError, type AgentEarnings, type AgentHistoryEntry, type AgentHistoryPosition, type AgentId, AgentNotFoundError, type AgentSupportedAsset, type AgentSupportedAssets, type AgentUserProfile, type AgentWithdrawResult, type AgentsApyOptions, type AllocationAgentApy, type AllocationApyOptions, type ApyByChainAndAsset, type ApyCoverage, type ApyHistoryPoint, type Asset, type AssetDailyEarnings, type AvailableAgent, type AvailableAgentsOptions, type AvailablePool, type ConnectionState, type DailyApyDays, type DailyEarningsOptions, type DailyEarningsPoint, type DepositCallback, type DepositOptions, type HistoryAction, type HistoryFilters, type HistoryOptions, type HistoryTransaction, type IAgent, InvalidHistoryCursorError, type LookbackDays, NotConnectedError, type OrgPoolPolicy, type OrgPoolSelection, type OwneyAccountApy, type OwneyAgentApy, type OwneyAgentHistory, type OwneyAllocationApy, type OwneyBalances, type OwneyDepositResult, type OwneyEarnings, OwneyError, type OwneyErrorCode, type OwneyMultiDepositResult, type OwneyPosition, OwneySDK, type OwneySDKConfig, type OwneySIWXConfig, type OwneySupportedChainId, type OwneySupportedChains, type OwneySupportedTokens, type OwneyToken, type OwneyUserProfile, type OwneyWithdrawAllLeg, type OwneyWithdrawAllResult, type OwneyWithdrawResult, type PendingDeposit, type PoolCatalogProtocol, type RebalanceLog, type SwapChainTokens, type SwapDirection, type SwapOrderStatus, type SwapQuote, type SwapQuoteParams, type SwapRail, type SwapStage, type SwapTokenInfo, type SwapTokenSearchResult, type WithdrawOptions, type WithdrawSwapRecord, type WithdrawSwapStatus, clearWithdrawSwap, createOwneySIWX, listPendingDeposits, listOrders as listPendingSwaps, listWithdrawSwaps, saveWithdrawSwap, setOwneyDebug, subscribeWithdrawSwaps, updateWithdrawSwap };
+export { type AccountAgentApy, type AccountApyOptions, type AccountDailyEarnings, type AgentApy, type AgentApyDetails, type AgentBalance, AgentChainIncompatibleError, type AgentEarnings, type AgentHistoryEntry, type AgentHistoryPosition, type AgentId, AgentNotFoundError, type AgentSupportedAsset, type AgentSupportedAssets, type AgentUserProfile, type AgentWithdrawResult, type AgentsApyOptions, type AllocationAgentApy, type AllocationApyOptions, type ApyByChainAndAsset, type ApyCoverage, type ApyHistoryPoint, type Asset, type AssetDailyEarnings, type AvailableAgent, type AvailableAgentsOptions, type AvailablePool, type ConnectionState, type DailyApyDays, type DailyEarningsOptions, type DailyEarningsPoint, type DepositCallback, type DepositOptions, type HistoryAction, type HistoryFilters, type HistoryOptions, type HistoryTransaction, type IAgent, InvalidHistoryCursorError, type LookbackDays, NotConnectedError, type OrgPoolPolicy, type OrgPoolSelection, type OwneyAccountApy, type OwneyAgentApy, type OwneyAgentHistory, type OwneyAllocationApy, type OwneyBalances, type OwneyDepositResult, type OwneyEarnings, OwneyError, type OwneyErrorCode, type OwneyMultiDepositResult, type OwneyPosition, OwneySDK, type OwneySDKConfig, type OwneySIWXConfig, type OwneySupportedChainId, type OwneySupportedChains, type OwneySupportedTokens, type OwneyToken, type OwneyUserProfile, type OwneyWithdrawAllLeg, type OwneyWithdrawAllResult, type OwneyWithdrawResult, type PendingDeposit, type PoolCatalogProtocol, type PoolSelectionStrategy, type RebalanceLog, type SwapChainTokens, type SwapDirection, type SwapOrderStatus, type SwapQuote, type SwapQuoteParams, type SwapRail, type SwapStage, type SwapTokenInfo, type SwapTokenSearchResult, type UserPoolSelection, type UserPoolSelectionRequest, type WithdrawOptions, type WithdrawSwapRecord, type WithdrawSwapStatus, clearWithdrawSwap, createOwneySIWX, listPendingDeposits, listOrders as listPendingSwaps, listWithdrawSwaps, saveWithdrawSwap, setOwneyDebug, subscribeWithdrawSwaps, updateWithdrawSwap };

package/dist/index.js

@@ -1076,6 +1076,13 @@ function protocolsPolicyNeedsUpdate(current, desiredProtocols, desiredAutoSelect
   if (desiredProtocols === null) return false;
   return !protocolListsEqual(current.protocols, desiredProtocols);
 }
+function mergeScopedPoolNames(current, scoped, allAvailableNames) {
+  const managed = new Set(scoped.flatMap((entry) => entry.availablePools));
+  const existing = current.autoselect ? allAvailableNames : current.pools;
+  const preserved = existing.filter((name) => !managed.has(name));
+  const selected = scoped.flatMap((entry) => entry.pools);
+  return [.../* @__PURE__ */ new Set([...preserved, ...selected])];
+}
 function mapAvailablePools(raw) {
   const byChain = raw ?? {};
   if (typeof byChain !== "object" || byChain === null) return [];
@@ -1672,14 +1679,73 @@ var ZyfaiAgent = class _ZyfaiAgent {
     return assemblePoolCatalog(universe, poolsByProtocol, params.asset);
   }
   /**
-   * Apply a user's own pool selection (the deposit-time Pools step) to their
-   * Zyfai profile. Same two writes as the org path — this is `applyPoolPolicy`
-   * driven by the user's `policy` instead of the organization's, with the
-   * deposit's chosen `strategy` passed through so pool names validate against
-   * the strategy the user just picked rather than their stored one.
+   * Persist an explicitly saved deposit-time draft at Zyfai profile level.
+   * Pool choices are merged into protocol/chain records and each active asset
+   * is kept at aggressive unless the draft includes a yieldmaxxing-only pool.
    */
-  async setPoolSelection(policy, opts = {}) {
-    await this.applyPoolPolicy(policy, opts);
+  async setPoolSelection(selection) {
+    try {
+      const byPair = /* @__PURE__ */ new Map();
+      for (const entry of selection.selections) {
+        const pair = `${entry.protocolId}:${entry.chainId}`;
+        const group = byPair.get(pair) ?? [];
+        group.push(entry);
+        byPair.set(pair, group);
+      }
+      const customizations = (await Promise.all(
+        [...byPair.values()].map(async (scoped) => {
+          const { protocolId, chainId } = scoped[0];
+          try {
+            const [current, rawAvailable] = await Promise.all([
+              this.sdk.getSelectedPools(protocolId, chainId),
+              this.sdk.getAvailablePools(protocolId, "yieldmaxxing")
+            ]);
+            const allAvailableNames = mapAvailablePools(rawAvailable).filter((pool) => pool.chainId === chainId).map((pool) => pool.name);
+            return {
+              protocolId,
+              chainId,
+              pools: mergeScopedPoolNames(
+                {
+                  pools: current.pools ?? [],
+                  autoselect: current.autoselect
+                },
+                scoped,
+                allAvailableNames
+              ),
+              // An explicit Save freezes exactly the choices the user saw.
+              // This also lets an empty list disable the pair deliberately.
+              autoselect: false
+            };
+          } catch (error) {
+            console.warn(
+              `[zyfai] setPoolSelection: preserving ${protocolId}/${chainId} failed; skipping the pair:`,
+              error instanceof Error ? error.message : String(error)
+            );
+            return null;
+          }
+        })
+      )).filter((value) => value !== null);
+      if (customizations.length > 0) {
+        await this.sdk.customizeBatch(customizations);
+      }
+      await Promise.all(
+        selection.strategies.map(async ({ asset, strategy }) => {
+          const current = await this.sdk.getUserDetails(asset);
+          const selectedProtocols = selection.selections.filter(
+            (entry) => entry.asset === asset && entry.pools.length > 0
+          ).map((entry) => entry.protocolId);
+          const protocols = [
+            .../* @__PURE__ */ new Set([...current.protocols ?? [], ...selectedProtocols])
+          ];
+          await this.sdk.updateUserProfile({ asset, strategy, protocols });
+        })
+      );
+    } catch (error) {
+      console.warn(
+        "[zyfai] setPoolSelection failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
   }
   /**
    * True when `smartWallet` is the backend-managed pool wallet Zyfai assigned
@@ -2978,6 +3044,10 @@ var DEFAULT_POLL_MS2 = 5e3;
 var MAX_BACKOFF_MS = 3e4;
 var backoffFor = (failures, base4) => Math.min(base4 * 2 ** Math.min(failures, 5), MAX_BACKOFF_MS);
 var DEFAULT_TIMEOUT_MS2 = 15 * 60 * 1e3;
+var NOT_FOUND_GRACE_MS = 2 * 60 * 1e3;
+function isNotFound(error) {
+  return error instanceof OwneyError && error.details?.statusCode === 404;
+}
 async function runFusionOrder(deps, options) {
   const {
     orderHash,
@@ -2988,6 +3058,7 @@ async function runFusionOrder(deps, options) {
   } = options;
   const deadline = deps.now() + timeoutMs;
   let failures = 0;
+  let notFoundSince;
   const published = /* @__PURE__ */ new Set();
   onStage?.("swapping");
   for (; ; ) {
@@ -3029,7 +3100,20 @@ async function runFusionOrder(deps, options) {
     try {
       ({ status } = await deps.orderStatus(orderHash));
       failures = 0;
-    } catch {
+      notFoundSince = void 0;
+    } catch (error) {
+      if (isNotFound(error)) {
+        notFoundSince ??= deps.now();
+        if (deps.now() - notFoundSince >= NOT_FOUND_GRACE_MS) {
+          throw new OwneyError(
+            "SWAP_ORDER_NOT_FOUND",
+            "The swap provider has no record of this order, so nothing was exchanged.",
+            { orderHash }
+          );
+        }
+      } else {
+        notFoundSince = void 0;
+      }
       failures += 1;
       await deps.sleep(backoffFor(failures, pollIntervalMs));
       continue;
@@ -3087,9 +3171,9 @@ async function runSameChainOrder(deps, options) {
   for (; ; ) {
     if (deps.now() >= deadline) {
       throw new OwneyError(
-        "SWAP_ORDER_EXPIRED",
-        "No one filled the swap in time. Nothing was exchanged and your funds are still in your wallet.",
-        { orderHash }
+        "SWAP_REQUEST_FAILED",
+        "Timed out waiting for the swap to fill. It may still complete \u2014 if it does, the swapped funds will be in your wallet. Check before retrying.",
+        { orderHash, settlementUnconfirmed: true }
       );
     }
     let status;
@@ -3437,10 +3521,16 @@ async function runFusion(deps, options, walletAddress) {
   debugLog("owney-sdk", "swap: awaiting signature in wallet", {
     signingOnChain: quote.src.chainId
   });
-  const signature = await awaitWalletPrompt(
-    () => deps.signTypedData(built.typedData),
-    "sign the swap"
-  );
+  let signature;
+  try {
+    signature = await awaitWalletPrompt(
+      () => deps.signTypedData(built.typedData),
+      "sign the swap"
+    );
+  } catch (error) {
+    clearOrder(built.orderHash);
+    throw error;
+  }
   debugLog("owney-sdk", "swap: signed, submitting to relayer");
   await deps.api.submitOrder({
     srcChainId: quote.src.chainId,
@@ -3468,7 +3558,7 @@ async function runFusion(deps, options, walletAddress) {
       ...onStage ? { onStage } : {}
     });
   } catch (error) {
-    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
       clearOrder(built.orderHash);
     }
     throw error;
@@ -5714,7 +5804,7 @@ var OwneySDK = class {
           status: "completed"
         });
       } catch (error) {
-        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
           clearOrder(order.orderHash);
           updateWithdrawSwap(order.orderHash, { status: "refunded" });
         } else {
@@ -6442,7 +6532,10 @@ var OwneySDK = class {
             agent,
             "dailyEarnings",
             () => agent.getDailyEarnings(state, legChainId, days, tokenSymbol),
-            { days, tokenSymbol }
+            // The leg's chain must be in the key: the read key otherwise names
+            // only the CONNECTION chain, so every leg shared the first leg's
+            // request and the sum counted that chain once per leg. (ROUT-561)
+            { days, tokenSymbol, chainId: legChainId }
           )
         )
       );
@@ -6506,8 +6599,8 @@ var OwneySDK = class {
   }
   /**
    * Apply a user's deposit-time pool selection to their account (ROUT-569).
-   * `strategy` is the one chosen in the deposit flow, passed through so pool
-   * names validate against it rather than the user's stored strategy.
+   * The request carries explicit pool choices plus the resulting strategy for
+   * each asset reviewed in the deposit flow.
    */
   async setPoolSelection(params) {
     await this.ensureAgentsInitialized();
@@ -6518,7 +6611,7 @@ var OwneySDK = class {
         `Agent ${agent.id} does not support pool customization`
       );
     }
-    await agent.setPoolSelection(params.policy, { strategy: params.strategy });
+    await agent.setPoolSelection(params.selection);
   }
   async getAccountApy({
     agentId,
@@ -6642,7 +6735,8 @@ var OwneySDK = class {
             agent,
             "history",
             () => agent.getHistory(state, leg.chainId, legFilters),
-            legFilters
+            // Keyed per leg for the same reason as getDailyEarnings' fan-out.
+            { ...legFilters, chainId: leg.chainId }
           );
           return { leg, page };
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.28-beta.2",
+  "version": "0.7.28-beta.4",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -23,7 +23,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@zyfai/sdk": "0.2.55",
+    "@zyfai/sdk": "0.2.57",
     "siwe": "^3.0.0",
     "viem": "^2.48.1"
   },