@owney/sdk 0.2.9 → 0.2.10

package/README.md

@@ -167,6 +167,14 @@ console.log(results.agentResults.sail.amount); // "50000000"
 
 Withdraw funds from a specific agent, or all agents that support the active chain+asset if `agentId` is omitted. Validates that the asset is supported.
 
+When `agentId` is omitted with a partial `amount`, the SDK splits the requested amount proportionally across eligible agents based on each agent's per-asset balance. If an agent's withdraw fails, its share is redistributed to remaining not-yet-attempted agents (capped by their headroom). Throws:
+
+- `WITHDRAW_INSUFFICIENT_BALANCE` — total available across agents is less than `amount`.
+- `WITHDRAW_ALL_FAILED` — every agent's withdraw call failed.
+- `WITHDRAW_PARTIAL_FAILURE` — some agents succeeded but total withdrawn is less than `amount`. Successful txs are surfaced via `error.details.partialResults`; per-agent failure messages via `error.details.agentErrors`.
+
+`WITHDRAW_ALL_FAILED` also carries per-agent failure messages via `error.details.agentErrors` (a `Record<agentId, string>`). Any error originating from a specific agent also has `error.agentId` set and a `[agent:<id>]` prefix on `error.message`.
+
 | Param             | Type                 | Description                                   |
 | ----------------- | -------------------- | --------------------------------------------- |
 | `options.asset`   | `string`             | Asset symbol (e.g. `"USDC"`)                  |
