rename mcpServers to mcp-servers in config; reduce max_context_tokens

Author: alexylon

README.md

@@ -245,17 +245,17 @@ ask = [
   "Bash(unknown_tool)",
 ]
 
-[mcpServers.company-internal]
+[mcp-servers.company-internal]
 command = "/usr/local/bin/company-mcp-server"
 args = ["--config", "/etc/company/mcp-config.json"]
 env = { "COMPANY_API_URL" = "https://internal.company.com" }
 
-[mcpServers.github]
+[mcp-servers.github]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-github"]
 env = { "GITHUB_TOKEN" = "ghp_YOUR_TOKEN" }
 
-[mcpServers.api]
+[mcp-servers.api]
 url = "https://api.example.com/mcp"
 headers = { "Authorization" = "Bearer token123" }
 ```

examples/config.toml

@@ -4,24 +4,24 @@
 # Configure external tools via Model Context Protocol
 
 # Filesystem server
-[mcpServers.filesystem]
+[mcp-servers.filesystem]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-filesystem", "/Users/username/Documents"]
 
 # Company internal server with environment variables
-[mcpServers.company-internal]
+[mcp-servers.company-internal]
 command = "/usr/local/bin/company-mcp-server"
 args = ["--config", "/etc/company/mcp-config.json"]
 env = { "COMPANY_API_URL" = "https://internal.company.com" }
 
 # Database with credentials
-[mcpServers.postgres]
+[mcp-servers.postgres]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-postgres", "postgresql://localhost/mydb"]
 env = { "PGPASSWORD" = "secret123" }
 
 # Remote API server (HTTP)
-[mcpServers.api]
+[mcp-servers.api]
 url = "https://api.example.com/mcp"
 headers = { "Authorization" = "Bearer token123" }
 

examples/mcp_examples.md

@@ -5,7 +5,7 @@ Common MCP server configurations for Sofos.
 ## Filesystem
 
 ```toml
-[mcpServers.filesystem]
+[mcp-servers.filesystem]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/directory"]
 ```
@@ -15,15 +15,15 @@ args = ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/directory"]
 ### PostgreSQL
 
 ```toml
-[mcpServers.postgres]
+[mcp-servers.postgres]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-postgres", "postgresql://localhost/mydb"]
 ```
 
 ### PostgreSQL with credentials
 
 ```toml
-[mcpServers.postgres]
+[mcp-servers.postgres]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-postgres", "postgresql://user@localhost/mydb"]
 env = { "PGPASSWORD" = "secret123" }
@@ -32,7 +32,7 @@ env = { "PGPASSWORD" = "secret123" }
 ### SQLite
 
 ```toml
-[mcpServers.sqlite]
+[mcp-servers.sqlite]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-sqlite", "/path/to/database.db"]
 ```
@@ -42,7 +42,7 @@ args = ["-y", "@modelcontextprotocol/server-sqlite", "/path/to/database.db"]
 ### GitHub
 
 ```toml
-[mcpServers.github]
+[mcp-servers.github]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-github"]
 env = { "GITHUB_TOKEN" = "ghp_YOUR_TOKEN" }
@@ -53,7 +53,7 @@ Get token: https://github.com/settings/tokens
 ### GitLab
 
 ```toml
-[mcpServers.gitlab]
+[mcp-servers.gitlab]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-gitlab"]
 env = { "GITLAB_TOKEN" = "glpat_YOUR_TOKEN" }
@@ -62,7 +62,7 @@ env = { "GITLAB_TOKEN" = "glpat_YOUR_TOKEN" }
 ### Slack
 
 ```toml
-[mcpServers.slack]
+[mcp-servers.slack]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-slack"]
 env = { "SLACK_BOT_TOKEN" = "xoxb-YOUR-TOKEN", "SLACK_TEAM_ID" = "T1234567890" }
@@ -73,7 +73,7 @@ env = { "SLACK_BOT_TOKEN" = "xoxb-YOUR-TOKEN", "SLACK_TEAM_ID" = "T1234567890" }
 ### Google Drive
 
 ```toml
