fix: 修复代码审查发现的多个问题

## Server 模块
- 修复 SolutionAnalyzeTool 导入路径错误（从 complexity.py 导入）
- 更新 docstring 工具数量（14 → 15）
- 补充测试验证 SolutionAnalyzeTool 注册

## Utils 模块
- 新增 macOS 资源限制实现（resource 模块 + preexec_fn）
- 改进异常处理：捕获具体异常类型而非裸 Exception
- 添加日志记录便于调试
- win_job.py 捕获 pywintypes.error

## Tools 模块
- 完善 constraints 参数验证（t_max, sum_n_max）
- 新增 test_configs 参数验证（type, n_min, n_max, t_min, t_max）

## 类型注解
- RunToolMixin.run() 添加返回类型 RunResult
- solution_type 参数限制为 Literal["sol", "brute"]
- solution.py 类型注解统一

## 测试
- 新增 test_configs 验证测试用例
- 测试数量 129 → 131

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: SummerOneTwo

.gitignore

@@ -47,6 +47,9 @@ dmypy.json
 *.swp
 *.swo
 *~
+.claude/
+.codex/
+.opencode/
 
 # Project specific
 *.exe

CHANGELOG.md

@@ -5,6 +5,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2026-04-08
+
+### Bug Fixes
+
+- **Server 模块**
+  - 修复 `SolutionAnalyzeTool` 导入路径错误（从 `complexity.py` 导入而非 `solution.py`）
+  - 更新 docstring 中的工具数量（14 → 15）
+  - 补充测试验证 `SolutionAnalyzeTool` 注册
+
+- **Utils 模块**
+  - 新增 macOS 资源限制实现（使用 `resource` 模块 + `preexec_fn`）
+  - 改进异常处理：将裸 `except Exception: pass` 改为捕获具体异常类型
+  - 添加日志记录（`logging` 模块），便于调试
+  - `win_job.py` 中捕获 `pywintypes.error` 而非通用 `Exception`
+
+- **Tools 模块**
+  - 完善 `constraints` 参数验证：新增 `t_max`、`sum_n_max` 验证
+  - 新增 `test_configs` 参数验证：验证 `type`、`n_min`、`n_max`、`t_min`、`t_max` 字段
+
+- **类型注解**
+  - `RunToolMixin.run()` 添加返回类型注解 `-> RunResult`
+  - `solution_type` 参数类型限制为 `Literal["sol", "brute"]`
+  - `solution.py` 中 `solution_type` 参数类型统一
+
+### Tests
+
+- 新增 `test_problem_generate_tests_test_configs_validation` 测试用例
+- 测试数量从 129 增至 131
+
 ## [0.3.0] - 2026-04-03
 
 ### Features

src/autocode_mcp/server.py

@@ -1,7 +1,7 @@
 """
 MCP Server 入口。
 
-提供 14 个原子工具，基于 AutoCode 论文框架。
+提供 15 个原子工具，基于 AutoCode 论文框架。
 """
 
 from __future__ import annotations

src/autocode_mcp/tools/__init__.py