@@ -185,6 +193,12 @@ const result = await sdk.withdraw({
 console.log(result.type); // "partial"
 console.log(result.amount); // "50000000"
 
+// Partial withdrawal split proportionally across all agents
+// e.g. zyfai=$5, sail=$2, amount=$4 → zyfai withdraws $3, sail withdraws $1
+const split = await sdk.withdraw({ asset: "USDC", amount: "4000000" });
+console.log(split.agentResult.zyfai.amount); // "3000000"
+console.log(split.agentResult.sail.amount); // "1000000"
+
 // Full withdrawal from all agents
 const results = await sdk.withdraw({ asset: "USDC" });
 console.log(results.agentResult.zyfai.type); // "full"
@@ -630,7 +644,7 @@ type DepositCallback = (
 
 ### Error Handling
 
-All errors thrown by the SDK are instances of `OwneyError` (which extends `Error`), each carrying a stable `code` string and optional `details` object for programmatic handling.
+All errors thrown by the SDK are instances of `OwneyError` (which extends `Error`), each carrying a stable `code` string, optional `details` object, and optional `agentId` identifying the originating agent. When `agentId` is set, `error.message` is also prefixed with `[agent:<id>]` for logs.
 
 ```typescript
 import { OwneyError } from "@owney/sdk";
@@ -680,6 +694,9 @@ type OwneyErrorCode =
   | "DEPOSIT_NO_PERMITTED_TOKENS" // No permitted tokens available for deposit
   // Withdraw
   | "WITHDRAW_NO_PERMITTED_TOKENS" // No permitted tokens available for withdrawal
+  | "WITHDRAW_INSUFFICIENT_BALANCE" // Requested amount exceeds total available across agents
+  | "WITHDRAW_ALL_FAILED" // Every eligible agent's withdraw call failed
+  | "WITHDRAW_PARTIAL_FAILURE" // Some agents succeeded; total withdrawn < requested
   // API
   | "API_ROUTING_ERROR" // Routing API returned a non-OK HTTP status
   | "API_ROUTING_FAILED" // Routing API returned { success: false }
@@ -695,6 +712,7 @@ type OwneyErrorCode =
 class OwneyError extends Error {
   readonly code: OwneyErrorCode;
   readonly details?: Record<string, unknown>;
+  readonly agentId?: string;
 }
 ```
 

package/dist/index.cjs

@@ -42,17 +42,20 @@ var SupportedAssets = [
   {
     address: `0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913`,
     symbol: "USDC",
-    chainId: 8453
+    chainId: 8453,
+    decimals: 6
   },
   {
     address: `0xaf88d065e77c8cC2239327C5EDb3A432268e5831`,
     symbol: "USDC",
-    chainId: 42161
+    chainId: 42161,
+    decimals: 6
   },
   {
     address: `0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9`,
     symbol: "USDT",
-    chainId: 42161
+    chainId: 42161,
+    decimals: 6
   }
 ];
 
@@ -60,11 +63,13 @@ var SupportedAssets = [
 var OwneyError = class extends Error {
   code;
   details;
-  constructor(code, message, details) {
-    super(message);
+  agentId;
+  constructor(code, message, details, agentId) {
+    super(agentId ? `[agent:${agentId}] ${message}` : message);
     this.name = "OwneyError";
     this.code = code;
     this.details = details;
+    this.agentId = agentId;
   }
 };
 var AgentNotFoundError = class extends OwneyError {
@@ -72,7 +77,8 @@ var AgentNotFoundError = class extends OwneyError {
     super(
       "AGENT_NOT_FOUND",
       `Unknown agent "${agentId}". Available agents: ${available.join(", ")}`,
-      { agentId, available }
+      { agentId, available },
+      agentId
     );
     this.name = "AgentNotFoundError";
   }
@@ -339,7 +345,9 @@ var ZyfaiAgent = class {
     if (!this.connectedAddress) {
       throw new OwneyError(
         "NOT_CONNECTED",
-        "Wallet not connected. Call sdk.connect() first."
+        "Wallet not connected. Call sdk.connect() first.",
+        void 0,
+        this.id
       );
     }
     return this.connectedAddress;
@@ -445,13 +453,14 @@ var ZyfaiAgent = class {
     }
   }
   // --- IAgent: Fund operations ---
-  async withdraw(state, chainId, amount) {
+  async withdraw(state, chainId, token, amount) {
     await this.connectFull(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.withdrawFunds(
       this.getAddress(),
       validChainId,
-      amount
+      amount,
+      token
     );
     return mapWithdraw(raw);
   }
@@ -709,6 +718,7 @@ function remapApyPerAssetToSymbols(raw) {
 }
 
 // src/agents/sail/sail.agent.ts
+var import_viem = require("viem");
 var SAIL_API_BASE = "https://app.sail.money";
 var PROJECT_ID = "sail";
 var PAGE_ID = "home";
@@ -766,7 +776,8 @@ var SailAgent = class {
         throw new OwneyError(
           "API_SAIL_TIMEOUT",
           `Sail API timeout ${timeoutMs}ms: ${method} ${path}`,
-          { timeoutMs, method, path }
+          { timeoutMs, method, path },
+          this.id
         );
       }
       throw error;
@@ -779,7 +790,8 @@ var SailAgent = class {
       throw new OwneyError(
         "API_SAIL_ERROR",
         `Sail API error ${res.status}: ${text}`,
-        { statusCode: res.status, method, path, responseBody: text }
+        { statusCode: res.status, method, path, responseBody: text },
+        this.id
       );
     }
     return res.json();
@@ -818,7 +830,9 @@ var SailAgent = class {
     if (!state.walletAddress) {
       throw new OwneyError(
         "WALLET_ADDRESS_REQUIRED",
-        "Wallet address is required. Call sdk.connect(provider) first."
+        "Wallet address is required. Call sdk.connect(provider) first.",
+        void 0,
+        this.id
       );
     }
     this.connectPromise = (async () => {
@@ -855,7 +869,9 @@ var SailAgent = class {
     if (!this.smartWalletAddress) {
       throw new OwneyError(
         "NOT_CONNECTED",
-        "Wallet not connected. Call sdk.connect() first."
+        "Wallet not connected. Call sdk.connect() first.",
+        void 0,
+        this.id
       );
     }
     return {
@@ -884,7 +900,9 @@ var SailAgent = class {
     if (!depositCallback) {
       throw new OwneyError(
         "DEPOSIT_CALLBACK_REQUIRED",
-        "depositCallback is required for Sail. Provide a callback that transfers tokens and returns the transaction hash."
+        "depositCallback is required for Sail. Provide a callback that transfers tokens and returns the transaction hash.",
+        void 0,
+        this.id
       );
     }
     try {
@@ -894,7 +912,9 @@ var SailAgent = class {
       if (!resolvedTokenAddress) {
         throw new OwneyError(
           "DEPOSIT_NO_PERMITTED_TOKENS",
-          "No permitted tokens available for deposit."
+          "No permitted tokens available for deposit.",
+          void 0,
+          this.id
         );
       }
       await this.executePreHooks(resolvedTokenAddress, amount, chainId);
@@ -902,7 +922,9 @@ var SailAgent = class {
       if (!txHash) {
         throw new OwneyError(
           "DEPOSIT_CALLBACK_INVALID",
-          "depositCallback must return a transaction hash (txHash) for Sail deposits."
+          "depositCallback must return a transaction hash (txHash) for Sail deposits.",
+          void 0,
+          this.id
         );
       }
       const postResult = await this.executePostHooks(
@@ -950,14 +972,29 @@ var SailAgent = class {
     );
   }
   // --- IAgent: Fund operations ---
-  async withdraw(state, chainId, amount) {
+  async withdraw(state, chainId, token, amount) {
     await this.connectFull(state, chainId);
     const withdrawInfo = await this.getWithdrawInfo();
-    const tokenAddress = withdrawInfo.permittedTokens[0]?.address;
+    const selectedTokenAddress = SupportedAssets.find(
+      (a) => a.symbol === token && a.chainId === chainId
+    );
+    if (!selectedTokenAddress) {
+      throw new OwneyError(
+        "WITHDRAW_NO_PERMITTED_TOKENS",
+        "Unsupported asset.",
+        void 0,
+        this.id
+      );
+    }
+    const tokenAddress = withdrawInfo.permittedTokens.find(
+      (t) => t.address === selectedTokenAddress.address
+    )?.address;
     if (!tokenAddress) {
       throw new OwneyError(
         "WITHDRAW_NO_PERMITTED_TOKENS",
-        "No permitted tokens available for withdrawal."
+        "No permitted tokens available for withdrawal.",
+        void 0,
+        this.id
       );
     }
     const resolvedAmount = amount ?? withdrawInfo.currentBalance;
@@ -977,7 +1014,10 @@ var SailAgent = class {
     return mapWithdraw2({
       txHash: raw.transactionHash,
       type: amount ? "partial" : "full",
-      amount: resolvedAmount
+      amount: (0, import_viem.parseUnits)(
+        resolvedAmount,
+        selectedTokenAddress.decimals
+      ).toString()
     });
   }
   // --- IAgent: Portfolio reads ---
@@ -1081,7 +1121,8 @@ var SailAgent = class {
       throw new OwneyError(
         "VALIDATION_INVALID_DAYS",
         `Invalid days value: "${days}". Expected one of: "7D", "14D", "30D".`,
-        { days }
+        { days },
+        this.id
       );
     }
     const now = /* @__PURE__ */ new Date();
@@ -1188,7 +1229,65 @@ async function fetchAgentKeys(apiKey) {
   return json.data;
 }
 
+// src/lib/helpers/withdraw-helper.ts
+function planProportionalShares(balances, requested, totalAvailable) {
+  const plans = balances.map(({ agent, balance }) => ({
+    agent,
+    balance,
+    planned: totalAvailable > 0n ? balance * requested / totalAvailable : 0n
+  }));
+  const assigned = plans.reduce((s, p) => s + p.planned, 0n);
+  let remainder = requested - assigned;
+  const byHeadroom = [...plans].sort((a, b) => {
+    const diff = b.balance - b.planned - (a.balance - a.planned);
+    return diff > 0n ? 1 : diff < 0n ? -1 : 0;
+  });
+  for (const p of byHeadroom) {
+    if (remainder === 0n)
+      break;
+    const headroom = p.balance - p.planned;
+    if (headroom <= 0n)
+      continue;
+    const take = headroom < remainder ? headroom : remainder;
+    p.planned += take;
+    remainder -= take;
+  }
+  return plans;
+}
+function redistributeShare(plans, fromIndex, amount) {
+  const candidates = plans.slice(fromIndex + 1).filter((c) => c.balance - c.planned > 0n);
+  const totalHeadroom = candidates.reduce(
+    (s, c) => s + (c.balance - c.planned),
+    0n
+  );
+  if (totalHeadroom === 0n)
+    return;
+  let distributed = 0n;
+  for (const c of candidates) {
+    const headroom = c.balance - c.planned;
+    const proportional = headroom * amount / totalHeadroom;
+    const give = proportional > headroom ? headroom : proportional;
+    c.planned += give;
+    distributed += give;
+  }
+  let leftover = amount - distributed;
+  for (const c of candidates) {
+    if (leftover === 0n)
+      break;
+    const headroom = c.balance - c.planned;
+    if (headroom <= 0n)
+      continue;
+    const take = headroom < leftover ? headroom : leftover;
+    c.planned += take;
+    leftover -= take;
+  }
+}
+function sumWithdrawnAmount(results) {
+  return Object.values(results).reduce((sum, r) => sum + BigInt(r.amount), 0n);
+}
+
 // src/client.ts
+var import_viem2 = require("viem");
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
   activeAgents = /* @__PURE__ */ new Set();
@@ -1464,7 +1563,8 @@ var OwneySDK = class {
       throw new OwneyError(
         "ASSET_UNSUPPORTED",
         `Agent "${agent.id}" does not support asset "${asset}" on chain ${chainId}.`,
-        { agentId: agent.id, asset, chainId }
+        { agentId: agent.id, asset, chainId },
+        agent.id
       );
     }
   }
@@ -1498,34 +1598,99 @@ var OwneySDK = class {
     const { asset, amount, agentId } = options;
     const state = this.requireState();
     const chainId = this.requireChainId();
+    const token = asset;
+    const assetInfo = SupportedAssets.find(
+      (a) => a.chainId === chainId && a.symbol === token
+    );
+    if (!assetInfo) {
+      throw new OwneyError(
+        "WITHDRAW_NO_PERMITTED_TOKENS",
+        "Asset selected is not supported"
+      );
+    }
     if (agentId) {
       const agent = this.getAgent(agentId);
       this.validateAssetSupport(agent, chainId, asset);
-      return agent.withdraw(state, chainId, amount);
+      return agent.withdraw(state, chainId, token, amount);
     }
     const eligibleAgents = this.getEligibleAgents(chainId, asset);
     if (!amount) {
       const results2 = {};
       for (const agent of eligibleAgents) {
-        results2[agent.id] = await agent.withdraw(state, chainId);
+        results2[agent.id] = await agent.withdraw(state, chainId, token);
       }
       return { agentResult: results2 };
     }
+    const requested = BigInt(amount);
+    const aggregated = await this.getBalances();
+    const balances = eligibleAgents.map((agent) => {
+      const agentBalance = aggregated.agentBalances[agent.id];
+      const tokenBalance = agentBalance?.tokens.find(
+        (t) => t.chainId === chainId && t.asset === asset
+      );
+      if (!tokenBalance)
+        return { agent, balance: 0n };
+      const balance = (0, import_viem2.parseUnits)(tokenBalance.amount, assetInfo.decimals);
+      return { agent, balance };
+    });
+    const totalAvailable = balances.reduce((sum, x) => sum + x.balance, 0n);
+    if (totalAvailable < requested) {
+      throw new OwneyError(
+        "WITHDRAW_INSUFFICIENT_BALANCE",
+        `Requested withdrawal "${amount}" exceeds available balance "${totalAvailable.toString()}" for asset "${asset}".`,
+        {
+          asset,
+          requested: amount,
+          available: totalAvailable.toString()
+        }
+      );
+    }
+    const plans = planProportionalShares(balances, requested, totalAvailable);
     const results = {};
-    let lastError;
-    for (const agent of eligibleAgents) {
+    const agentErrors = {};
+    for (let i = 0; i < plans.length; i++) {
+      const p = plans[i];
+      if (p.planned === 0n)
+        continue;
       try {
-        results[agent.id] = await agent.withdraw(state, chainId, amount);
-        return { agentResult: results };
+        results[p.agent.id] = await p.agent.withdraw(
+          state,
+          chainId,
+          token,
+          p.agent.id === "sail" ? (0, import_viem2.formatUnits)(p.planned, assetInfo.decimals) : p.planned.toString()
+        );
       } catch (err) {
-        lastError = err;
+        console.error(`withdraw failed for agent "${p.agent.id}":`, err);
+        agentErrors[p.agent.id] = err instanceof Error ? err.message : String(err);
+        redistributeShare(plans, i, p.planned);
       }
     }
-    if (lastError)
-      throw lastError;
-    return {
-      agentResult: results
-    };
+    if (Object.keys(results).length === 0) {
+      throw new OwneyError(
+        "WITHDRAW_ALL_FAILED",
+        `Failed to withdraw "${amount}" of "${asset}" from all eligible agents.`,
+        {
+          asset,
+          amount,
+          agentErrors
+        }
+      );
+    }
+    const withdrawn = sumWithdrawnAmount(results);
+    if (withdrawn < 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.`,
+        {
+          asset,
+          requested: amount,
+          withdrawn: withdrawn.toString(),
+          partialResults: results,
+          agentErrors
+        }
+      );
+    }
+    return { agentResult: results };
   }
   // --- Portfolio reads ---
   /**
@@ -1550,7 +1715,10 @@ var OwneySDK = class {
       })
     );
     let successCount = 0;
-    for (const settledResult of balanceResults) {
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settledResult = balanceResults[i];
+      const [agentId2] = entries[i];
       if (settledResult.status === "fulfilled") {
         const [id, b] = settledResult.value;
         results[id] = b;
@@ -1558,12 +1726,14 @@ var OwneySDK = class {
         successCount += 1;
         continue;
       }
-      console.error("getBalances agent failed:", settledResult.reason);
+      const reason = settledResult.reason;
+      agentErrors[agentId2] = reason instanceof Error ? reason.message : String(reason);
     }
     if (successCount === 0) {
       throw new OwneyError(
         "BALANCE_ALL_FAILED",
-        "Failed to fetch balances for all active agents."
+        "Failed to fetch balances for all active agents.",
+        { agentErrors }
       );
     }
     return {
@@ -1658,10 +1828,6 @@ var OwneySDK = class {
         totalApy += agentApy * weight;
       }
     }
-    console.log("account apy", {
-      totalApy: String(totalApy),
-      agentApy: results
-    });
     return {
       totalApy: String(totalApy),
       agentApy: results
@@ -1802,20 +1968,26 @@ var OwneySDK = class {
       })
     );
     let successCount = 0;
-    for (const settledResult of balanceResults) {
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settledResult = balanceResults[i];
+      const [agentId] = entries[i];
       if (settledResult.status === "fulfilled") {
         const [id, bal] = settledResult.value;
         balances[id] = bal;
         totalBalance += bal;
         successCount += 1;
       } else {
-        console.error("getAgentAllocation agent failed:", settledResult.reason);
+        const reason = settledResult.reason;
+        agentErrors[agentId] = reason instanceof Error ? reason.message : String(reason);
+        console.error(`getAgentAllocation agent "${agentId}" failed:`, reason);
       }
     }
     if (successCount === 0) {
       throw new OwneyError(
         "ALLOCATION_ALL_FAILED",
-        "Failed to fetch allocation: all agents failed."
+        "Failed to fetch allocation: all agents failed.",
+        { agentErrors }
       );
     }
     const allocation = {};

package/dist/index.d.cts

@@ -28,7 +28,7 @@ interface IAgent {
     disconnect(): Promise<void>;
     activateAgent(state: ConnectionState, chainId: number): Promise<void>;
     deposit(state: ConnectionState, chainId: number, amount: string, depositCallback?: DepositCallback): Promise<OwneyDepositResult>;
-    withdraw(state: ConnectionState, chainId: number, amount?: string): Promise<AgentWithdrawResult>;
+    withdraw(state: ConnectionState, chainId: number, token: OwneySupportedTokens, amount?: string): Promise<AgentWithdrawResult>;
     getBalances(state: ConnectionState, chainId: number): Promise<AgentBalance>;
     getEarnings(state: ConnectionState, chainId: number): Promise<AgentEarnings>;
     getAccountApy(state: ConnectionState, chainId: number, days: DailyApyDays): Promise<AccountAgentApy>;
@@ -341,11 +341,12 @@ declare class OwneySDK {
     getAgentAllocation(): Promise<OwneyAgentAllocation>;
 }
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;
-    constructor(code: OwneyErrorCode, message: string, details?: Record<string, unknown>);
+    readonly agentId?: string;
+    constructor(code: OwneyErrorCode, message: string, details?: Record<string, unknown>, agentId?: string);
 }
 declare class AgentNotFoundError extends OwneyError {
     constructor(agentId: string, available: string[]);

package/dist/index.d.ts

@@ -28,7 +28,7 @@ interface IAgent {
     disconnect(): Promise<void>;
     activateAgent(state: ConnectionState, chainId: number): Promise<void>;
     deposit(state: ConnectionState, chainId: number, amount: string, depositCallback?: DepositCallback): Promise<OwneyDepositResult>;
-    withdraw(state: ConnectionState, chainId: number, amount?: string): Promise<AgentWithdrawResult>;
+    withdraw(state: ConnectionState, chainId: number, token: OwneySupportedTokens, amount?: string): Promise<AgentWithdrawResult>;
     getBalances(state: ConnectionState, chainId: number): Promise<AgentBalance>;
     getEarnings(state: ConnectionState, chainId: number): Promise<AgentEarnings>;
     getAccountApy(state: ConnectionState, chainId: number, days: DailyApyDays): Promise<AccountAgentApy>;
@@ -341,11 +341,12 @@ declare class OwneySDK {
     getAgentAllocation(): Promise<OwneyAgentAllocation>;
 }
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;
-    constructor(code: OwneyErrorCode, message: string, details?: Record<string, unknown>);
+    readonly agentId?: string;
+    constructor(code: OwneyErrorCode, message: string, details?: Record<string, unknown>, agentId?: string);
 }
 declare class AgentNotFoundError extends OwneyError {
     constructor(agentId: string, available: string[]);

package/dist/index.js

@@ -12,17 +12,20 @@ var SupportedAssets = [
   {
     address: `0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913`,
     symbol: "USDC",
-    chainId: 8453
+    chainId: 8453,
+    decimals: 6
   },
   {
     address: `0xaf88d065e77c8cC2239327C5EDb3A432268e5831`,
     symbol: "USDC",
-    chainId: 42161
+    chainId: 42161,
+    decimals: 6
   },
   {
     address: `0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9`,
     symbol: "USDT",
-    chainId: 42161
+    chainId: 42161,
+    decimals: 6
   }
 ];
 
@@ -30,11 +33,13 @@ var SupportedAssets = [
 var OwneyError = class extends Error {
   code;
   details;
-  constructor(code, message, details) {
-    super(message);
+  agentId;
+  constructor(code, message, details, agentId) {
+    super(agentId ? `[agent:${agentId}] ${message}` : message);
     this.name = "OwneyError";
     this.code = code;
     this.details = details;
+    this.agentId = agentId;
   }
 };
 var AgentNotFoundError = class extends OwneyError {
@@ -42,7 +47,8 @@ var AgentNotFoundError = class extends OwneyError {
     super(
       "AGENT_NOT_FOUND",
       `Unknown agent "${agentId}". Available agents: ${available.join(", ")}`,
-      { agentId, available }
+      { agentId, available },
+      agentId
     );
     this.name = "AgentNotFoundError";
   }
@@ -309,7 +315,9 @@ var ZyfaiAgent = class {
     if (!this.connectedAddress) {
       throw new OwneyError(
         "NOT_CONNECTED",
-        "Wallet not connected. Call sdk.connect() first."
+        "Wallet not connected. Call sdk.connect() first.",
+        void 0,
+        this.id
       );
     }
     return this.connectedAddress;
@@ -415,13 +423,14 @@ var ZyfaiAgent = class {
     }
   }
   // --- IAgent: Fund operations ---
-  async withdraw(state, chainId, amount) {
+  async withdraw(state, chainId, token, amount) {
     await this.connectFull(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.withdrawFunds(
       this.getAddress(),
       validChainId,
-      amount
+      amount,
+      token
     );
     return mapWithdraw(raw);
   }
@@ -679,6 +688,7 @@ function remapApyPerAssetToSymbols(raw) {
 }
 
 // src/agents/sail/sail.agent.ts
+import { parseUnits } from "viem";
 var SAIL_API_BASE = "https://app.sail.money";
 var PROJECT_ID = "sail";
 var PAGE_ID = "home";
@@ -736,7 +746,8 @@ var SailAgent = class {
         throw new OwneyError(
           "API_SAIL_TIMEOUT",
           `Sail API timeout ${timeoutMs}ms: ${method} ${path}`,
-          { timeoutMs, method, path }
+          { timeoutMs, method, path },
+          this.id
         );
       }
       throw error;
@@ -749,7 +760,8 @@ var SailAgent = class {
       throw new OwneyError(
         "API_SAIL_ERROR",
         `Sail API error ${res.status}: ${text}`,
-        { statusCode: res.status, method, path, responseBody: text }
+        { statusCode: res.status, method, path, responseBody: text },
+        this.id
       );
     }
     return res.json();
@@ -788,7 +800,9 @@ var SailAgent = class {
     if (!state.walletAddress) {
       throw new OwneyError(
         "WALLET_ADDRESS_REQUIRED",
-        "Wallet address is required. Call sdk.connect(provider) first."
+        "Wallet address is required. Call sdk.connect(provider) first.",
+        void 0,
+        this.id
       );
     }
     this.connectPromise = (async () => {
@@ -825,7 +839,9 @@ var SailAgent = class {
     if (!this.smartWalletAddress) {
       throw new OwneyError(
         "NOT_CONNECTED",
-        "Wallet not connected. Call sdk.connect() first."
+        "Wallet not connected. Call sdk.connect() first.",
+        void 0,
+        this.id
       );
     }
     return {
@@ -854,7 +870,9 @@ var SailAgent = class {
     if (!depositCallback) {
       throw new OwneyError(
         "DEPOSIT_CALLBACK_REQUIRED",
-        "depositCallback is required for Sail. Provide a callback that transfers tokens and returns the transaction hash."
+        "depositCallback is required for Sail. Provide a callback that transfers tokens and returns the transaction hash.",
+        void 0,
+        this.id
       );
     }
     try {
@@ -864,7 +882,9 @@ var SailAgent = class {
       if (!resolvedTokenAddress) {
         throw new OwneyError(
           "DEPOSIT_NO_PERMITTED_TOKENS",
-          "No permitted tokens available for deposit."
+          "No permitted tokens available for deposit.",
+          void 0,
+          this.id
         );
       }
       await this.executePreHooks(resolvedTokenAddress, amount, chainId);
@@ -872,7 +892,9 @@ var SailAgent = class {
       if (!txHash) {
         throw new OwneyError(
           "DEPOSIT_CALLBACK_INVALID",
-          "depositCallback must return a transaction hash (txHash) for Sail deposits."
+          "depositCallback must return a transaction hash (txHash) for Sail deposits.",
+          void 0,
+          this.id
         );
       }
       const postResult = await this.executePostHooks(
@@ -920,14 +942,29 @@ var SailAgent = class {
     );
   }
   // --- IAgent: Fund operations ---
-  async withdraw(state, chainId, amount) {
+  async withdraw(state, chainId, token, amount) {
     await this.connectFull(state, chainId);
     const withdrawInfo = await this.getWithdrawInfo();
-    const tokenAddress = withdrawInfo.permittedTokens[0]?.address;
+    const selectedTokenAddress = SupportedAssets.find(
+      (a) => a.symbol === token && a.chainId === chainId
+    );
+    if (!selectedTokenAddress) {
+      throw new OwneyError(
+        "WITHDRAW_NO_PERMITTED_TOKENS",
+        "Unsupported asset.",
+        void 0,
+        this.id
+      );
+    }
+    const tokenAddress = withdrawInfo.permittedTokens.find(
+      (t) => t.address === selectedTokenAddress.address
+    )?.address;
     if (!tokenAddress) {
       throw new OwneyError(
         "WITHDRAW_NO_PERMITTED_TOKENS",
-        "No permitted tokens available for withdrawal."
+        "No permitted tokens available for withdrawal.",
+        void 0,
+        this.id
       );
     }
     const resolvedAmount = amount ?? withdrawInfo.currentBalance;
@@ -947,7 +984,10 @@ var SailAgent = class {
     return mapWithdraw2({
       txHash: raw.transactionHash,
       type: amount ? "partial" : "full",
-      amount: resolvedAmount
+      amount: parseUnits(
+        resolvedAmount,
+        selectedTokenAddress.decimals
+      ).toString()
     });
   }
   // --- IAgent: Portfolio reads ---
@@ -1051,7 +1091,8 @@ var SailAgent = class {
       throw new OwneyError(
         "VALIDATION_INVALID_DAYS",
         `Invalid days value: "${days}". Expected one of: "7D", "14D", "30D".`,
-        { days }
+        { days },
+        this.id
       );
     }
     const now = /* @__PURE__ */ new Date();
@@ -1158,7 +1199,65 @@ async function fetchAgentKeys(apiKey) {
   return json.data;
 }
 
+// src/lib/helpers/withdraw-helper.ts
+function planProportionalShares(balances, requested, totalAvailable) {
+  const plans = balances.map(({ agent, balance }) => ({
+    agent,
+    balance,
+    planned: totalAvailable > 0n ? balance * requested / totalAvailable : 0n
+  }));
+  const assigned = plans.reduce((s, p) => s + p.planned, 0n);
+  let remainder = requested - assigned;
+  const byHeadroom = [...plans].sort((a, b) => {
+    const diff = b.balance - b.planned - (a.balance - a.planned);
+    return diff > 0n ? 1 : diff < 0n ? -1 : 0;
+  });
+  for (const p of byHeadroom) {
+    if (remainder === 0n)
+      break;
+    const headroom = p.balance - p.planned;
+    if (headroom <= 0n)
+      continue;
+    const take = headroom < remainder ? headroom : remainder;
+    p.planned += take;
+    remainder -= take;
+  }
+  return plans;
+}
+function redistributeShare(plans, fromIndex, amount) {
+  const candidates = plans.slice(fromIndex + 1).filter((c) => c.balance - c.planned > 0n);
+  const totalHeadroom = candidates.reduce(
+    (s, c) => s + (c.balance - c.planned),
+    0n
+  );
+  if (totalHeadroom === 0n)
+    return;
+  let distributed = 0n;
+  for (const c of candidates) {
+    const headroom = c.balance - c.planned;
+    const proportional = headroom * amount / totalHeadroom;
+    const give = proportional > headroom ? headroom : proportional;
+    c.planned += give;
+    distributed += give;
+  }
+  let leftover = amount - distributed;
+  for (const c of candidates) {
+    if (leftover === 0n)
+      break;
+    const headroom = c.balance - c.planned;
+    if (headroom <= 0n)
+      continue;
+    const take = headroom < leftover ? headroom : leftover;
+    c.planned += take;
+    leftover -= take;
+  }
+}
+function sumWithdrawnAmount(results) {
+  return Object.values(results).reduce((sum, r) => sum + BigInt(r.amount), 0n);
+}
+
 // src/client.ts
+import { formatUnits, parseUnits as parseUnits2 } from "viem";
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
   activeAgents = /* @__PURE__ */ new Set();
@@ -1434,7 +1533,8 @@ var OwneySDK = class {
       throw new OwneyError(
         "ASSET_UNSUPPORTED",
         `Agent "${agent.id}" does not support asset "${asset}" on chain ${chainId}.`,
-        { agentId: agent.id, asset, chainId }
+        { agentId: agent.id, asset, chainId },
+        agent.id
       );
     }
   }
@@ -1468,34 +1568,99 @@ var OwneySDK = class {
     const { asset, amount, agentId } = options;
     const state = this.requireState();
     const chainId = this.requireChainId();
+    const token = asset;
+    const assetInfo = SupportedAssets.find(
+      (a) => a.chainId === chainId && a.symbol === token
+    );
+    if (!assetInfo) {
+      throw new OwneyError(
+        "WITHDRAW_NO_PERMITTED_TOKENS",
+        "Asset selected is not supported"
+      );
+    }
     if (agentId) {
       const agent = this.getAgent(agentId);
       this.validateAssetSupport(agent, chainId, asset);
-      return agent.withdraw(state, chainId, amount);
+      return agent.withdraw(state, chainId, token, amount);
     }
     const eligibleAgents = this.getEligibleAgents(chainId, asset);
     if (!amount) {
       const results2 = {};
       for (const agent of eligibleAgents) {
-        results2[agent.id] = await agent.withdraw(state, chainId);
+        results2[agent.id] = await agent.withdraw(state, chainId, token);
       }
       return { agentResult: results2 };
     }
+    const requested = BigInt(amount);
+    const aggregated = await this.getBalances();
+    const balances = eligibleAgents.map((agent) => {
+      const agentBalance = aggregated.agentBalances[agent.id];
+      const tokenBalance = agentBalance?.tokens.find(
+        (t) => t.chainId === chainId && t.asset === asset
+      );
+      if (!tokenBalance)
+        return { agent, balance: 0n };
+      const balance = parseUnits2(tokenBalance.amount, assetInfo.decimals);
+      return { agent, balance };
+    });
+    const totalAvailable = balances.reduce((sum, x) => sum + x.balance, 0n);
+    if (totalAvailable < requested) {
+      throw new OwneyError(
+        "WITHDRAW_INSUFFICIENT_BALANCE",
+        `Requested withdrawal "${amount}" exceeds available balance "${totalAvailable.toString()}" for asset "${asset}".`,
+        {
+          asset,
+          requested: amount,
+          available: totalAvailable.toString()
+        }
+      );
+    }
+    const plans = planProportionalShares(balances, requested, totalAvailable);
     const results = {};
-    let lastError;
-    for (const agent of eligibleAgents) {
+    const agentErrors = {};
+    for (let i = 0; i < plans.length; i++) {
+      const p = plans[i];
+      if (p.planned === 0n)
+        continue;
       try {
-        results[agent.id] = await agent.withdraw(state, chainId, amount);
-        return { agentResult: results };
+        results[p.agent.id] = await p.agent.withdraw(
+          state,
+          chainId,
+          token,
+          p.agent.id === "sail" ? formatUnits(p.planned, assetInfo.decimals) : p.planned.toString()
+        );
       } catch (err) {
-        lastError = err;
+        console.error(`withdraw failed for agent "${p.agent.id}":`, err);
+        agentErrors[p.agent.id] = err instanceof Error ? err.message : String(err);
+        redistributeShare(plans, i, p.planned);
       }
     }
-    if (lastError)
-      throw lastError;
-    return {
-      agentResult: results
-    };
+    if (Object.keys(results).length === 0) {
+      throw new OwneyError(
+        "WITHDRAW_ALL_FAILED",
+        `Failed to withdraw "${amount}" of "${asset}" from all eligible agents.`,
+        {
+          asset,
+          amount,
+          agentErrors
+        }
+      );
+    }
+    const withdrawn = sumWithdrawnAmount(results);
+    if (withdrawn < 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.`,
+        {
+          asset,
+          requested: amount,
+          withdrawn: withdrawn.toString(),
+          partialResults: results,
+          agentErrors
+        }
+      );
+    }
+    return { agentResult: results };
   }
   // --- Portfolio reads ---
   /**
@@ -1520,7 +1685,10 @@ var OwneySDK = class {
       })
     );
     let successCount = 0;
-    for (const settledResult of balanceResults) {
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settledResult = balanceResults[i];
+      const [agentId2] = entries[i];
       if (settledResult.status === "fulfilled") {
         const [id, b] = settledResult.value;
         results[id] = b;
@@ -1528,12 +1696,14 @@ var OwneySDK = class {
         successCount += 1;
         continue;
       }
-      console.error("getBalances agent failed:", settledResult.reason);
+      const reason = settledResult.reason;
+      agentErrors[agentId2] = reason instanceof Error ? reason.message : String(reason);
     }
     if (successCount === 0) {
       throw new OwneyError(
         "BALANCE_ALL_FAILED",
-        "Failed to fetch balances for all active agents."
+        "Failed to fetch balances for all active agents.",
+        { agentErrors }
       );
     }
     return {
@@ -1628,10 +1798,6 @@ var OwneySDK = class {
         totalApy += agentApy * weight;
       }
     }
-    console.log("account apy", {
-      totalApy: String(totalApy),
-      agentApy: results
-    });
     return {
       totalApy: String(totalApy),
       agentApy: results
@@ -1772,20 +1938,26 @@ var OwneySDK = class {
       })
     );
     let successCount = 0;
-    for (const settledResult of balanceResults) {
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settledResult = balanceResults[i];
+      const [agentId] = entries[i];
       if (settledResult.status === "fulfilled") {
         const [id, bal] = settledResult.value;
         balances[id] = bal;
         totalBalance += bal;
         successCount += 1;
       } else {
-        console.error("getAgentAllocation agent failed:", settledResult.reason);
+        const reason = settledResult.reason;
+        agentErrors[agentId] = reason instanceof Error ? reason.message : String(reason);
+        console.error(`getAgentAllocation agent "${agentId}" failed:`, reason);
       }
     }
     if (successCount === 0) {
       throw new OwneyError(
         "ALLOCATION_ALL_FAILED",
-        "Failed to fetch allocation: all agents failed."
+        "Failed to fetch allocation: all agents failed.",
+        { agentErrors }
       );
     }
     const allocation = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -20,7 +20,8 @@
     "dev": "tsup --watch"
   },
   "dependencies": {
-    "@zyfai/sdk": "^0.2.30"
+    "@zyfai/sdk": "^0.2.30",
+    "viem": "^2.48.1"
   },
   "devDependencies": {
     "dotenv": "^17.3.1",