-[mcpServers.gdrive]
+[mcp-servers.gdrive]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-google-drive"]
 env = { "GOOGLE_APPLICATION_CREDENTIALS" = "/path/to/credentials.json" }
@@ -84,15 +84,15 @@ env = { "GOOGLE_APPLICATION_CREDENTIALS" = "/path/to/credentials.json" }
 ### HTTP Server
 
 ```toml
-[mcpServers.custom]
+[mcp-servers.custom]
 url = "https://api.example.com/mcp"
 headers = { "Authorization" = "Bearer YOUR_TOKEN" }
 ```
 
 ### Python Server
 
 ```toml
-[mcpServers.python]
+[mcp-servers.python]
 command = "python"
 args = ["-m", "my_mcp_server"]
 env = { "API_KEY" = "YOUR_KEY" }
@@ -101,7 +101,7 @@ env = { "API_KEY" = "YOUR_KEY" }
 ### Custom Binary with Environment
 
 ```toml
-[mcpServers.company-internal]
+[mcp-servers.company-internal]
 command = "/usr/local/bin/company-mcp-server"
 args = ["--config", "/etc/company/mcp-config.json"]
 env = { "COMPANY_API_URL" = "https://internal.company.com", "LOG_LEVEL" = "debug" }
@@ -110,15 +110,15 @@ env = { "COMPANY_API_URL" = "https://internal.company.com", "LOG_LEVEL" = "debug
 ## Multiple Servers
 
 ```toml
-[mcpServers.docs]
+[mcp-servers.docs]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-filesystem", "/Users/username/Documents"]
 
-[mcpServers.projects]
+[mcp-servers.projects]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-filesystem", "/Users/username/Projects"]
 
-[mcpServers.github]
+[mcp-servers.github]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-github"]
 env = { "GITHUB_TOKEN" = "ghp_YOUR_TOKEN" }

examples/mcp_quickstart.md

@@ -20,7 +20,7 @@ brew install node
 Create `~/.sofos/config.toml`:
 
 ```toml
-[mcpServers.filesystem]
+[mcp-servers.filesystem]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-filesystem", "/Users/yourusername/Documents"]
 ```
@@ -48,7 +48,7 @@ The AI will use tools like `filesystem_list_directory` and `filesystem_read_file
 ### GitHub
 
 ```toml
-[mcpServers.github]
+[mcp-servers.github]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-github"]
 env = { "GITHUB_TOKEN" = "ghp_YOUR_TOKEN" }
@@ -59,15 +59,15 @@ Get token: https://github.com/settings/tokens
 ### PostgreSQL
 
 ```toml
-[mcpServers.postgres]
+[mcp-servers.postgres]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-postgres", "postgresql://localhost/mydb"]
 ```
 
 ### SQLite
 
 ```toml
-[mcpServers.sqlite]
+[mcp-servers.sqlite]
 command = "npx"
 args = ["-y", "@modelcontextprotocol/server-sqlite", "/path/to/database.db"]
 ```

src/config.rs

@@ -14,7 +14,7 @@ impl Default for SofosConfig {
     fn default() -> Self {
         Self {
             max_messages: 500,
-            max_context_tokens: 180_000,
+            max_context_tokens: 165_000,
             max_tool_iterations: 200,
             max_file_size: 10 * 1024 * 1024,
             max_bash_output: 50 * 1024 * 1024,

src/mcp/config.rs

@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct McpConfig {
-    #[serde(rename = "mcpServers", default)]
+    #[serde(rename = "mcp-servers", default)]
     pub mcp_servers: HashMap<String, McpServerConfig>,
 }
 
@@ -96,7 +96,7 @@ mod tests {
     #[test]
     fn test_parse_stdio_server() {
         let toml_content = r#"
-[mcpServers.test-server]
+[mcp-servers.test-server]
 command = "/path/to/server"
 args = ["--port", "8080"]
 env = { "API_KEY" = "secret" }
@@ -117,7 +117,7 @@ env = { "API_KEY" = "secret" }
     #[test]
     fn test_parse_http_server() {
         let toml_content = r#"
-[mcpServers.http-server]
+[mcp-servers.http-server]
 url = "https://example.com/mcp"
 headers = { "Authorization" = "Bearer token" }
 "#;