@@ -3,6 +3,7 @@
 """
 from .base import Tool, ToolResult
 from .checker import CheckerBuildTool
+from .complexity import SolutionAnalyzeTool
 from .file_ops import FileReadTool, FileSaveTool
 from .generator import GeneratorBuildTool, GeneratorRunTool
 from .interactor import InteractorBuildTool
@@ -18,6 +19,7 @@
     "FileSaveTool",
     "SolutionBuildTool",
     "SolutionRunTool",
+    "SolutionAnalyzeTool",
     "StressTestRunTool",
     "ProblemCreateTool",
     "ProblemGenerateTestsTool",

src/autocode_mcp/tools/mixins.py

@@ -6,7 +6,9 @@
 
 from __future__ import annotations
 
-from ..utils.compiler import CompileResult, compile_cpp, run_binary
+from typing import Literal
+
+from ..utils.compiler import CompileResult, RunResult, compile_cpp, run_binary
 from ..utils.resource_limit import get_resource_limit
 
 
@@ -40,10 +42,10 @@ async def run(
         binary_path: str,
         input_data: str,
         problem_dir: str,
-        solution_type: str,
+        solution_type: Literal["sol", "brute"],
         timeout: int | None = None,
         memory_mb: int | None = None,
-    ):
+    ) -> RunResult:
         limit = get_resource_limit(problem_dir, solution_type, timeout=timeout, memory_mb=memory_mb)
         return await run_binary(
             binary_path,

src/autocode_mcp/tools/problem.py

@@ -202,6 +202,7 @@ async def execute(
         """执行测试数据生成。"""
         # 验证 constraints 参数
         if constraints:
+            # 验证 n_max 和 n_min
             n_max = constraints.get("n_max")
             if n_max is not None and n_max <= 0:
                 return ToolResult.fail("n_max must be positive")
@@ -211,6 +212,45 @@ async def execute(
             if n_max is not None and n_min is not None and n_min > n_max:
                 return ToolResult.fail("n_min cannot be greater than n_max")
 
+            # 验证 t_max
+            t_max = constraints.get("t_max")
+            if t_max is not None and t_max <= 0:
+                return ToolResult.fail("t_max must be positive")
+
+            # 验证 sum_n_max
+            sum_n_max = constraints.get("sum_n_max")
+            if sum_n_max is not None and sum_n_max <= 0:
+                return ToolResult.fail("sum_n_max must be positive")
+
+            # 验证约束之间的关系
+            if n_max is not None and sum_n_max is not None and n_max > sum_n_max:
+                return ToolResult.fail("n_max cannot be greater than sum_n_max")
+            if t_max is not None and sum_n_max is not None and t_max > sum_n_max:
+                return ToolResult.fail("t_max cannot be greater than sum_n_max")
+
+        # 验证 test_configs 参数
+        if test_configs:
+            for i, config in enumerate(test_configs):
+                # 验证 type 字段
+                if "type" not in config:
+                    return ToolResult.fail(f"test_configs[{i}]: 'type' is required")
+                if config["type"] not in ("1", "2", "3", "4"):
+                    return ToolResult.fail(f"test_configs[{i}]: 'type' must be one of '1', '2', '3', '4'")
+
+                # 验证 n_min, n_max, t_min, t_max
+                for field in ["n_min", "n_max", "t_min", "t_max"]:
+                    if field not in config:
+                        return ToolResult.fail(f"test_configs[{i}]: '{field}' is required")
+                    val = config[field]
+                    if not isinstance(val, int) or val < 0:
+                        return ToolResult.fail(f"test_configs[{i}]: '{field}' must be a non-negative integer")
+
+                # 验证范围关系
+                if config["n_min"] > config["n_max"]:
+                    return ToolResult.fail(f"test_configs[{i}]: n_min cannot be greater than n_max")
+                if config["t_min"] > config["t_max"]:
+                    return ToolResult.fail(f"test_configs[{i}]: t_min cannot be greater than t_max")
+
         exe_ext = get_exe_extension()
 
         # 检查必要文件
@@ -238,6 +278,7 @@ async def execute(
         errors = []
 
         # 获取测试配置
+        test_configs_list: list[tuple[str, str, str, str, str, str]]
         if test_configs:
             test_configs_list = [
                 (
@@ -253,11 +294,11 @@ async def execute(
         else:
             test_configs_list = self._get_default_configs(constraints)
 
-        for i, config in enumerate(test_configs_list[:test_count], 1):
+        for i, test_cfg in enumerate(test_configs_list[:test_count], 1):
             test_file = os.path.join(tests_dir, f"{i:02d}.in")
             ans_file = os.path.join(tests_dir, f"{i:02d}.ans")
 
-            seed_offset, type_param, n_min, n_max, t_min, t_max = config
+            seed_offset, type_param, n_min, n_max, t_min, t_max = test_cfg
             cmd_args = [
                 str(i + int(seed_offset)),
                 type_param,

src/autocode_mcp/tools/solution.py

@@ -3,6 +3,7 @@
 """
 
 import os
+from typing import Literal
 
 from ..utils.platform import get_exe_extension
 from .base import Tool, ToolResult
@@ -62,7 +63,7 @@ def input_schema(self) -> dict:
     async def execute(
         self,
         problem_dir: str,
-        solution_type: str,
+        solution_type: Literal["sol", "brute"],
         code: str,
         compiler: str = "g++",
     ) -> ToolResult:
@@ -155,7 +156,7 @@ def input_schema(self) -> dict:
     async def execute(
         self,
         problem_dir: str,
-        solution_type: str,
+        solution_type: Literal["sol", "brute"],
         input_data: str,
         timeout: int = 30,
     ) -> ToolResult:

src/autocode_mcp/utils/compiler.py

@@ -10,6 +10,7 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import os
 import shutil
 import sys
@@ -24,6 +25,9 @@
 if TYPE_CHECKING:
     from .win_job import WinJobObject
 
+# 模块级日志器
+_logger = logging.getLogger(__name__)
+
 _cache = CompileCache()
 
 
@@ -193,6 +197,32 @@ async def compile_cpp(
         )
 
 
