schwab_mcp 0.1.0 → 0.3.0

data/lib/schwab_mcp/tools/get_price_history_tool.rb

@@ -1,8 +1,8 @@
 require "mcp"
 require "schwab_rb"
-require "json"
 require "date"
 require_relative "../loggable"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -68,20 +68,8 @@ module SchwabMCP
         log_info("Getting price history for symbol: #{symbol}")
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           parsed_start = nil
           parsed_end = nil
@@ -146,7 +134,7 @@ module SchwabMCP
 
           log_debug("Making price history API request for symbol: #{symbol}")
 
-          response = client.get_price_history(
+          price_history = client.get_price_history(
             symbol.upcase,
             period_type: period_type_enum,
             period: period,
@@ -158,29 +146,29 @@ module SchwabMCP
             need_previous_close: need_previous_close
           )
 
-          if response&.body
+          if price_history
             log_info("Successfully retrieved price history for #{symbol}")
 
-            begin
-              data = JSON.parse(response.body)
-              candles = data.dig("candles") || []
-
-              summary = if candles.any?
-                "Retrieved #{candles.length} price candles"
-              else
-                "No price data available for the specified parameters"
-              end
+            summary = if price_history.empty?
+              "No price data available for the specified parameters"
+            else
+              "Retrieved #{price_history.count} price candles\n" \
+              "First candle: #{price_history.first_candle&.to_h}\n" \
+              "Last candle: #{price_history.last_candle&.to_h}"
+            end
 
-              MCP::Tool::Response.new([{
-                type: "text",
-                text: "**Price History for #{symbol.upcase}:**\n\n#{summary}\n\n```json\n#{response.body}\n```"
-              }])
-            rescue JSON::ParserError
-              MCP::Tool::Response.new([{
-                type: "text",
-                text: "**Price History for #{symbol.upcase}:**\n\n```json\n#{response.body}\n```"
-              }])
+            # Show a compact JSON representation for advanced users
+            json_preview = begin
+              require "json"
+              JSON.pretty_generate(price_history.to_h)
+            rescue
+              price_history.to_h.inspect
             end
+
+            MCP::Tool::Response.new([{
+              type: "text",
+              text: "**Price History for #{symbol.upcase}:**\n\n#{summary}\n\n```json\n#{json_preview}\n```"
+            }])
           else
             log_warn("Empty response from Schwab API for symbol: #{symbol}")
             MCP::Tool::Response.new([{

data/lib/schwab_mcp/tools/help_tool.rb

@@ -44,7 +44,7 @@ module SchwabMCP
 
       def self.get_general_help
         <<~HELP
-          # 📊 Schwab MCP Server
+          # Schwab MCP Server
 
           ## Available Tools:
 
@@ -56,11 +56,10 @@ module SchwabMCP
           - **get_market_hours_tool**: Get market hours for specified markets
           - **list_movers_tool**: Get top ten movers for a given index
 
-          ### Option Strategy Tools:
-          - **option_strategy_finder_tool**: Find option strategies (iron condor, call spread, put spread)
-          - **preview_order_tool**: Preview an options order before placing (⚠️ SAFE PREVIEW)
-          - **place_order_tool**: Place an options order for execution (⚠️ DESTRUCTIVE)
-          - **replace_order_tool**: Replace an existing order with a new one (⚠️ DESTRUCTIVE)
+          ### Option Order Tools:
+          - **preview_order_tool**: Preview an options order before placing (SAFE PREVIEW)
+          - **place_order_tool**: Place an options order for execution (DESTRUCTIVE)
+          - **replace_order_tool**: Replace an existing order with a new one (DESTRUCTIVE)
 
           ### Account Management:
           - **schwab_account_details_tool**: Get account information using account name mapping
@@ -68,7 +67,7 @@ module SchwabMCP
           - **list_account_orders_tool**: List orders for a specific account using account name mapping
           - **list_account_transactions_tool**: List transactions for a specific account
           - **get_order_tool**: Get detailed information for a specific order by order ID
-          - **cancel_order_tool**: Cancel a specific order by order ID (⚠️ DESTRUCTIVE)
+          - **cancel_order_tool**: Cancel a specific order by order ID (DESTRUCTIVE)
 
           ### Documentation:
           - **help_tool**: This help system
@@ -84,7 +83,6 @@ module SchwabMCP
 
           # Options
           option_chain_tool(symbol: "SPX", contract_type: "ALL")
-          option_strategy_finder_tool(strategy_type: "ironcondor", underlying_symbol: "SPX", expiration_date: "2025-01-17")
           preview_order_tool(account_name: "TRADING_BROKERAGE_ACCOUNT", strategy_type: "ironcondor", price: 1.50, quantity: 1)
 
           # Account Management
@@ -120,7 +118,7 @@ module SchwabMCP
 
       def self.get_tools_help
         <<~HELP
-          # 🔧 Available Tools
+          # Available Tools
 
           ## Market Data & Analysis Tools
 
@@ -197,28 +195,9 @@ module SchwabMCP
 
           **Example**: `option_chain_tool(symbol: "SPX", contract_type: "ALL")`
 
-          ### option_strategy_finder_tool
-          Find option strategies using sophisticated algorithms.
-          **Parameters**:
-          - `strategy_type` (required) - "ironcondor", "callspread", or "putspread"
-          - `underlying_symbol` (required) - e.g., "SPX", "$SPX"
-          - `expiration_date` (required) - Target expiration "YYYY-MM-DD"
-          - `max_delta` (optional) - Maximum delta for short legs (default: 0.15)
-          - `max_spread` (optional) - Maximum spread width (default: 20.0)
-          - `min_credit` (optional) - Minimum credit in dollars (default: 100.0)
-          - `min_open_interest` (optional) - Minimum open interest (default: 0)
-          - `dist_from_strike` (optional) - Min distance from current price (default: 0.07)
-          - `expiration_type`, `settlement_type`, `option_root` (optional) - Filters
-
-          **Examples**:
-          ```
-          option_strategy_finder_tool(strategy_type: "ironcondor", underlying_symbol: "SPX", expiration_date: "2025-01-17")
-          option_strategy_finder_tool(strategy_type: "callspread", underlying_symbol: "SPY", expiration_date: "2025-01-10", max_delta: 0.20, min_credit: 50.0)
-          ```
-
           ## Order Management Tools
 
-          ### preview_order_tool ⚠️ SAFE PREVIEW
+          ### preview_order_tool SAFE PREVIEW
           Preview an options order before placing to validate structure and see estimated costs.
           **Parameters**:
           - `account_name` (required) - Account name ending with '_ACCOUNT'
@@ -234,7 +213,7 @@ module SchwabMCP
           preview_order_tool(account_name: "TRADING_BROKERAGE_ACCOUNT", strategy_type: "callspread", short_symbol: "SPY250117C00600000", long_symbol: "SPY250117C00610000", price: 2.50)
           ```
 
-          ### place_order_tool ⚠️ DESTRUCTIVE OPERATION
+          ### place_order_tool DESTRUCTIVE OPERATION
           Place an options order for execution. **WARNING**: This places real orders with real money.
           **Parameters**: Same as preview_order_tool
           **Safety Features**:
@@ -247,7 +226,7 @@ module SchwabMCP
           place_order_tool(account_name: "TRADING_BROKERAGE_ACCOUNT", strategy_type: "ironcondor", price: 1.50, quantity: 1)
           ```
 
-          ### replace_order_tool ⚠️ DESTRUCTIVE OPERATION
+          ### replace_order_tool DESTRUCTIVE OPERATION
           Replace an existing order with a new one. **WARNING**: Cancels existing order and places new one.
           **Parameters**:
           - `order_id` (required) - ID of existing order to replace
@@ -319,7 +298,7 @@ module SchwabMCP
           get_order_tool(order_id: "987654321", account_name: "IRA_ACCOUNT")
           ```
 
-          ### cancel_order_tool ⚠️ DESTRUCTIVE OPERATION
+          ### cancel_order_tool DESTRUCTIVE OPERATION
           Cancel a specific order by order ID. **WARNING**: This action cannot be undone.
           **Parameters**:
           - `order_id` (required) - The numeric order ID to cancel
@@ -356,7 +335,7 @@ module SchwabMCP
 
       def self.get_setup_help
         <<~HELP
-          # 🚀 Setup Guide
+          # Setup Guide
 
           ## 1. Environment Variables
           Set these required environment variables:

data/lib/schwab_mcp/tools/list_account_orders_tool.rb

@@ -4,6 +4,7 @@ require "json"
 require "date"
 require_relative "../loggable"
 require_relative "../redactor"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -83,64 +84,19 @@ module SchwabMCP
         end
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
-
-          account_id = ENV[account_name]
-          unless account_id
-            available_accounts = ENV.keys.select { |key| key.end_with?('_ACCOUNT') }
-            log_error("Account name '#{account_name}' not found in environment variables")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Account name '#{account_name}' not found in environment variables.\n\nAvailable accounts: #{available_accounts.join(', ')}\n\nTo configure: Set ENV['#{account_name}'] to your account ID."
-            }])
-          end
-
-          log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-          account_numbers_response = client.get_account_numbers
-
-          unless account_numbers_response&.body
-            log_error("Failed to retrieve account numbers")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to retrieve account numbers from Schwab API"
-            }])
-          end
-
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
-
-          account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
-              break
-            end
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
-          unless account_hash
-            log_error("Account ID not found in available accounts")
+          available_accounts = client.available_account_names
+          unless available_accounts.include?(account_name)
+            log_error("Account name '#{account_name}' not found in configured accounts")
             return MCP::Tool::Response.new([{
               type: "text",
-              text: "**Error**: Account ID not found in available accounts. #{account_mappings.length} accounts available."
+              text: "**Error**: Account name '#{account_name}' not found in configured accounts.\n\nAvailable accounts: #{available_accounts.join(', ')}\n\nTo configure: Add the account to your schwab_rb configuration file."
             }])
           end
 
-          log_debug("Found account hash for account ID: #{account_name}")
+          log_debug("Using account name: #{account_name}")
 
           from_datetime = nil
           to_datetime = nil
@@ -171,19 +127,18 @@ module SchwabMCP
 
           log_debug("Fetching orders with params - max_results: #{max_results}, from_datetime: #{from_datetime}, to_datetime: #{to_datetime}, status: #{status}")
 
-          orders_response = client.get_account_orders(
-            account_hash,
+          orders = client.get_account_orders(
+            account_name: account_name,
             max_results: max_results,
             from_entered_datetime: from_datetime,
             to_entered_datetime: to_datetime,
             status: status
           )
 
-          if orders_response&.body
+          if orders
             log_info("Successfully retrieved orders for #{account_name}")
-            orders_data = JSON.parse(orders_response.body)
 
-            formatted_response = format_orders_data(orders_data, account_name, {
+            formatted_response = format_orders_data(orders, account_name, {
               max_results: max_results,
               from_date: from_date,
               to_date: to_date,
@@ -202,12 +157,6 @@ module SchwabMCP
             }])
           end
 
-        rescue JSON::ParserError => e
-          log_error("JSON parsing error: #{e.message}")
-          MCP::Tool::Response.new([{
-            type: "text",
-            text: "**Error**: Failed to parse API response: #{e.message}"
-          }])
         rescue => e
           log_error("Error retrieving orders for #{account_name}: #{e.message}")
           log_debug("Backtrace: #{e.backtrace.first(3).join('\n')}")
@@ -220,7 +169,7 @@ module SchwabMCP
 
       private
 
-      def self.format_orders_data(orders_data, account_name, filters)
+      def self.format_orders_data(orders, account_name, filters)
         friendly_name = account_name.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
 
         formatted = "**Orders for #{friendly_name} (#{account_name}):**\n\n"
@@ -234,26 +183,24 @@ module SchwabMCP
           formatted += "\n"
         end
 
-        if orders_data.is_a?(Array)
-          orders = orders_data
-        else
-          orders = [orders_data]
-        end
+        orders_array = orders.is_a?(Array) ? orders : [orders]
 
         formatted += "**Orders Summary:**\n"
-        formatted += "- Total Orders: #{orders.length}\n\n"
+        formatted += "- Total Orders: #{orders_array.length}\n\n"
 
-        if orders.length > 0
+        if orders_array.length > 0
           formatted += "**Order Details:**\n"
-          orders.each_with_index do |order, index|
+          orders_array.each_with_index do |order, index|
             formatted += format_single_order(order, index + 1)
-            formatted += "\n" unless index == orders.length - 1
+            formatted += "\n" unless index == orders_array.length - 1
           end
         else
           formatted += "No orders found matching the specified criteria.\n"
         end
 
-        redacted_data = Redactor.redact(orders_data)
+        # Convert data objects to hash for redaction and display
+        orders_hash = orders_array.map(&:to_h)
+        redacted_data = Redactor.redact(orders_hash)
         formatted += "\n**Full Response (Redacted):**\n"
         formatted += "```json\n#{JSON.pretty_generate(redacted_data)}\n```"
         formatted
@@ -261,23 +208,22 @@ module SchwabMCP
 
       def self.format_single_order(order, order_num)
         formatted = "**Order #{order_num}:**\n"
-        formatted += "- Order ID: #{order['orderId']}\n" if order['orderId']
-        formatted += "- Status: #{order['status']}\n" if order['status']
-        formatted += "- Order Type: #{order['orderType']}\n" if order['orderType']
-        formatted += "- Session: #{order['session']}\n" if order['session']
-        formatted += "- Duration: #{order['duration']}\n" if order['duration']
-        formatted += "- Entered Time: #{order['enteredTime']}\n" if order['enteredTime']
-        formatted += "- Close Time: #{order['closeTime']}\n" if order['closeTime']
-        formatted += "- Quantity: #{order['quantity']}\n" if order['quantity']
-        formatted += "- Filled Quantity: #{order['filledQuantity']}\n" if order['filledQuantity']
-        formatted += "- Price: $#{format_currency(order['price'])}\n" if order['price']
-
-        if order['orderLegCollection'] && order['orderLegCollection'].any?
+        formatted += "- Order ID: #{order.order_id}\n" if order.order_id
+        formatted += "- Status: #{order.status}\n" if order.status
+        formatted += "- Order Type: #{order.order_type}\n" if order.order_type
+        formatted += "- Duration: #{order.duration}\n" if order.duration
+        formatted += "- Entered Time: #{order.entered_time}\n" if order.entered_time
+        formatted += "- Close Time: #{order.close_time}\n" if order.close_time
+        formatted += "- Quantity: #{order.quantity}\n" if order.quantity
+        formatted += "- Filled Quantity: #{order.filled_quantity}\n" if order.filled_quantity
+        formatted += "- Price: $#{format_currency(order.price)}\n" if order.price
+
+        if order.order_leg_collection && order.order_leg_collection.any?
           formatted += "- Instruments:\n"
-          order['orderLegCollection'].each do |leg|
-            if leg['instrument']
-              symbol = leg['instrument']['symbol']
-              instruction = leg['instruction']
+          order.order_leg_collection.each do |leg|
+            if leg.instrument
+              symbol = leg.instrument.symbol
+              instruction = leg.instruction
               formatted += "  * #{symbol} - #{instruction}\n"
             end
           end

data/lib/schwab_mcp/tools/list_account_transactions_tool.rb

@@ -4,6 +4,7 @@ require "json"
 require "date"
 require_relative "../loggable"
 require_relative "../redactor"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -79,64 +80,19 @@ module SchwabMCP
         end
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
-
-          account_id = ENV[account_name]
-          unless account_id
-            available_accounts = ENV.keys.select { |key| key.end_with?('_ACCOUNT') }
-            log_error("Account name '#{account_name}' not found in environment variables")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Account name '#{account_name}' not found in environment variables.\n\nAvailable accounts: #{available_accounts.join(', ')}\n\nTo configure: Set ENV['#{account_name}'] to your account ID."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
-          log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-          account_numbers_response = client.get_account_numbers
-
-          unless account_numbers_response&.body
-            log_error("Failed to retrieve account numbers")
+          available_accounts = client.available_account_names
+          unless available_accounts.include?(account_name)
+            log_error("Account name '#{account_name}' not found in configured accounts")
             return MCP::Tool::Response.new([{
               type: "text",
-              text: "**Error**: Failed to retrieve account numbers from Schwab API"
+              text: "**Error**: Account name '#{account_name}' not found in configured accounts.\n\nAvailable accounts: #{available_accounts.join(', ')}\n\nTo configure: Add the account to your schwab_rb configuration file."
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
-
-          account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
-              break
-            end
-          end
-
-          unless account_hash
-            log_error("Account ID not found in available accounts")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Account ID not found in available accounts. #{account_mappings.length} accounts available."
-            }])
-          end
-
-          log_debug("Found account hash for account ID: #{account_name}")
+          log_debug("Using account name: #{account_name}")
 
           start_date_obj = nil
           end_date_obj = nil
@@ -167,19 +123,17 @@ module SchwabMCP
 
           log_debug("Fetching transactions with params - start_date: #{start_date_obj}, end_date: #{end_date_obj}, transaction_types: #{transaction_types}, symbol: #{symbol}")
 
-          transactions_response = client.get_transactions(
-            account_hash,
+          transactions = client.get_transactions(
+            account_name: account_name,
             start_date: start_date_obj,
             end_date: end_date_obj,
             transaction_types: transaction_types,
             symbol: symbol
           )
 
-          if transactions_response&.body
+          if transactions
             log_info("Successfully retrieved transactions for #{account_name}")
-            transactions_data = JSON.parse(transactions_response.body)
-
-            formatted_response = format_transactions_data(transactions_data, account_name, {
+            formatted_response = format_transactions_data(transactions, account_name, {
               start_date: start_date,
               end_date: end_date,
               transaction_types: transaction_types,
@@ -199,24 +153,29 @@ module SchwabMCP
           end
 
         rescue JSON::ParserError => e
-          log_error("JSON parsing error: #{e.message}")
+          redactor = Redactor.new
+          err_msg = redactor.redact(e.message)
+          log_error("JSON parsing error: #{err_msg}")
           MCP::Tool::Response.new([{
             type: "text",
-            text: "**Error**: Failed to parse API response: #{e.message}"
+            text: "**Error**: Failed to parse API response: #{err_msg}"
           }])
         rescue => e
-          log_error("Error retrieving transactions for #{account_name}: #{e.message}")
+          redactor = Redactor.new
+          err_msg = redactor.redact(e.message)
+          log_error("Error retrieving transactions for #{account_name}: #{err_msg}")
           log_debug("Backtrace: #{e.backtrace.first(3).join('\n')}")
+
           MCP::Tool::Response.new([{
             type: "text",
-            text: "**Error** retrieving transactions for #{account_name}: #{e.message}\n\n#{e.backtrace.first(3).join('\n')}"
+            text: "**Error** retrieving transactions for #{account_name}: #{err_msg}\n\n#{e.backtrace.first(3).join('\n')}"
           }])
         end
       end
 
       private
 
-      def self.format_transactions_data(transactions_data, account_name, filters)
+      def self.format_transactions_data(transactions, account_name, filters)
         friendly_name = account_name.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
 
         formatted = "**Transactions for #{friendly_name} (#{account_name}):**\n\n"
@@ -230,13 +189,11 @@ module SchwabMCP
           formatted += "\n"
         end
 
-        transactions = transactions_data.is_a?(Array) ? transactions_data : [transactions_data]
-
         formatted += "**Transactions Summary:**\n"
         formatted += "- Total Transactions: #{transactions.length}\n\n"
 
         if transactions.length > 0
-          transactions_by_type = transactions.group_by { |t| t['type'] }
+          transactions_by_type = transactions.group_by { |t| t.type }
           formatted += "**Transactions by Type:**\n"
           transactions_by_type.each do |type, type_transactions|
             formatted += "- #{type}: #{type_transactions.length} transactions\n"
@@ -252,7 +209,7 @@ module SchwabMCP
           formatted += "No transactions found matching the specified criteria.\n"
         end
 
-        redacted_data = Redactor.redact(transactions_data)
+        redacted_data = Redactor.redact(transactions.map(&:to_h))
         formatted += "\n**Full Response (Redacted):**\n"
         formatted += "```json\n#{JSON.pretty_generate(redacted_data)}\n```"
         formatted
@@ -260,41 +217,29 @@ module SchwabMCP
 
       def self.format_single_transaction(transaction, transaction_num)
         formatted = "**Transaction #{transaction_num}:**\n"
-        formatted += "- Activity ID: #{transaction['activityId']}\n" if transaction['activityId']
-        formatted += "- Type: #{transaction['type']}\n" if transaction['type']
-        formatted += "- Status: #{transaction['status']}\n" if transaction['status']
-        formatted += "- Trade Date: #{transaction['tradeDate']}\n" if transaction['tradeDate']
-        formatted += "- Settlement Date: #{transaction['settlementDate']}\n" if transaction['settlementDate']
-        formatted += "- Net Amount: $#{format_currency(transaction['netAmount'])}\n" if transaction['netAmount']
-        formatted += "- Sub Account: #{transaction['subAccount']}\n" if transaction['subAccount']
-        formatted += "- Order ID: #{transaction['orderId']}\n" if transaction['orderId']
-        formatted += "- Position ID: #{transaction['positionId']}\n" if transaction['positionId']
-
-        if transaction['transferItems'] && transaction['transferItems'].any?
+        formatted += "- Activity ID: #{transaction.activity_id}\n" if transaction.activity_id
+        formatted += "- Type: #{transaction.type}\n" if transaction.type
+        formatted += "- Status: #{transaction.status}\n" if transaction.status
+        formatted += "- Trade Date: #{transaction.trade_date}\n" if transaction.trade_date
+        formatted += "- Net Amount: $#{format_currency(transaction.net_amount)}\n" if transaction.net_amount
+        formatted += "- Sub Account: #{transaction.sub_account}\n" if transaction.sub_account
+        formatted += "- Order ID: #{transaction.order_id}\n" if transaction.order_id
+        formatted += "- Position ID: #{transaction.position_id}\n" if transaction.position_id
+
+        if transaction.transfer_items && transaction.transfer_items.any?
           formatted += "- Transfer Items:\n"
-          transaction['transferItems'].each_with_index do |item, i|
+          transaction.transfer_items.each_with_index do |item, i|
             formatted += "  * Item #{i + 1}:\n"
-            formatted += "    - Amount: $#{format_currency(item['amount'])}\n" if item['amount']
-            formatted += "    - Cost: $#{format_currency(item['cost'])}\n" if item['cost']
-            formatted += "    - Price: $#{format_currency(item['price'])}\n" if item['price']
-            formatted += "    - Fee Type: #{item['feeType']}\n" if item['feeType']
-            formatted += "    - Position Effect: #{item['positionEffect']}\n" if item['positionEffect']
+            formatted += "    - Amount: $#{format_currency(item.amount)}\n" if item.amount
+            formatted += "    - Cost: $#{format_currency(item.cost)}\n" if item.cost
+            formatted += "    - Fee Type: #{item.fee_type}\n" if item.fee_type
+            formatted += "    - Position Effect: #{item.position_effect}\n" if item.position_effect
 
-            if item['instrument']
-              instrument = item['instrument']
+            if item.instrument
               formatted += "    - Instrument:\n"
-              formatted += "      * Symbol: #{instrument['symbol']}\n" if instrument['symbol']
-              formatted += "      * Asset Type: #{instrument['assetType']}\n" if instrument['assetType']
-              formatted += "      * Description: #{instrument['description']}\n" if instrument['description']
-              formatted += "      * Closing Price: $#{format_currency(instrument['closingPrice'])}\n" if instrument['closingPrice']
-
-              # Options-specific fields
-              if instrument['assetType'] == 'OPTION'
-                formatted += "      * Strike Price: $#{format_currency(instrument['strikePrice'])}\n" if instrument['strikePrice']
-                formatted += "      * Put/Call: #{instrument['putCall']}\n" if instrument['putCall']
-                formatted += "      * Expiration Date: #{instrument['expirationDate']}\n" if instrument['expirationDate']
-                formatted += "      * Underlying Symbol: #{instrument['underlyingSymbol']}\n" if instrument['underlyingSymbol']
-              end
+              formatted += "      * Symbol: #{item.instrument.symbol}\n" if item.instrument.symbol
+              formatted += "      * Asset Type: #{item.instrument.respond_to?(:asset_type) ? item.instrument.asset_type : nil}\n" if item.instrument.respond_to?(:asset_type) && item.instrument.asset_type
+              formatted += "      * Description: #{item.instrument.description}\n" if item.instrument.description
             end
           end
         end