schwab_mcp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7680eeeed2f4a22cf70f836af9ab019c60e6de76867408acf79d0ffdd3217b33
-  data.tar.gz: e236d0f991b031b84873fbc8244b623dd74603ac3ab043d3586a987a8656eb37
+  metadata.gz: be351ba4378eab6d224a3b690a8feb205491fa9cd264c3e46038c48f8d4f7227
+  data.tar.gz: 0ff6dd0f16abda8d20d070143f777ed4685322d2f0f8c303d9e3990344da225b
 SHA512:
-  metadata.gz: 678fb6af3f9de96315e9798fa5f8aebd4dde3bcc102859b7c3e761aefb2b7d3ec591b56267978936114099a68f746a3c43b0a72abf4bd711c83822758053f63f
-  data.tar.gz: ae505ca27dbf4f8579279a05845befed68fc6c1690cdd9d469b585239827e931e3726381795d60fb8c086d2de70fdfc0966fc24ea4b9f380c3f4311846a4ec58
+  metadata.gz: b80dee8bbeb80f3eb7940bafe0e43aedfa266c2981087b6865de8de79b8a12578a6e0fd5316918a942b012318b5f8e466f8655bf43fbd75732c0436c379f7bb2
+  data.tar.gz: 83a841a0a278a2a53ccc5d141365a0013829a863e1dd0d54784648313175dd7a463071c34b969751c4508575260e28298c26ba0310ac12b83a13342afcd0282c

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.3.0] - 2025-10-20
+
+### Added
+- Refactored account management to use user-defined account names instead of directly referencing account numbers. ([#7](https://github.com/jwplatta/schwab_mcp/pull/7))
+- Updated dependency `schwab_rb` to version `0.4.0`. ([#6](https://github.com/jwplatta/schwab_mcp/pull/6))
+
+### Changed
+- Refactored order tools to use the `schwab_rb` order factory for improved modularity. ([#5](https://github.com/jwplatta/schwab_mcp/pull/5))
+
+### Infrastructure
+- Added GitHub Actions workflows for Claude integration. ([#3](https://github.com/jwplatta/schwab_mcp/pull/3), [#4](https://github.com/jwplatta/schwab_mcp/pull/4))
+
 ## [0.1.0] - 2025-07-10
 
 - Initial release

data/README.md

@@ -40,7 +40,7 @@ Create a `.env` file in your project root with the following required variables:
 SCHWAB_API_KEY=your_schwab_api_key
 SCHWAB_APP_SECRET=your_schwab_app_secret
 SCHWAB_CALLBACK_URI=your_callback_uri
-TOKEN_PATH=path/to/your/token.json
+SCHWAB_TOKEN_PATH=path/to/your/token.json
 ```
 
 ### Running the MCP Server
@@ -51,12 +51,6 @@ Start the server using the provided executable:
 bundle exec exe/schwab_mcp
 ```
 
-Or use the convenience script:
-
-```bash
-./start_mcp_server.sh
-```
-
 ### Token Management
 
 The gem includes utility scripts for managing Schwab API authentication tokens:

data/debug_env.rb

@@ -6,10 +6,10 @@ puts "=== Environment Variables ==="
 puts "SCHWAB_API_KEY: #{ENV['SCHWAB_API_KEY'] ? '[SET]' : '[NOT SET]'}"
 puts "SCHWAB_APP_SECRET: #{ENV['SCHWAB_APP_SECRET'] ? '[SET]' : '[NOT SET]'}"
 puts "APP_CALLBACK_URL: #{ENV['APP_CALLBACK_URL'] ? '[SET]' : '[NOT SET]'}"
-puts "TOKEN_PATH: #{ENV['TOKEN_PATH'] ? '[SET]' : '[NOT SET]'}"
+puts "SCHWAB_TOKEN_PATH: #{ENV['SCHWAB_TOKEN_PATH'] ? '[SET]' : '[NOT SET]'}"
 
 puts "\n=== Testing Token File ==="
-token_path = ENV['TOKEN_PATH'] || './token.json'
+token_path = ENV['SCHWAB_TOKEN_PATH'] || './token.json'
 puts "Checking token file at: #{token_path}"
 puts "Token file exists: #{File.exist?(token_path)}"
 

data/exe/schwab_mcp

@@ -9,22 +9,22 @@ required_vars = [
   'SCHWAB_API_KEY',
   'SCHWAB_APP_SECRET',
   'SCHWAB_CALLBACK_URI',
-  'TOKEN_PATH'
+  'SCHWAB_TOKEN_PATH'
 ]
 missing_vars = required_vars.select { |var| ENV[var].nil? || ENV[var].empty? }
 
 unless missing_vars.empty?
-  STDERR.puts "[SCRIPT] Missing required environment variables: #{missing_vars.join(', ')}"
+  STDERR.puts "Missing required environment variables: #{missing_vars.join(', ')}"
   exit 1
 end
 
-STDERR.puts "[SCRIPT] All required environment variables are set."
+STDERR.puts "All required environment variables are set."
 
 begin
-  STDERR.puts "[SCRIPT] Starting Schwab MCP server..."
+  STDERR.puts "Starting Schwab MCP server..."
   SchwabMCP::Server.new.start
 rescue StandardError => e
-  STDERR.puts "[SCRIPT] Error starting Schwab MCP server: #{e.message}"
+  STDERR.puts "Error starting Schwab MCP server: #{e.message}"
   STDERR.puts e.backtrace.join("\n")
   exit 1
 end

data/exe/schwab_token_refresh

@@ -13,7 +13,7 @@ required_vars = [
   'SCHWAB_API_KEY',
   'SCHWAB_APP_SECRET',
   'SCHWAB_CALLBACK_URI',
-  'TOKEN_PATH'
+  'SCHWAB_TOKEN_PATH'
 ]
 missing_vars = required_vars.select { |var| ENV[var].nil? || ENV[var].empty? }
 
@@ -22,7 +22,7 @@ unless missing_vars.empty?
   exit 1
 end
 
-token_path = ENV['TOKEN_PATH']
+token_path = ENV['SCHWAB_TOKEN_PATH']
 puts "Token path: #{token_path}"
 
 begin

data/exe/schwab_token_reset

@@ -12,38 +12,39 @@ required_vars = [
   'SCHWAB_API_KEY',
   'SCHWAB_APP_SECRET',
   'SCHWAB_CALLBACK_URI',
-  'TOKEN_PATH'
+  'SCHWAB_TOKEN_PATH',
+  'SCHWAB_HOME',
 ]
 missing_vars = required_vars.select { |var| ENV[var].nil? || ENV[var].empty? }
 
 unless missing_vars.empty?
-  puts "❌ Missing required environment variables: #{missing_vars.join(', ')}"
+  puts "Missing required environment variables: #{missing_vars.join(', ')}"
   exit 1
 end
 
-token_path = ENV['TOKEN_PATH']
+token_path = ENV['SCHWAB_TOKEN_PATH']
 puts "Token path: #{token_path}"
 
 if File.exist?(token_path)
-  puts "🗑️  Deleting existing token file: #{token_path}"
+  puts "Deleting existing token file: #{token_path}"
   File.delete(token_path)
-  puts "✅ Token file deleted successfully"
+  puts "Token file deleted successfully"
 else
-  puts "ℹ️  Token file doesn't exist at: #{token_path}"
+  puts "Token file doesn't exist at: #{token_path}"
 end
 
 refresh_script_path = File.join(File.dirname(__FILE__), 'schwab_token_refresh')
-puts "🔄 Calling token refresh script: #{refresh_script_path}"
+puts "Calling token refresh script: #{refresh_script_path}"
 
 begin
   result = system(refresh_script_path)
   if result
-    puts "✅ Token reset and refresh completed successfully"
+    puts "Token reset and refresh completed successfully"
   else
-    puts "❌ Token refresh script failed"
+    puts "Token refresh script failed"
     exit 1
   end
 rescue => e
-  puts "❌ Failed to execute token refresh script: #{e.message}"
+  puts "Failed to execute token refresh script: #{e.message}"
   exit 1
 end

data/lib/schwab_mcp/schwab_client_factory.rb

@@ -13,7 +13,7 @@ module SchwabMCP
           ENV['SCHWAB_API_KEY'],
           ENV['SCHWAB_APP_SECRET'],
           ENV['SCHWAB_CALLBACK_URI'],
-          ENV['TOKEN_PATH']
+          ENV['SCHWAB_TOKEN_PATH']
         )
 
         unless client

data/lib/schwab_mcp/tools/cancel_order_tool.rb

@@ -56,50 +56,19 @@ module SchwabMCP
           client = SchwabClientFactory.create_client
           return SchwabClientFactory.client_error_response unless client
 
-          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")
+          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 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."
+              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 ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-
-          account_numbers = client.get_account_numbers # returns SchwabRb::DataObjects::AccountNumbers
-          unless account_numbers && account_numbers.respond_to?(:accounts)
-            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_hash = nil
-          account_numbers.accounts.each do |acct|
-            if acct.account_number.to_s == account_id.to_s
-              account_hash = acct.hash_value
-              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_numbers.accounts.length} accounts available."
-            }])
-          end
-
-          log_debug("Found account hash for account ID: #{account_name}")
+          log_debug("Using account name: #{account_name}")
           log_debug("Verifying order exists before attempting cancellation")
 
-
-          order = client.get_order(order_id, account_hash) # returns SchwabRb::DataObjects::Order
+          order = client.get_order(order_id, account_name: account_name) # returns SchwabRb::DataObjects::Order
           unless order
             log_warn("Order not found or empty response for order ID: #{order_id}")
             return MCP::Tool::Response.new([{
@@ -121,7 +90,7 @@ module SchwabMCP
           end
 
           log_info("Attempting to cancel order ID: #{order_id} (Status: #{order_status})")
-          cancel_response = client.cancel_order(order_id, account_hash)
+          cancel_response = client.cancel_order(order_id, account_name: account_name)
 
           if cancel_response.respond_to?(:status) && cancel_response.status == 200
             log_info("Successfully cancelled order ID: #{order_id}")

data/lib/schwab_mcp/tools/get_account_names_tool.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "mcp"
+require_relative "../loggable"
+require "schwab_rb"
+
+module SchwabMCP
+  module Tools
+    class GetAccountNamesTool < MCP::Tool
+      extend Loggable
+      description "Get a list of configured Schwab account names"
+
+      input_schema(
+        properties: {
+          topic: {
+            type: "string",
+            description: "Asking about a specific topic related to account names (optional)"
+          }
+        },
+        required: []
+      )
+
+      annotations(
+        title: "Get Account Names",
+        read_only_hint: true,
+        destructive_hint: false,
+        idempotent_hint: true
+      )
+
+      def self.call(topic: nil, server_context:)
+        account_names = SchwabRb::AccountHashManager.new.available_account_names
+        acct_names_content = if account_names && !account_names.empty?
+          formatted_names = account_names.map { |name| "- #{name}" }.join("\n")
+          "Configured Schwab Account Names:\n\n#{formatted_names}"
+        else
+          <<~NO_ACCOUNTS
+            No Schwab Account Names Configured
+
+            You need to configure your Schwab account names in the account_names.json file.
+
+            This file should be located in your schwab_home directory (typically ~/.schwab_rb/).
+
+            For detailed setup instructions, please refer to:
+            https://github.com/jwplatta/schwab_rb/blob/main/doc/ACCOUNT_MANAGEMENT.md
+
+            The account_names.json file should map friendly names to your Schwab account hashes.
+          NO_ACCOUNTS
+        end
+
+        MCP::Tool::Response.new([{
+          type: "text",
+          text: acct_names_content
+        }])
+      end
+
+    end
+  end
+end

data/lib/schwab_mcp/tools/get_order_tool.rb

@@ -57,49 +57,19 @@ module SchwabMCP
           client = SchwabClientFactory.create_client
           return SchwabClientFactory.client_error_response unless client
 
-          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")
+          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 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."
+              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 ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-
-          account_numbers = client.get_account_numbers # returns SchwabRb::DataObjects::AccountNumbers
-          unless account_numbers && account_numbers.respond_to?(:accounts)
-            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_hash = nil
-          account_numbers.accounts.each do |acct|
-            if acct.account_number.to_s == account_id.to_s
-              account_hash = acct.hash_value
-              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_numbers.accounts.length} accounts available."
-            }])
-          end
-
-          log_debug("Found account hash for account ID: #{account_name}")
+          log_debug("Using account name: #{account_name}")
           log_debug("Fetching order details for order ID: #{order_id}")
 
-          order = client.get_order(order_id, account_hash) # returns SchwabRb::DataObjects::Order
+          order = client.get_order(order_id, account_name: account_name) # returns SchwabRb::DataObjects::Order
           if order
             log_info("Successfully retrieved order details for order ID: #{order_id}")
             formatted_response = format_order_object(order, order_id, account_name)

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:
 
@@ -57,9 +57,9 @@ module SchwabMCP
           - **list_movers_tool**: Get top ten movers for a given index
 
           ### 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)
+          - **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
@@ -67,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
@@ -118,7 +118,7 @@ module SchwabMCP
 
       def self.get_tools_help
         <<~HELP
-          # 🔧 Available Tools
+          # Available Tools
 
           ## Market Data & Analysis Tools
 
@@ -197,7 +197,7 @@ module SchwabMCP
 
           ## 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'
@@ -213,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**:
@@ -226,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
@@ -298,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
@@ -335,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

@@ -87,42 +87,16 @@ module SchwabMCP
           client = SchwabClientFactory.create_client
           return SchwabClientFactory.client_error_response unless client
 
-          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")
+          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 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."
+              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 ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-          account_numbers = client.get_account_numbers
-
-          unless account_numbers
-            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
-
-          log_debug("Account numbers retrieved (#{account_numbers.size} accounts found)")
-
-          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_numbers.size} accounts available."
-            }])
-          end
-
-          log_debug("Found account hash for account ID: #{account_name}")
+          log_debug("Using account name: #{account_name}")
 
           from_datetime = nil
           to_datetime = nil
