@exagent/agent 0.1.46 → 0.1.47

package/dist/cli.js

@@ -1552,16 +1552,25 @@ var init_executor = __esm({
       config;
       allowedTokens;
       configHashFn;
-      constructor(client, config, configHashFn) {
+      vaultManager;
+      constructor(client, config, configHashFn, vaultManager) {
         this.client = client;
         this.config = config;
         this.configHashFn = configHashFn;
+        this.vaultManager = vaultManager;
         this.allowedTokens = new Set(
           (config.allowedTokens || []).map((t) => t.toLowerCase())
         );
       }
       /**
-       * Execute a single trade signal
+       * Set the vault manager (allows wiring after construction)
+       */
+      setVaultManager(vm) {
+        this.vaultManager = vm;
+      }
+      /**
+       * Execute a single trade signal.
+       * Tries vault trading first if vault exists, falls back to wallet trading.
        */
       async execute(signal) {
         if (signal.action === "hold") {
@@ -1574,13 +1583,38 @@ var init_executor = __esm({
             return { success: false, error: "Signal exceeds position limits" };
           }
           const configHash = this.configHashFn?.();
-          const result = await this.client.trade({
+          const tradeIntent = {
             tokenIn: signal.tokenIn,
             tokenOut: signal.tokenOut,
             amountIn: signal.amountIn,
             maxSlippageBps: this.config.trading?.maxSlippageBps ?? 100,
             ...configHash && { configHash }
-          });
+          };
+          if (this.vaultManager) {
+            const vaultAddress = await this.vaultManager.getVaultAddress();
+            if (vaultAddress && this.vaultManager.preferVaultTrading) {
+              const routerTrade = await this.client.buildRouterTrade(tradeIntent);
+              if (routerTrade.vaultParams) {
+                console.log(`Attempting vault trade via ${vaultAddress}`);
+                const vaultResult = await this.vaultManager.executeVaultTrade({
+                  tokenIn: signal.tokenIn,
+                  tokenOut: signal.tokenOut,
+                  amountIn: BigInt(signal.amountIn),
+                  minAmountOut: BigInt(routerTrade.minAmountOut),
+                  vaultParams: routerTrade.vaultParams
+                });
+                if (vaultResult) {
+                  if (vaultResult.txHash) {
+                    console.log(`Vault trade executed: ${vaultResult.txHash}`);
+                    return { success: true, txHash: vaultResult.txHash };
+                  }
+                  console.error(`Vault trade failed: ${vaultResult.error}`);
+                  return { success: false, error: vaultResult.error };
+                }
+              }
+            }
+          }
+          const result = await this.client.trade(tradeIntent);
           console.log(`Trade executed: ${result.hash}`);
           return { success: true, txHash: result.hash };
         } catch (error) {
@@ -4388,9 +4422,10 @@ var VAULT_ABI = [
     outputs: [{ type: "uint256" }],
     stateMutability: "view"
   },
+  // TOKEN → base asset (fee from output)
   {
     type: "function",
-    name: "executeTrade",
+    name: "executeSwap",
     inputs: [
       { name: "tokenIn", type: "address" },
       { name: "tokenOut", type: "address" },
@@ -4398,6 +4433,44 @@ var VAULT_ABI = [
       { name: "minAmountOut", type: "uint256" },
       { name: "aggregator", type: "address" },
       { name: "swapData", type: "bytes" },
+      { name: "feeConvertAggregator", type: "address" },
+      { name: "feeSwapData", type: "bytes" },
+      { name: "deadline", type: "uint256" }
+    ],
+    outputs: [{ type: "uint256" }],
+    stateMutability: "nonpayable"
+  },
+  // Base asset → TOKEN (fee from input)
+  {
+    type: "function",
+    name: "executeSwapSimple",
+    inputs: [
+      { name: "tokenIn", type: "address" },
+      { name: "tokenOut", type: "address" },
+      { name: "amountIn", type: "uint256" },
+      { name: "minAmountOut", type: "uint256" },
+      { name: "target", type: "address" },
+      { name: "data", type: "bytes" },
+      { name: "feeConvertAggregator", type: "address" },
+      { name: "feeSwapData", type: "bytes" },
+      { name: "deadline", type: "uint256" }
+    ],
+    outputs: [{ type: "uint256" }],
+    stateMutability: "nonpayable"
+  },
+  // TOKEN → TOKEN (multi-hop via USDC, fee at midpoint)
+  {
+    type: "function",
+    name: "executeSwapMultiHop",
+    inputs: [
+      { name: "tokenIn", type: "address" },
+      { name: "tokenOut", type: "address" },
+      { name: "amountIn", type: "uint256" },
+      { name: "minAmountOut", type: "uint256" },
+      { name: "aggregator1", type: "address" },
+      { name: "swapData1", type: "bytes" },
+      { name: "aggregator2", type: "address" },
+      { name: "swapData2", type: "bytes" },
       { name: "deadline", type: "uint256" }
     ],
     outputs: [{ type: "uint256" }],
@@ -4663,8 +4736,9 @@ var VaultManager = class {
     }
   }
   /**
-   * Execute a trade through the vault (if it exists and policy allows)
-   * Returns null if should use direct trading instead
+   * Execute a trade through the vault using API-provided vaultParams.
+   * Dispatches to the correct vault function based on swapType.
+   * Returns null if vault trading shouldn't be used (no vault, policy disabled).
    */
   async executeVaultTrade(params) {
     if (!this.preferVaultTrading) {
@@ -4675,23 +4749,71 @@ var VaultManager = class {
       return null;
     }
     const deadline = params.deadline || BigInt(Math.floor(Date.now() / 1e3) + 3600);
+    const { vaultParams } = params;
     try {
-      const hash = await this.walletClient.writeContract({
-        address: vaultAddress,
-        abi: VAULT_ABI,
-        functionName: "executeTrade",
-        args: [
-          params.tokenIn,
-          params.tokenOut,
-          params.amountIn,
-          params.minAmountOut,
-          params.aggregator,
-          params.swapData,
-          deadline
-        ],
-        chain: import_chains2.base,
-        account: this.account
-      });
+      let hash;
+      switch (vaultParams.swapType) {
+        case "swap":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwap",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.aggregator,
+              vaultParams.swapData,
+              vaultParams.feeConvertAggregator,
+              vaultParams.feeSwapData,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+        case "simple":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwapSimple",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.target,
+              vaultParams.data,
+              vaultParams.feeConvertAggregator,
+              vaultParams.feeSwapData,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+        case "multihop":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwapMultiHop",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.aggregator1,
+              vaultParams.swapData1,
+              vaultParams.aggregator2,
+              vaultParams.swapData2,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+      }
       return { usedVault: true, txHash: hash };
     } catch (error) {
       return {
@@ -7949,7 +8071,7 @@ function loadSecureEnv(basePath, passphrase) {
 }
 
 // src/index.ts
-var AGENT_VERSION = "0.1.46";
+var AGENT_VERSION = "0.1.47";
 
 // src/relay.ts
 var RelayClient = class {
@@ -8410,10 +8532,16 @@ var AgentRuntime = class {
       vaultConfig
     });
     console.log(`Vault policy: ${vaultConfig.policy}`);
+    if (this.executor) {
+      this.executor.setVaultManager(this.vaultManager);
+    }
     const status = await this.vaultManager.getVaultStatus();
     if (status.hasVault) {
       console.log(`Vault exists: ${status.vaultAddress}`);
       console.log(`Vault TVL: ${Number(status.totalAssets) / 1e6} USDC`);
+      if (vaultConfig.preferVaultTrading) {
+        console.log("Vault trading enabled \u2014 trades will execute from vault");
+      }
     } else {
       console.log("No vault exists for this agent");
       if (vaultConfig.policy === "manual") {
@@ -9834,8 +9962,9 @@ This exit has been recorded in your trade history and counts toward your total P
         this.paperPortfolio.save();
       } else {
         const vaultStatus = await this.vaultManager?.getVaultStatus();
-        if (vaultStatus?.hasVault && this.vaultManager?.preferVaultTrading) {
-          console.log(`Trading through vault: ${vaultStatus.vaultAddress}`);
+        if (vaultStatus?.hasVault) {
+          const via = this.vaultManager?.preferVaultTrading ? "vault" : "wallet";
+          console.log(`Vault active: ${vaultStatus.vaultAddress} (trades execute from ${via})`);
         }
         const results = await this.executor.executeAll(filteredSignals);
         let totalFeesUSD = 0;

package/dist/cli.mjs

@@ -29,7 +29,7 @@ import {
   results_exports,
   saveSessionResult,
   validateConfig
-} from "./chunk-7QMPWDX3.mjs";
+} from "./chunk-ICTDJ7VX.mjs";
 
 // src/backtest/data-loader.ts
 import * as fs from "fs";

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { Address, Hash, PublicClient, HttpTransport, WalletClient } from 'viem';
-import { ExagentClient } from '@exagent/sdk';
+import { VaultTradeParams, ExagentClient } from '@exagent/sdk';
 import { base } from 'viem/chains';
 
 /** Risk state persisted across restarts */
@@ -967,16 +967,16 @@ declare class VaultManager {
         error?: string;
     }>;
     /**
-     * Execute a trade through the vault (if it exists and policy allows)
-     * Returns null if should use direct trading instead
+     * Execute a trade through the vault using API-provided vaultParams.
+     * Dispatches to the correct vault function based on swapType.
+     * Returns null if vault trading shouldn't be used (no vault, policy disabled).
      */
     executeVaultTrade(params: {
         tokenIn: Address;
         tokenOut: Address;
         amountIn: bigint;
         minAmountOut: bigint;
-        aggregator: Address;
-        swapData: `0x${string}`;
+        vaultParams: VaultTradeParams;
         deadline?: bigint;
     }): Promise<{
         usedVault: boolean;
@@ -1538,17 +1538,23 @@ declare function getAllStrategyTemplates(): StrategyTemplate[];
 /**
  * Trade Executor
  * Handles execution of trade signals through the ExagentRouter.
- * All trades go through the router — there is no direct DEX bypass.
- * Pre-checks token eligibility to avoid wasting gas on reverts.
+ * Tries vault trading first (if vault exists and policy allows),
+ * then falls back to wallet trading. All trades route through the router.
  */
 declare class TradeExecutor {
     private client;
     private config;
     private allowedTokens;
     private configHashFn?;
-    constructor(client: ExagentClient, config: RuntimeConfig, configHashFn?: () => string);
+    private vaultManager?;
+    constructor(client: ExagentClient, config: RuntimeConfig, configHashFn?: () => string, vaultManager?: VaultManager);
     /**
-     * Execute a single trade signal
+     * Set the vault manager (allows wiring after construction)
+     */
+    setVaultManager(vm: VaultManager): void;
+    /**
+     * Execute a single trade signal.
+     * Tries vault trading first if vault exists, falls back to wallet trading.
      */
     execute(signal: TradeSignal): Promise<{
         success: boolean;
@@ -3353,6 +3359,6 @@ declare function decryptEnvFile(encPath: string, passphrase: string): Record<str
 declare function loadSecureEnv(basePath: string, passphrase?: string): boolean;
 
 /** @exagent/agent package version — update alongside package.json */
-declare const AGENT_VERSION = "0.1.46";
+declare const AGENT_VERSION = "0.1.47";
 
 export { AGENT_VERSION, type AccountSummary, type AgentConfig, AgentConfigSchema, type AgentMode, AgentRuntime, type AgentStatusPayload, AnthropicAdapter, BaseLLMAdapter, type BridgeResult, type BridgeStep, type CommandType, DeepSeekAdapter, FileStore, type FillCallback, type FundingCallback, type FundingPayment, GoogleAdapter, GroqAdapter, HYPERLIQUID_DOMAIN, HyperliquidClient, HyperliquidSigner, HyperliquidWebSocket, type InferredExit, type LLMAdapter, type LLMConfig, LLMConfigSchema, type LLMMessage, type LLMMetadata, type LLMProvider, LLMProviderSchema, type LLMResponse, type LiquidationCallback, type LocalPosition, MARKET_CATEGORIES, MarketBrowser, type MarketCategory, type MarketData, MarketDataService, type MessageLevel, type MessageType, MistralAdapter, OllamaAdapter, type OnboardingStatus, OpenAIAdapter, OrderManager, type OrderResult, type PerpAction, type PerpConfig$1 as PerpConfig, PerpConfigSchema, type PerpFill, type PerpMarketData, PerpOnboarding, type PerpPosition, type PerpStrategyFunction, PerpTradeRecorder, type PerpTradeSignal, type PerpConfig as PerpTradingConfig, PolymarketClient, PositionManager, type PositionSummary, PositionTracker, type PredictionAccountSummary, type PredictionAction, type PredictionConfig$1 as PredictionConfig, PredictionConfigSchema, type PredictionFill, PredictionFunding, type PredictionFundingConfig, type PredictionMarket, PredictionOrderManager, type PredictionPosition, PredictionPositionManager, type PredictionStrategyFunction, PredictionTradeRecorder, type PredictionTradeSignal, type PredictionConfig as PredictionTradingConfig, type RecordPerpTradeParams, type RecordPredictionTradeParams, RelayClient, type RelayCommand, type RelayConfig$1 as RelayConfig, RelayConfigSchema, RiskManager, type RiskState, type RiskUniverse, RiskUniverseSchema, type RuntimeConfig, STRATEGY_TEMPLATES, type StrategyContext, type StrategyFunction, type StrategyStore, type StrategyTemplate, type StuckPosition, TogetherAdapter, type TrackedPosition, TradeExecutor, type TradeRecord, type TradeSignal, type TradingConfig, TradingConfigSchema, type VaultConfig, VaultConfigSchema, VaultManager, type VaultManagerConfig, type VaultPolicy, VaultPolicySchema, type VaultStatus, calculatePredictionFee, createLLMAdapter, createSampleConfig, decodePredictionInstrument, decryptEnvFile, encodePredictionInstrument, encryptEnvFile, fillHashToBytes32, fillOidToBytes32, getAllStrategyTemplates, getNextNonce, getStrategyTemplate, loadConfig, loadSecureEnv, loadStrategy, orderIdToBytes32, tradeIdToBytes32, validateConfig, validateStrategy };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { Address, Hash, PublicClient, HttpTransport, WalletClient } from 'viem';
-import { ExagentClient } from '@exagent/sdk';
+import { VaultTradeParams, ExagentClient } from '@exagent/sdk';
 import { base } from 'viem/chains';
 
 /** Risk state persisted across restarts */
@@ -967,16 +967,16 @@ declare class VaultManager {
         error?: string;
     }>;
     /**
-     * Execute a trade through the vault (if it exists and policy allows)
-     * Returns null if should use direct trading instead
+     * Execute a trade through the vault using API-provided vaultParams.
+     * Dispatches to the correct vault function based on swapType.
+     * Returns null if vault trading shouldn't be used (no vault, policy disabled).
      */
     executeVaultTrade(params: {
         tokenIn: Address;
         tokenOut: Address;
         amountIn: bigint;
         minAmountOut: bigint;
-        aggregator: Address;
-        swapData: `0x${string}`;
+        vaultParams: VaultTradeParams;
         deadline?: bigint;
     }): Promise<{
         usedVault: boolean;
@@ -1538,17 +1538,23 @@ declare function getAllStrategyTemplates(): StrategyTemplate[];
 /**
  * Trade Executor
  * Handles execution of trade signals through the ExagentRouter.
- * All trades go through the router — there is no direct DEX bypass.
- * Pre-checks token eligibility to avoid wasting gas on reverts.
+ * Tries vault trading first (if vault exists and policy allows),
+ * then falls back to wallet trading. All trades route through the router.
  */
 declare class TradeExecutor {
     private client;
     private config;
     private allowedTokens;
     private configHashFn?;
-    constructor(client: ExagentClient, config: RuntimeConfig, configHashFn?: () => string);
+    private vaultManager?;
+    constructor(client: ExagentClient, config: RuntimeConfig, configHashFn?: () => string, vaultManager?: VaultManager);
     /**
-     * Execute a single trade signal
+     * Set the vault manager (allows wiring after construction)
+     */
+    setVaultManager(vm: VaultManager): void;
+    /**
+     * Execute a single trade signal.
+     * Tries vault trading first if vault exists, falls back to wallet trading.
      */
     execute(signal: TradeSignal): Promise<{
         success: boolean;
@@ -3353,6 +3359,6 @@ declare function decryptEnvFile(encPath: string, passphrase: string): Record<str
 declare function loadSecureEnv(basePath: string, passphrase?: string): boolean;
 
 /** @exagent/agent package version — update alongside package.json */
-declare const AGENT_VERSION = "0.1.46";
+declare const AGENT_VERSION = "0.1.47";
 
 export { AGENT_VERSION, type AccountSummary, type AgentConfig, AgentConfigSchema, type AgentMode, AgentRuntime, type AgentStatusPayload, AnthropicAdapter, BaseLLMAdapter, type BridgeResult, type BridgeStep, type CommandType, DeepSeekAdapter, FileStore, type FillCallback, type FundingCallback, type FundingPayment, GoogleAdapter, GroqAdapter, HYPERLIQUID_DOMAIN, HyperliquidClient, HyperliquidSigner, HyperliquidWebSocket, type InferredExit, type LLMAdapter, type LLMConfig, LLMConfigSchema, type LLMMessage, type LLMMetadata, type LLMProvider, LLMProviderSchema, type LLMResponse, type LiquidationCallback, type LocalPosition, MARKET_CATEGORIES, MarketBrowser, type MarketCategory, type MarketData, MarketDataService, type MessageLevel, type MessageType, MistralAdapter, OllamaAdapter, type OnboardingStatus, OpenAIAdapter, OrderManager, type OrderResult, type PerpAction, type PerpConfig$1 as PerpConfig, PerpConfigSchema, type PerpFill, type PerpMarketData, PerpOnboarding, type PerpPosition, type PerpStrategyFunction, PerpTradeRecorder, type PerpTradeSignal, type PerpConfig as PerpTradingConfig, PolymarketClient, PositionManager, type PositionSummary, PositionTracker, type PredictionAccountSummary, type PredictionAction, type PredictionConfig$1 as PredictionConfig, PredictionConfigSchema, type PredictionFill, PredictionFunding, type PredictionFundingConfig, type PredictionMarket, PredictionOrderManager, type PredictionPosition, PredictionPositionManager, type PredictionStrategyFunction, PredictionTradeRecorder, type PredictionTradeSignal, type PredictionConfig as PredictionTradingConfig, type RecordPerpTradeParams, type RecordPredictionTradeParams, RelayClient, type RelayCommand, type RelayConfig$1 as RelayConfig, RelayConfigSchema, RiskManager, type RiskState, type RiskUniverse, RiskUniverseSchema, type RuntimeConfig, STRATEGY_TEMPLATES, type StrategyContext, type StrategyFunction, type StrategyStore, type StrategyTemplate, type StuckPosition, TogetherAdapter, type TrackedPosition, TradeExecutor, type TradeRecord, type TradeSignal, type TradingConfig, TradingConfigSchema, type VaultConfig, VaultConfigSchema, VaultManager, type VaultManagerConfig, type VaultPolicy, VaultPolicySchema, type VaultStatus, calculatePredictionFee, createLLMAdapter, createSampleConfig, decodePredictionInstrument, decryptEnvFile, encodePredictionInstrument, encryptEnvFile, fillHashToBytes32, fillOidToBytes32, getAllStrategyTemplates, getNextNonce, getStrategyTemplate, loadConfig, loadSecureEnv, loadStrategy, orderIdToBytes32, tradeIdToBytes32, validateConfig, validateStrategy };

package/dist/index.js

@@ -2377,16 +2377,25 @@ var TradeExecutor = class {
   config;
   allowedTokens;
   configHashFn;
-  constructor(client, config, configHashFn) {
+  vaultManager;
+  constructor(client, config, configHashFn, vaultManager) {
     this.client = client;
     this.config = config;
     this.configHashFn = configHashFn;
+    this.vaultManager = vaultManager;
     this.allowedTokens = new Set(
       (config.allowedTokens || []).map((t) => t.toLowerCase())
     );
   }
   /**
-   * Execute a single trade signal
+   * Set the vault manager (allows wiring after construction)
+   */
+  setVaultManager(vm) {
+    this.vaultManager = vm;
+  }
+  /**
+   * Execute a single trade signal.
+   * Tries vault trading first if vault exists, falls back to wallet trading.
    */
   async execute(signal) {
     if (signal.action === "hold") {
@@ -2399,13 +2408,38 @@ var TradeExecutor = class {
         return { success: false, error: "Signal exceeds position limits" };
       }
       const configHash = this.configHashFn?.();
-      const result = await this.client.trade({
+      const tradeIntent = {
         tokenIn: signal.tokenIn,
         tokenOut: signal.tokenOut,
         amountIn: signal.amountIn,
         maxSlippageBps: this.config.trading?.maxSlippageBps ?? 100,
         ...configHash && { configHash }
-      });
+      };
+      if (this.vaultManager) {
+        const vaultAddress = await this.vaultManager.getVaultAddress();
+        if (vaultAddress && this.vaultManager.preferVaultTrading) {
+          const routerTrade = await this.client.buildRouterTrade(tradeIntent);
+          if (routerTrade.vaultParams) {
+            console.log(`Attempting vault trade via ${vaultAddress}`);
+            const vaultResult = await this.vaultManager.executeVaultTrade({
+              tokenIn: signal.tokenIn,
+              tokenOut: signal.tokenOut,
+              amountIn: BigInt(signal.amountIn),
+              minAmountOut: BigInt(routerTrade.minAmountOut),
+              vaultParams: routerTrade.vaultParams
+            });
+            if (vaultResult) {
+              if (vaultResult.txHash) {
+                console.log(`Vault trade executed: ${vaultResult.txHash}`);
+                return { success: true, txHash: vaultResult.txHash };
+              }
+              console.error(`Vault trade failed: ${vaultResult.error}`);
+              return { success: false, error: vaultResult.error };
+            }
+          }
+        }
+      }
+      const result = await this.client.trade(tradeIntent);
       console.log(`Trade executed: ${result.hash}`);
       return { success: true, txHash: result.hash };
     } catch (error) {
@@ -2891,9 +2925,10 @@ var VAULT_ABI = [
     outputs: [{ type: "uint256" }],
     stateMutability: "view"
   },
+  // TOKEN → base asset (fee from output)
   {
     type: "function",
-    name: "executeTrade",
+    name: "executeSwap",
     inputs: [
       { name: "tokenIn", type: "address" },
       { name: "tokenOut", type: "address" },
@@ -2901,6 +2936,44 @@ var VAULT_ABI = [
       { name: "minAmountOut", type: "uint256" },
       { name: "aggregator", type: "address" },
       { name: "swapData", type: "bytes" },
+      { name: "feeConvertAggregator", type: "address" },
+      { name: "feeSwapData", type: "bytes" },
+      { name: "deadline", type: "uint256" }
+    ],
+    outputs: [{ type: "uint256" }],
+    stateMutability: "nonpayable"
+  },
+  // Base asset → TOKEN (fee from input)
+  {
+    type: "function",
+    name: "executeSwapSimple",
+    inputs: [
+      { name: "tokenIn", type: "address" },
+      { name: "tokenOut", type: "address" },
+      { name: "amountIn", type: "uint256" },
+      { name: "minAmountOut", type: "uint256" },
+      { name: "target", type: "address" },
+      { name: "data", type: "bytes" },
+      { name: "feeConvertAggregator", type: "address" },
+      { name: "feeSwapData", type: "bytes" },
+      { name: "deadline", type: "uint256" }
+    ],
+    outputs: [{ type: "uint256" }],
+    stateMutability: "nonpayable"
+  },
+  // TOKEN → TOKEN (multi-hop via USDC, fee at midpoint)
+  {
+    type: "function",
+    name: "executeSwapMultiHop",
+    inputs: [
+      { name: "tokenIn", type: "address" },
+      { name: "tokenOut", type: "address" },
+      { name: "amountIn", type: "uint256" },
+      { name: "minAmountOut", type: "uint256" },
+      { name: "aggregator1", type: "address" },
+      { name: "swapData1", type: "bytes" },
+      { name: "aggregator2", type: "address" },
+      { name: "swapData2", type: "bytes" },
       { name: "deadline", type: "uint256" }
     ],
     outputs: [{ type: "uint256" }],
@@ -3166,8 +3239,9 @@ var VaultManager = class {
     }
   }
   /**
-   * Execute a trade through the vault (if it exists and policy allows)
-   * Returns null if should use direct trading instead
+   * Execute a trade through the vault using API-provided vaultParams.
+   * Dispatches to the correct vault function based on swapType.
+   * Returns null if vault trading shouldn't be used (no vault, policy disabled).
    */
   async executeVaultTrade(params) {
     if (!this.preferVaultTrading) {
@@ -3178,23 +3252,71 @@ var VaultManager = class {
       return null;
     }
     const deadline = params.deadline || BigInt(Math.floor(Date.now() / 1e3) + 3600);
+    const { vaultParams } = params;
     try {
-      const hash = await this.walletClient.writeContract({
-        address: vaultAddress,
-        abi: VAULT_ABI,
-        functionName: "executeTrade",
-        args: [
-          params.tokenIn,
-          params.tokenOut,
-          params.amountIn,
-          params.minAmountOut,
-          params.aggregator,
-          params.swapData,
-          deadline
-        ],
-        chain: import_chains2.base,
-        account: this.account
-      });
+      let hash;
+      switch (vaultParams.swapType) {
+        case "swap":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwap",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.aggregator,
+              vaultParams.swapData,
+              vaultParams.feeConvertAggregator,
+              vaultParams.feeSwapData,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+        case "simple":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwapSimple",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.target,
+              vaultParams.data,
+              vaultParams.feeConvertAggregator,
+              vaultParams.feeSwapData,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+        case "multihop":
+          hash = await this.walletClient.writeContract({
+            address: vaultAddress,
+            abi: VAULT_ABI,
+            functionName: "executeSwapMultiHop",
+            args: [
+              params.tokenIn,
+              params.tokenOut,
+              params.amountIn,
+              params.minAmountOut,
+              vaultParams.aggregator1,
+              vaultParams.swapData1,
+              vaultParams.aggregator2,
+              vaultParams.swapData2,
+              deadline
+            ],
+            chain: import_chains2.base,
+            account: this.account
+          });
+          break;
+      }
       return { usedVault: true, txHash: hash };
     } catch (error) {
       return {
@@ -7337,10 +7459,16 @@ var AgentRuntime = class {
       vaultConfig
     });
     console.log(`Vault policy: ${vaultConfig.policy}`);
+    if (this.executor) {
+      this.executor.setVaultManager(this.vaultManager);
+    }
     const status = await this.vaultManager.getVaultStatus();
     if (status.hasVault) {
       console.log(`Vault exists: ${status.vaultAddress}`);
       console.log(`Vault TVL: ${Number(status.totalAssets) / 1e6} USDC`);
+      if (vaultConfig.preferVaultTrading) {
+        console.log("Vault trading enabled \u2014 trades will execute from vault");
+      }
     } else {
       console.log("No vault exists for this agent");
       if (vaultConfig.policy === "manual") {
@@ -8761,8 +8889,9 @@ This exit has been recorded in your trade history and counts toward your total P
         this.paperPortfolio.save();
       } else {
         const vaultStatus = await this.vaultManager?.getVaultStatus();
-        if (vaultStatus?.hasVault && this.vaultManager?.preferVaultTrading) {
-          console.log(`Trading through vault: ${vaultStatus.vaultAddress}`);
+        if (vaultStatus?.hasVault) {
+          const via = this.vaultManager?.preferVaultTrading ? "vault" : "wallet";
+          console.log(`Vault active: ${vaultStatus.vaultAddress} (trades execute from ${via})`);
         }
         const results = await this.executor.executeAll(filteredSignals);
         let totalFeesUSD = 0;
@@ -9481,7 +9610,7 @@ function loadSecureEnv(basePath, passphrase) {
 }
 
 // src/index.ts
-var AGENT_VERSION = "0.1.46";
+var AGENT_VERSION = "0.1.47";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AGENT_VERSION,