schwab_mcp 0.1.0 → 0.2.0

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,20 +84,8 @@ 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
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           account_id = ENV[account_name]
           unless account_id
@@ -111,9 +100,9 @@ module SchwabMCP
           log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
           log_debug("Fetching account numbers mapping")
 
-          account_numbers_response = client.get_account_numbers
+          account_numbers = client.get_account_numbers
 
-          unless account_numbers_response&.body
+          unless account_numbers
             log_error("Failed to retrieve account numbers")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -121,22 +110,15 @@ module SchwabMCP
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
+          log_debug("Account numbers retrieved (#{account_numbers.size} accounts found)")
 
-          account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
-              break
-            end
-          end
+          account_hash = account_numbers.find_hash_value(account_id)
 
           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."
+              text: "**Error**: Account ID not found in available accounts. #{account_numbers.size} accounts available."
             }])
           end
 
@@ -171,7 +153,7 @@ 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(
+          orders = client.get_account_orders(
             account_hash,
             max_results: max_results,
             from_entered_datetime: from_datetime,
@@ -179,11 +161,10 @@ module SchwabMCP
             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 +183,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 +195,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 +209,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 +234,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,20 +80,8 @@ 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
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           account_id = ENV[account_name]
           unless account_id
@@ -107,9 +96,9 @@ module SchwabMCP
           log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
           log_debug("Fetching account numbers mapping")
 
-          account_numbers_response = client.get_account_numbers
+          account_numbers = client.get_account_numbers
 
-          unless account_numbers_response&.body
+          unless account_numbers
             log_error("Failed to retrieve account numbers")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -117,22 +106,15 @@ module SchwabMCP
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
+          log_debug("Account mappings retrieved (#{account_numbers.size} accounts found)")
 
-          account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
-              break
-            end
-          end
+          account_hash = account_numbers.find_hash_value(account_id)
 
           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."
+              text: "**Error**: Account ID not found in available accounts. #{account_numbers.size} accounts available."
             }])
           end
 