@@ -154,7 +128,7 @@ module SchwabMCP
           log_debug("Fetching orders with params - max_results: #{max_results}, from_datetime: #{from_datetime}, to_datetime: #{to_datetime}, status: #{status}")
 
           orders = client.get_account_orders(
-            account_hash,
+            account_name: account_name,
             max_results: max_results,
             from_entered_datetime: from_datetime,
             to_entered_datetime: to_datetime,

data/lib/schwab_mcp/tools/list_account_transactions_tool.rb

@@ -83,42 +83,16 @@ module SchwabMCP
           client = SchwabClientFactory.create_client
           return SchwabClientFactory.client_error_response unless client
 
-          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")
+          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 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."
+              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 ID: [REDACTED] for account name: #{account_name}")
-          log_debug("Fetching account numbers mapping")
-
-          account_numbers = client.get_account_numbers
-
-          unless account_numbers
-            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
-
-          log_debug("Account mappings retrieved (#{account_numbers.size} accounts found)")
-
-          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_numbers.size} 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
@@ -150,7 +124,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 = client.get_transactions(
-            account_hash,
+            account_name: account_name,
             start_date: start_date_obj,
             end_date: end_date_obj,
             transaction_types: transaction_types,

data/lib/schwab_mcp/tools/option_chain_tool.rb

@@ -16,8 +16,8 @@ module SchwabMCP
         properties: {
           symbol: {
             type: "string",
-            description: "Instrument symbol (e.g., 'AAPL', 'TSLA')",
-            pattern: "^[A-Za-z]{1,5}$"
+            description: "Instrument symbol (e.g., 'AAPL', 'TSLA', '$SPX')",
+            pattern: '^[\$\^]?[A-Za-z0-9]{1,5}$'
           },
           contract_type: {
             type: "string",
@@ -169,7 +169,7 @@ module SchwabMCP
           params[:entitlement] = entitlement if entitlement
 
           log_debug("Making API request for option chain with params: #{params}")
-          option_chain = client.get_option_chain(symbol.upcase, return_data_objects: true, **params)
+          option_chain = client.get_option_chain(symbol.upcase, **params)
 
           if option_chain
             log_info("Successfully retrieved option chain for #{symbol}")