+def _set_macos_resource_limit(memory_mb: int) -> None:
+    """macOS 上设置进程资源限制（通过 preexec_fn 调用）。
+
+    Args:
+        memory_mb: 内存限制（MB）
+
+    Note:
+        使用 preexec_fn 与 asyncio 存在潜在死锁风险（在极端情况下），
+        但实际触发概率极低。这是 macOS 上设置资源限制的标准方式。
+    """
+    import resource
+
+    memory_bytes = memory_mb * 1024 * 1024
+    # 设置虚拟内存限制 (address space)
+    try:
+        resource.setrlimit(resource.RLIMIT_AS, (memory_bytes, memory_bytes))  # type: ignore[attr-defined]
+    except (ValueError, OSError) as e:
+        _logger.debug("Failed to set RLIMIT_AS on macOS: %s", e)
+
+    # 设置数据段大小限制
+    try:
+        resource.setrlimit(resource.RLIMIT_DATA, (memory_bytes, memory_bytes))  # type: ignore[attr-defined]
+    except (ValueError, OSError) as e:
+        _logger.debug("Failed to set RLIMIT_DATA on macOS: %s", e)
+
+
 async def _force_terminate_process(
     process: asyncio.subprocess.Process,
     job: WinJobObject | None = None,
@@ -207,17 +237,17 @@ async def _force_terminate_process(
     if job:
         try:
             job.terminate()
-        except Exception:
-            pass
+        except OSError as e:
+            _logger.debug("Job object terminate failed: %s", e)
 
     # 再尝试正常终止
     try:
         process.kill()
     except ProcessLookupError:
         # 进程已经不存在
         return
-    except Exception:
-        pass
+    except OSError as e:
+        _logger.debug("Failed to kill process: %s", e)
 
     # 等待进程退出，设置超时防止卡住
     try:
@@ -226,8 +256,10 @@ async def _force_terminate_process(
         # 如果 2 秒后进程仍未退出，再次尝试强制终止
         try:
             process.kill()
-        except Exception:
-            pass
+        except ProcessLookupError:
+            return
+        except OSError as e:
+            _logger.debug("Second kill attempt failed: %s", e)
 
 
 async def _run_process(
@@ -257,17 +289,21 @@ async def _run_process(
 
                     job = WinJobObject(memory_mb=memory_mb, timeout_sec=timeout)
                     job.assign_process(process.pid)
-                except Exception:
-                    # Job Object 创建失败，但仍需确保进程可控
+                except (OSError, RuntimeError) as e:
+                    # Job Object 创建/分配失败，记录日志并继续（进程仍可运行）
+                    _logger.warning("Failed to setup Windows Job Object: %s", e)
                     job = None
         elif sys.platform == "darwin":
+            # macOS: 使用 preexec_fn 设置资源限制
             process = await asyncio.create_subprocess_exec(
                 *cmd,
                 stdin=asyncio.subprocess.PIPE,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
+                preexec_fn=lambda: _set_macos_resource_limit(memory_mb),
             )
         else:
+            # Linux: 使用 prlimit 设置资源限制
             memory_bytes = memory_mb * 1024 * 1024
             process = await asyncio.create_subprocess_exec(
                 "prlimit",
@@ -313,7 +349,7 @@ async def _run_process(
             error=f"Binary not found or prlimit unavailable: {cmd[0]}",
         )
     except Exception as e:
-        # 异常时确保进程被终止
+        # 最后防线：捕获所有异常确保进程被终止，防止资源泄漏
         if process:
             await _force_terminate_process(process, job)
         return RunResult(

src/autocode_mcp/utils/win_job.py

@@ -16,6 +16,7 @@
 _IS_WINDOWS = sys.platform == "win32"
 
 if _IS_WINDOWS:
+    import pywintypes
     import win32api
     import win32con
     import win32job
@@ -127,7 +128,9 @@ def assign_process(self, pid: int) -> None:
                 win32con.PROCESS_SET_QUOTA | win32con.PROCESS_TERMINATE, False, pid
             )
             win32job.AssignProcessToJobObject(self.job_handle, process_handle)
-        except Exception as e:
+        except pywintypes.error as e:
+            raise RuntimeError(f"Failed to assign process {pid} to job object: {e}") from e
+        except OSError as e:
             raise RuntimeError(f"Failed to assign process {pid} to job object: {e}") from e
 
     def terminate(self) -> None:

tests/test_server.py

@@ -78,6 +78,7 @@ def test_all_tools_registered():
         ProblemCreateTool,
         ProblemGenerateTestsTool,
         ProblemPackPolygonTool,
+        SolutionAnalyzeTool,
         SolutionBuildTool,
         SolutionRunTool,
         StressTestRunTool,
@@ -90,6 +91,7 @@ def test_all_tools_registered():
         FileSaveTool(),
         SolutionBuildTool(),
         SolutionRunTool(),
+        SolutionAnalyzeTool(),
         StressTestRunTool(),
         ProblemCreateTool(),
         ProblemGenerateTestsTool(),