@@ -167,7 +149,7 @@ 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(
+          transactions = client.get_transactions(
             account_hash,
             start_date: start_date_obj,
             end_date: end_date_obj,
@@ -175,11 +157,9 @@ module SchwabMCP
             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 +179,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 +215,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 +235,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 +243,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']
-
-            if item['instrument']
-              instrument = item['instrument']
+            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
               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

data/lib/schwab_mcp/tools/list_movers_tool.rb

@@ -1,7 +1,7 @@
 require "mcp"
 require "schwab_rb"
-require "json"
 require_relative "../loggable"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -41,44 +41,31 @@ module SchwabMCP
         log_info("Getting movers for index: #{index}, sort_order: #{sort_order}, frequency: #{frequency}")
 
         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
 
           log_debug("Making API request for movers - index: #{index}, sort_order: #{sort_order}, frequency: #{frequency}")
 
-          response = client.get_movers(
+          market_movers = client.get_movers(
             index,
             sort_order: sort_order,
             frequency: frequency
           )
 
-          if response&.body
-            log_info("Successfully retrieved movers for index #{index}")
-            parsed_body = JSON.parse(response.body)
+          if market_movers && market_movers.count > 0
+            log_info("Successfully retrieved #{market_movers.count} movers for index #{index}")
 
-            formatted_output = format_movers_response(parsed_body, index, sort_order, frequency)
+            formatted_output = format_movers_response(market_movers, index, sort_order, frequency)
 
             MCP::Tool::Response.new([{
               type: "text",
               text: formatted_output
             }])
           else
-            log_warn("Empty response from Schwab API for movers")
+            log_warn("No movers data returned from Schwab API for index #{index}")
             MCP::Tool::Response.new([{
               type: "text",
-              text: "**No Data**: Empty response from Schwab API for movers"
+              text: "**No Data**: No movers found for index #{index}"
             }])
           end
 
@@ -94,30 +81,30 @@ module SchwabMCP
 
       private
 
-      def self.format_movers_response(data, index, sort_order, frequency)
+      def self.format_movers_response(market_movers, index, sort_order, frequency)
         header = "**Market Movers for #{index}**"
         header += " (sorted by #{sort_order})" if sort_order
         header += " (frequency filter: #{frequency})" if frequency
         header += "\n\n"
 
-        if data.is_a?(Array) && data.any?
-          movers_list = data.map.with_index(1) do |mover, i|
-            symbol = mover['symbol'] || 'N/A'
-            description = mover['description'] || 'N/A'
-            change = mover['change'] || 0
-            percent_change = mover['percentChange'] || 0
-            volume = mover['totalVolume'] || 0
-            last_price = mover['last'] || 0
+        if market_movers.count > 0
+          movers_list = market_movers.movers.map.with_index(1) do |mover, i|
+            symbol = mover.symbol || 'N/A'
+            description = mover.description || 'N/A'
+            change = mover.net_change || 0
+            percent_change = mover.net_change_percentage || 0
+            volume = mover.volume || 0
+            last_price = mover.last_price || 0
 
             "#{i}. **#{symbol}** - #{description}\n" \
-            "   Last: $#{last_price}\n" \
-            "   Change: #{change >= 0 ? '+' : ''}#{change} (#{percent_change >= 0 ? '+' : ''}#{percent_change}%)\n" \
+            "   Last: $#{sprintf('%.2f', last_price)}\n" \
+            "   Change: #{change >= 0 ? '+' : ''}#{sprintf('%.2f', change)} (#{percent_change >= 0 ? '+' : ''}#{sprintf('%.2f', percent_change)}%)\n" \
             "   Volume: #{volume.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse}"
           end.join("\n\n")
 
           "#{header}#{movers_list}"
         else
-          "#{header}No movers data available.\n\n**Raw Response:**\n```json\n#{JSON.pretty_generate(data)}\n```"
+          "#{header}No movers data available."
         end
       end
     end

data/lib/schwab_mcp/tools/list_schwab_accounts_tool.rb

@@ -3,6 +3,7 @@ require "schwab_rb"
 require "json"
 require_relative "../loggable"
 require_relative "../redactor"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -26,25 +27,13 @@ module SchwabMCP
         log_info("Listing all configured Schwab accounts")
 
         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
 
           log_debug("Fetching account numbers from Schwab API")
-          account_numbers_response = client.get_account_numbers
+          account_numbers = client.get_account_numbers
 
-          unless account_numbers_response&.body
+          unless account_numbers
             log_error("Failed to retrieve account numbers")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -52,10 +41,9 @@ module SchwabMCP
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body)
-          log_debug("Retrieved #{account_mappings.length} accounts from Schwab API")
+          log_debug("Retrieved #{account_numbers.size} accounts from Schwab API")
 
-          configured_accounts = find_configured_accounts(account_mappings)
+          configured_accounts = find_configured_accounts(account_numbers)
 
           if configured_accounts.empty?
             return MCP::Tool::Response.new([{
@@ -64,7 +52,7 @@ module SchwabMCP
             }])
           end
 
-          formatted_response = format_accounts_list(configured_accounts, account_mappings)
+          formatted_response = format_accounts_list(configured_accounts, account_numbers)
 
           MCP::Tool::Response.new([{
             type: "text",
@@ -89,9 +77,9 @@ module SchwabMCP
 
       private
 
-      def self.find_configured_accounts(account_mappings)
-        # Get all account IDs from Schwab API
-        schwab_account_ids = account_mappings.map { |mapping| mapping["accountNumber"] }
+      def self.find_configured_accounts(account_numbers)
+        # Get all account IDs from Schwab API data object
+        schwab_account_ids = account_numbers.account_numbers
 
         # Find environment variables ending with "_ACCOUNT"
         configured = []
@@ -99,11 +87,12 @@ module SchwabMCP
           next unless key.end_with?('_ACCOUNT')
 
           if schwab_account_ids.include?(value)
+            account = account_numbers.find_by_account_number(value)
             configured << {
               name: key,
               friendly_name: friendly_name_from_env_key(key),
               account_id: value,
-              mapping: account_mappings.find { |m| m["accountNumber"] == value }
+              account: account
             }
           end
         end
@@ -116,24 +105,22 @@ module SchwabMCP
         env_key.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
       end
 
-      def self.format_accounts_list(configured_accounts, all_mappings)
+      def self.format_accounts_list(configured_accounts, account_numbers)
         response = "**Configured Schwab Accounts:**\n\n"
 
         configured_accounts.each_with_index do |account, index|
           response += "#{index + 1}. **#{account[:friendly_name]}** (`#{account[:name]}`)\n"
-          response += "   - Account ID: #{Redactor::REDACTED_ACCOUNT_PLACEHOLDER}\n"
           response += "   - Status: ✅ Configured\n\n"
         end
 
         # Show unconfigured accounts (if any)
-        unconfigured = all_mappings.reject do |mapping|
-          configured_accounts.any? { |config| config[:account_id] == mapping["accountNumber"] }
+        unconfigured_accounts = account_numbers.accounts.reject do |account_obj|
+          configured_accounts.any? { |config| config[:account_id] == account_obj.account_number }
         end
 
-        if unconfigured.any?
+        if unconfigured_accounts.any?
           response += "**Unconfigured Accounts Available:**\n\n"
-          unconfigured.each_with_index do |mapping, index|
-            response += "#{index + 1}. Account ID: #{Redactor::REDACTED_ACCOUNT_PLACEHOLDER}\n"
+          unconfigured_accounts.each_with_index do |account_obj, index|
             response += "   - To configure: Set `YOUR_NAME_ACCOUNT=#{Redactor::REDACTED_ACCOUNT_PLACEHOLDER}` in your .env file\n\n"
           end
         end