feat: improve type safety and dependency management

- Add type safety fixes for mcp_servers dictionary access in options.py and claude.py
- Remove unused tomli-w dependency from pyproject.toml
- Update pre-commit hooks: ruff v0.12.2→v0.12.8, mypy v1.16.1→v1.17.1, pre-commit-hooks v5.0.0→v6.0.0
- Add pyjwt>=2.10.0 to mypy additional dependencies for proper type checking
- Update anthropic SDK to v0.63.0 and charset-normalizer to v3.4.3
- Enhance test type safety with proper casting for mcp_servers dictionary access

These changes fix type safety issues where mcp_servers could be None but was accessed as a dictionary, remove an unused dependency, and update development tooling for better reliability.

Author: CaddyGlow

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   # Ruff linting and formatting
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.8
     hooks:
       # Ruff linting (matches: make lint -> uv run ruff check .)
       - id: ruff
@@ -16,7 +16,7 @@ repos:
 
   # MyPy type checking (matches: make typecheck -> uv run mypy .)
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.1
+    rev: v1.17.1
     hooks:
       - id: mypy
         name: mypy type check
@@ -58,6 +58,7 @@ repos:
           - textual>=3.7.1
           - aiofiles>=24.1.0
           - types-aiofiles>=24.0.0
+          - pyjwt>=2.10.0
         args: [--config-file=pyproject.toml]
         exclude: ^(docs/|examples/)
 
@@ -81,7 +82,7 @@ repos:
 
   # General file checks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       # Basic file checks
       - id: trailing-whitespace

ccproxy/claude_sdk/options.py

@@ -61,7 +61,7 @@ def create_options(
             # Extract configuration values with proper types
             mcp_servers = (
                 configured_opts.mcp_servers.copy()
-                if configured_opts.mcp_servers
+                if isinstance(configured_opts.mcp_servers, dict)
                 else {}
             )
             permission_prompt_tool_name = configured_opts.permission_prompt_tool_name

ccproxy/config/claude.py

@@ -226,7 +226,7 @@ def validate_claude_code_options(cls, v: Any, info: Any) -> Any:
             # Extract default values as a dict for merging
             default_values = {
                 "mcp_servers": dict(defaults.mcp_servers)
-                if defaults.mcp_servers
+                if isinstance(defaults.mcp_servers, dict)
                 else {},
                 "permission_prompt_tool_name": defaults.permission_prompt_tool_name,
             }

pyproject.toml

@@ -31,7 +31,6 @@ dependencies = [
   "textual>=3.7.1",
   "claude-code-sdk>=0.0.19",
   "pyjwt>=2.10.1",
-  "tomli-w>=1.2.0",
 ]
 
 [build-system]

tests/unit/config/test_claude_sdk_options.py

@@ -1,5 +1,7 @@
 """Tests for Claude SDK options handling."""
 
+from typing import Any, cast
+
 from ccproxy.claude_sdk.options import OptionsHandler
 from ccproxy.config.claude import ClaudeSettings
 from ccproxy.config.settings import Settings
@@ -38,12 +40,10 @@ def test_create_options_with_default_mcp_configuration(self):
         # Should have the default MCP server configuration
         assert hasattr(options, "mcp_servers")
         assert options.mcp_servers is not None
-        assert "confirmation" in options.mcp_servers
-        assert options.mcp_servers["confirmation"].get("type") == "sse"
-        assert (
-            options.mcp_servers["confirmation"].get("url")
-            == "http://127.0.0.1:8000/mcp"
-        )
+        mcp_servers = cast(dict[str, Any], options.mcp_servers)
+        assert "confirmation" in mcp_servers
+        assert mcp_servers["confirmation"].get("type") == "sse"
+        assert mcp_servers["confirmation"].get("url") == "http://127.0.0.1:8000/mcp"
         # Should have the default permission tool name
         assert hasattr(options, "permission_prompt_tool_name")
         assert (
@@ -68,8 +68,9 @@ def test_create_options_with_custom_configuration(self):
 
         assert options.model == "claude-3-5-sonnet-20241022"
         # Should have the custom MCP server configuration
-        assert "custom" in options.mcp_servers
-        assert options.mcp_servers["custom"].get("url") == "http://localhost:9000/mcp"
+        mcp_servers = cast(dict[str, Any], options.mcp_servers)
+        assert "custom" in mcp_servers
+        assert mcp_servers["custom"].get("url") == "http://localhost:9000/mcp"
         # Should have the custom permission tool name
         assert options.permission_prompt_tool_name == "custom_permission_tool"
         # Should have the custom max thinking tokens
@@ -94,7 +95,8 @@ def test_create_options_api_parameters_override_settings(self):
         assert options.system_prompt == "Custom system prompt"
         assert options.max_thinking_tokens == 20000
         # Should still have the default MCP configuration
-        assert "confirmation" in options.mcp_servers
+        mcp_servers = cast(dict[str, Any], options.mcp_servers)
+        assert "confirmation" in mcp_servers
         assert (
             options.permission_prompt_tool_name == "mcp__confirmation__check_permission"
         )
@@ -118,7 +120,9 @@ def test_create_options_with_kwargs_override(self):
         # Should override the default permission tool name
         assert options.permission_prompt_tool_name == "override_tool"
         # Should still have the default MCP configuration
-        assert "confirmation" in options.mcp_servers
+
+        mcp_servers = cast(dict[str, Any], options.mcp_servers)
+        assert "confirmation" in mcp_servers
 
     def test_create_options_preserves_all_configuration_attributes(self):
         """Test that all attributes from configuration are properly copied."""
@@ -146,9 +150,10 @@ def test_create_options_preserves_all_configuration_attributes(self):
         options = handler.create_options(model="claude-3-5-sonnet-20241022")
 
         # Verify all attributes are preserved
-        assert len(options.mcp_servers) == 2
-        assert "confirmation" in options.mcp_servers
-        assert "filesystem" in options.mcp_servers
+        mcp_servers = cast(dict[str, Any], options.mcp_servers)
+        assert len(mcp_servers) == 2
+        assert "confirmation" in mcp_servers
+        assert "filesystem" in mcp_servers
         assert (
             options.permission_prompt_tool_name == "mcp__confirmation__check_permission"
         )