super-code-assistant 3.3.6__py3-none-any.whl

mcp/loader.py

@@ -0,0 +1,80 @@
+"""MCP Loader — 读取 MCP 配置，启动所有 MCP server 并返回工具列表。
+
+配置文件格式：
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"],
+      "env": {}          // 可选，追加到当前环境变量
+    }
+  }
+}
+
+查找顺序：当前工作目录（.mcp.json）→ exe 同级目录（mcp.json）→ 全局配置目录（~/.config/super-code/mcp.json）
+"""
+from __future__ import annotations
+
+import json
+import os
+import shutil
+from pathlib import Path
+
+from core.tool import Tool
+from mcp.client import MCPClient
+from mcp.tool_proxy import build_mcp_tools
+
+# 全局持有所有已启动的 client，程序退出时统一关闭
+_active_clients: list[MCPClient] = []
+
+
+def load_mcp_tools(cwd: str | Path = ".") -> list[Tool]:
+    """读取配置、启动 server、返回所有 MCP 工具代理。启动失败的 server 跳过并打印警告。"""
+    config = _find_config(Path(cwd))
+    if config is None:
+        return []
+
+    servers = config.get("mcpServers", {})
+    tools: list[Tool] = []
+
+    for name, spec in servers.items():  # 这里的servers是个字典，所以上述注释是没问题的
+        command = spec.get("command", "")
+        # Windows 下 Popen 不会自动补 .cmd/.bat 后缀，需用 shutil.which 解析为绝对路径
+        resolved = shutil.which(command)
+        if resolved:
+            command = resolved
+        args = spec.get("args", [])
+        # 合并当前环境变量 + server 自定义 env（server 可能需要 API key 等）
+        env = {**os.environ, **spec.get("env", {})} if spec.get("env") else None
+
+        try:
+            client = MCPClient(name=name, command=command, args=args, env=env)
+            _active_clients.append(client)
+            server_tools = build_mcp_tools(client)
+            tools.extend(server_tools)
+            print(f"[MCP] {name}: {len(server_tools)} tool(s) loaded")
+        except Exception as e:
+            # 单个 server 启动失败不影响整体，打印警告继续
+            print(f"[MCP] Warning: failed to start server '{name}': {e}")
+
+    return tools
+
+
+def shutdown_mcp():
+    """关闭所有 MCP server 子进程，在程序退出时调用。"""
+    for client in _active_clients:
+        client.close()
+    _active_clients.clear()
+
+
+def _find_config(cwd: Path) -> dict | None:
+    """按优先级查找 .mcp.json：项目目录 → 便携目录(exe同级) → 全局配置目录。"""
+    from core.config import get_portable_dir
+    portable_mcp = get_portable_dir() / "mcp.json"
+    for candidate in [cwd / ".mcp.json", portable_mcp, Path.home() / ".config" / "super-code" / "mcp.json"]:
+        if candidate.exists():
+            try:
+                return json.loads(candidate.read_text(encoding="utf-8"))
+            except Exception:
+                return None
+    return None

mcp/tool_proxy.py

@@ -0,0 +1,59 @@
+"""MCP Tool Proxy — 将 MCP server 的每个工具包装成项目通用的 Tool 实例。
+
+工具命名规则：mcp__{serverName}__{toolName}
+  - 双下划线分隔，避免与本地工具名冲突
+  - LLM 看到的就是这个名字，调用时也用这个名字
+"""
+from __future__ import annotations
+
+from core.tool import Tool, ToolResult
+from mcp.client import MCPClient
+
+
+class MCPToolProxy(Tool):
+    """代理单个 MCP 工具，把调用转发给对应的 MCPClient。"""
+
+    def __init__(self, client: MCPClient, tool_def: dict):
+        self._client = client
+        # 原始工具名（server 内部使用）
+        self._tool_name = tool_def["name"]
+        # 对外暴露的名字加上 server 前缀，避免冲突
+        self._name = f"mcp__{client.name}__{self._tool_name}"
+        self._description = tool_def.get("description", "")
+        # inputSchema 直接透传 MCP server 返回的 JSON Schema
+        self._input_schema = tool_def.get("inputSchema", {"type": "object", "properties": {}})
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def description(self) -> str:
+        return self._description
+
+    @property
+    def input_schema(self) -> dict:
+        return self._input_schema
+
+    def is_read_only(self) -> bool:
+        # MCP 工具默认需要权限确认，保守处理
+        return False
+
+    def get_activity_description(self, **kwargs) -> str | None:
+        return f"MCP {self._client.name}: {self._tool_name}"
+
+    def execute(self, **kwargs) -> ToolResult:
+        try:
+            result = self._client.call_tool(self._tool_name, kwargs)
+            return ToolResult(content=result)
+        except Exception as e:
+            return ToolResult(content=f"MCP error: {e}", is_error=True)
+
+
+def build_mcp_tools(client: MCPClient) -> list[MCPToolProxy]:
+    """从一个 MCP server 获取所有工具并返回代理列表。"""
+    try:
+        tool_defs = client.list_tools()
+    except Exception as e:
+        raise RuntimeError(f"Failed to list tools from MCP server '{client.name}': {e}") from e
+    return [MCPToolProxy(client, td) for td in tool_defs]

super_code_assistant-3.3.6.dist-info/METADATA

@@ -0,0 +1,45 @@
+Metadata-Version: 2.4
+Name: super-code-assistant
+Version: 3.3.6
+Summary: Minimal AI coding assistant
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: openai>=1.0
+Requires-Dist: rich>=13.0
+Requires-Dist: python-dotenv>=1.0
+Requires-Dist: prompt_toolkit>=3.0
+
+# super-code
+
+Minimal AI coding assistant —— 命令行交互式 AI 编码助手。
+
+## 安装
+
+```bash
+pip install super-code-assistant
+```
+
+安装后**首次运行**自动初始化配置到 `~/.config/super-code/super-code.json`，
+编辑该文件填入 api_key 即可使用。
+
+## 配置
+
+配置按优先级加载：CLI 参数 > 项目 `./.super-code.json` > 便携目录
+（exe 同级 `super-code.json`）> 全局 `~/.config/super-code/super-code.json` > 默认值。
+
+首次运行从内置模板生成全局配置，已有配置永不覆盖。
+
+## 使用
+
+```bash
+super-code                 # 交互式 REPL
+super-code -p "..."        # 一次性提问
+super-code --resume <id>   # 恢复会话
+super-code --coordinator   # 协调者模式（多 worker 并行）
+```
+
+## 功能
+
+- OpenAI 兼容 API；多模态图片输入（拖拽/粘贴截图）
+- 工具调用：文件读写编辑、Bash、Web 搜索/抓取、多 worker 协调者
+- 会话持久化（恢复/增量压缩/剪枝）、记忆系统、Skills、Plan 模式、沙箱

super_code_assistant-3.3.6.dist-info/RECORD

@@ -0,0 +1,61 @@
+commands/__init__.py,sha256=yLQw9ruzKWtRRoxkIWXrD9CCUTIYbUHcuFg-CjG6RWY,36762
+core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+core/config.py,sha256=1Y278govTEd6tvYoYLkGZ-Kqp_l4zsaayGnQOLox31M,9369
+core/config_template.json,sha256=03a1T7B3bCSX9cmtzuUzPAn3ZgoRqyIaz6WId2TGquk,163
+core/context.py,sha256=fFNOJnLn-Zd7Q_r2hBLO09wURzWue_IsBoIkj7tu0KA,13814
+core/engine.py,sha256=lS4Qe0N6rygi2cN7jmVfxJ4stsMpfmv-Pomd01_KGWY,34696
+core/file_state.py,sha256=ybg91T4691uiCgzieVvimoR8VQAcg-Bumy3U45cpv04,9159
+core/llm.py,sha256=wfwp3EWeLsGTMe0N0ZlqHLpPXCV36QJaL4nJygoGlCs,12857
+core/model_capabilities.py,sha256=5Us_yR9lfCP9QAlRufVL8xbAk3dOaDCzXr01L5legmo,1606
+core/permissions.py,sha256=e5aX9G_g4DRMLzIeEoTA_efhOGEp9H8xW9QZBvDfonk,8447
+core/session.py,sha256=WCuU85-tGGCKBEWZNFUErEMLeei-gBhe1BMfTqO8Eio,13513
+core/tool.py,sha256=pja5cvC_uRavxQT6y7p-3L2mTrXlAU5WSuMFlPiY-9E,1105
+core/sandbox/__init__.py,sha256=2qd8Kz3xb2AIZajOcjSYZzW02VSZUVt4pZFiOFL6FuY,571
+core/sandbox/blacklist.py,sha256=j6gofIX5g52xHnTRoz6wVp10B6zMrn3xm7xuuXq-h08,7282
+core/sandbox/config.py,sha256=Rdf5Bqnls-g33htdZCQyOWw6QrMvi6nIVPowvN5z7-Q,1795
+core/sandbox/network.py,sha256=Ko3WmgPY7RtcMw5LypvVokB4KCo3mWrjHNMqF-3kqlI,5295
+core/sandbox/path_protection.py,sha256=gcGMc-DtgddGZZ1lukv2XP-TsSdDtjuwEB-BmtH2VMQ,4009
+features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+features/compact.py,sha256=9hEcErCpYfC10QIAm3acz3zIRhFaB2UdjTIZj4EAB8I,47139
+features/coordinator.py,sha256=coV2PNTOWZoa_uk5xBPFebKBOnHuRSJb0xC1_Nc9Wco,4681
+features/cost_tracker.py,sha256=JV_sh6MMEQYej_KL21m0pFQc732EBbEk7HIEIcFiRuA,6930
+features/extract_memories.py,sha256=Dv_AYKiiV-RwLHnZSaGj5tFD26MKUu4d9NTCiUOikpQ,14125
+features/find_relevant_memories.py,sha256=haJ3EzvmE0MemDSdaMXwS7pwERnTtldkIsNaAyk3v0g,16118
+features/git_ai.py,sha256=mH7OxBZcsRC3_fiOSbVHtruBdI6vWLtwamsUSUrNxqQ,9666
+features/memory.py,sha256=L4baz6N6Sc0GN9x2UmJjVa7e-pmjDg1eQCSbbcqAQSM,22032
+features/memory_age.py,sha256=NcOBffUehlfLEe6RS3DFgdSxH_I_uMB-7oCoP5VLfnE,2753
+features/memory_scan.py,sha256=sESOkDxR47HJbZA4s_fzrP4eyr7PIvIiLV1D3fbs5wI,6606
+features/memory_types.py,sha256=oq_Ff8rUx-15kL1JjmJlhSlHvixsis5QVtHNlnznO94,1451
+features/plan.py,sha256=UqxWgG_c4K07s-ds0iRj3VoDfIbXwJ714koBGSOem2M,15594
+features/skills.py,sha256=7eeLbWrVaxMb9zqWdWKOmhE_ejgpbOQRitB795oa908,12860
+features/worker_manager.py,sha256=PtZb22n8Idlnw-PUTvpfu_aF_bpw6uAZf4HHIfvYK88,9502
+mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp/client.py,sha256=l4nlGB87s-nu0bMeXRXDba_IUjEMup3JlLKnF3fYhyk,4696
+mcp/loader.py,sha256=5O_2e-3W4yxclXGjMJf-MX45g47G47EMoyYZPWRXZbY,2981
+mcp/tool_proxy.py,sha256=m8nk7EHsB8_kcC1Ov_G6sGb3dz0et6MdhVdb5gpr47g,2204
+tools/__init__.py,sha256=ERwR9XYgF67VGWs1FMXaWwWtPdj9n-VhHE_awJ6wlxw,530
+tools/agent.py,sha256=d4OxW10o71xRs-Mn8soxihrxrBSynbjiul98tVM6fjI,5751
+tools/ask_user.py,sha256=NJV3zdGswX_N8CzEc7e83FkrVXmPrxsHrwgF8byyD2M,4653
+tools/bash.py,sha256=U91ZyGBJaWbftlw_DTk3w_7-lIpAMDMsihZ4oSE2BTI,3549
+tools/file_edit.py,sha256=anJ-MMdvQRTTwlm_IPLKPbmGarDq8xztdVfuvDQ7KOI,13341
+tools/file_read.py,sha256=j7Ekh9p6nqdeSD8FUBXeY7nfkpM1welE8tWuvjRQqkI,8292
+tools/file_write.py,sha256=AjNzXHOS6B7sEMYJroAy8gu7Q_w0galHyugPVMk5g10,3052
+tools/glob_tool.py,sha256=PKNzuoWmIAa_h0MvVnXXVv_kpYHuipFN-n_jpQX474g,3026
+tools/grep_tool.py,sha256=Cjrt4SbuLqE4VK6F1QLWwjwgPBX8rle0_gv4fJlVpp4,5811
+tools/plan_tools.py,sha256=pi_F7uNRvwhWuuMzx7yDvQRb9qLb5lP23QZZ1N8mC4E,3766
+tools/skill.py,sha256=6VhKZR4me5GySn0Td3tSPaaOapCYqqlyTfLlPsvjbvc,4934
+tools/tool.py,sha256=qVvRqsiWvOKdSAnbHDQbMnPpiwQYv5m4ZG6rmYhUJE8,909
+tools/web_fetch.py,sha256=JuiUoX5u4PBLc1_uquWqXG_wVXs3XwBJIIY8wwb6218,4904
+tools/web_search.py,sha256=yWeXIz4_kqf7jVBMJn14EcgWyohF1jPuNNZFvGxPZ4M,8197
+tui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tui/app.py,sha256=qGDy1KosfuhEQb8IFNKQoTPyeYUOuualSxyvSz825fQ,37362
+tui/clipboard_image.py,sha256=Uxdpu4ZOsKdHlmqPrmLDRCR8opD8UFa9Hg1sW0yMp38,1356
+tui/keylistener.py,sha256=4KMIGq9Vmx1mZ2qzE-I1H8oJVkAqEzZr4NvQVlQW5H8,4801
+tui/prompt.py,sha256=uyAOy0_9gN7Q-ZCQ6iAngvk_XA-XZsAkiCoElwZg_sg,34234
+tui/query.py,sha256=XaUlKd7F1g8goJ8BG4m6cMQRzsZmOmmnP66LwtuvAHI,9848
+tui/rendering.py,sha256=4p0uM6PkTNQvaF8XM2-Abo_XYveJj32JFM-T4pU3ZDw,6548
+super_code_assistant-3.3.6.dist-info/METADATA,sha256=Dw8fFEoWbzhLAypgIXmWFkDMKn9xyXk1EPTMJ52Oe3Q,1372
+super_code_assistant-3.3.6.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+super_code_assistant-3.3.6.dist-info/entry_points.txt,sha256=SlRMdhdtlJ60cF7XSVKSDqOayhP2ow0VbI7PcMRiWNQ,44
+super_code_assistant-3.3.6.dist-info/top_level.txt,sha256=MKanz5WSNqivvcMNkZ3zMhWWaEOSIfVqahxmlA8pMX0,45
+super_code_assistant-3.3.6.dist-info/RECORD,,

super_code_assistant-3.3.6.dist-info/WHEEL

@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (84.0.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+

super_code_assistant-3.3.6.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+super-code = tui.app:main

super_code_assistant-3.3.6.dist-info/top_level.txt

@@ -0,0 +1,7 @@
+commands
+core
+features
+mcp
+support
+tools
+tui

tools/__init__.py

@@ -0,0 +1,21 @@
+from .ask_user import AskUserQuestionTool
+from .bash import BashTool
+from .file_edit import FileEditTool
+from .file_read import FileReadTool
+from .file_write import FileWriteTool
+from .glob_tool import GlobTool
+from .grep_tool import GrepTool
+from .web_fetch import WebFetchTool
+from .web_search import WebSearchTool
+
+__all__ = [
+    "AskUserQuestionTool",
+    "BashTool",
+    "FileEditTool",
+    "FileReadTool",
+    "FileWriteTool",
+    "GlobTool",
+    "GrepTool",
+    "WebFetchTool",
+    "WebSearchTool",
+]

tools/agent.py

@@ -0,0 +1,132 @@
+from __future__ import annotations
+
+import json
+
+from core.tool import Tool, ToolResult
+from features.worker_manager import WorkerManager
+
+
+class AgentTool(Tool):
+    name = "Agent"
+    description = (
+        "Spawn a background worker for research, implementation, or "
+        "verification. Returns immediately with a task_id. Final results "
+        "arrive later as a <task-notification> user message."
+    )
+    input_schema = {
+        "type": "object",
+        "properties": {
+            "description": {"type": "string", "description": "Short label for the worker task"},
+            "prompt": {"type": "string", "description": "Self-contained instructions for the worker"},
+            "subagent_type": {
+                "type": "string",
+                "enum": ["worker"],
+                "default": "worker",
+                "description": "Only 'worker' is currently supported",
+            },
+        },
+        "required": ["description", "prompt"],
+    }
+
+    def get_activity_description(self, **kwargs) -> str | None:
+        desc = kwargs.get("description", "")
+        return f"Running agent: {desc}" if desc else "Running agent…"
+
+    def __init__(self, manager: WorkerManager):
+        self._manager = manager
+
+    def execute(self, description: str = "", prompt: str = "",
+                subagent_type: str = "worker", **_) -> ToolResult:
+        # 长 prompt（多 worker 并行、单 prompt 数百字）走 OpenAI 兼容流式协议时，
+        # tool_call.arguments 的 JSON 字符串可能在传输中被截断，llm.py 解析失败
+        # 静默退化为 {} → 这里收到空 description/prompt。直接调用会让 Python 抛
+        # "missing required positional arguments"，TUI 显示为 Tool error，
+        # 用户和模型都不知道是 JSON 截断导致的。改为返回明确 is_error tool_result，
+        # 模型读到提示后会重试一次（多数情况第二次能成）。
+        if not description or not prompt:
+            return ToolResult(
+                content=(
+                    "Error: Agent tool requires both 'description' (non-empty) and "
+                    "'prompt' (non-empty). The previous call had empty/missing input "
+                    "— this usually means the tool_call arguments JSON was truncated "
+                    "in transit. Retry with a complete JSON input. If the prompt is "
+                    "very long, consider splitting the task into smaller workers."
+                ),
+                is_error=True,
+            )
+        try:
+            payload = self._manager.spawn(
+                description=description, prompt=prompt, subagent_type=subagent_type)
+        except ValueError as exc:
+            return ToolResult(content=f"Error: {exc}", is_error=True)
+        return ToolResult(content=json.dumps(payload, ensure_ascii=False))
+
+
+class SendMessageTool(Tool):
+    name = "SendMessage"
+    description = (
+        "Continue an existing idle worker by task_id. Use this after a worker "
+        "has already reported back and you want it to take another step."
+    )
+    input_schema = {
+        "type": "object",
+        "properties": {
+            "to": {"type": "string", "description": "Worker task id to continue"},
+            "message": {"type": "string", "description": "Next self-contained instruction"},
+        },
+        "required": ["to", "message"],
+    }
+
+    def __init__(self, manager: WorkerManager):
+        self._manager = manager
+
+    def execute(self, to: str = "", message: str = "", **_) -> ToolResult:
+        # 同 AgentTool.execute：JSON 截断时 to/message 可能为空，返回明确错误让模型重试
+        # 而不是 Python 抛 missing positional arguments。
+        if not to or not message:
+            return ToolResult(
+                content=(
+                    "Error: SendMessage requires both 'to' (worker task_id) and "
+                    "'message' (non-empty). The previous call had empty/missing input "
+                    "— likely a tool_call arguments JSON truncation. Retry with a "
+                    "complete JSON input."
+                ),
+                is_error=True,
+            )
+        try:
+            payload = self._manager.continue_task(task_id=to, message=message)
+        except ValueError as exc:
+            return ToolResult(content=f"Error: {exc}", is_error=True)
+        return ToolResult(content=json.dumps(payload, ensure_ascii=False))
+
+
+class TaskStopTool(Tool):
+    name = "TaskStop"
+    description = "Stop a running worker by task_id."
+    input_schema = {
+        "type": "object",
+        "properties": {
+            "task_id": {"type": "string", "description": "Worker task id"},
+        },
+        "required": ["task_id"],
+    }
+
+    def __init__(self, manager: WorkerManager):
+        self._manager = manager
+
+    def execute(self, task_id: str = "", **_) -> ToolResult:
+        # 同上：JSON 截断时 task_id 可能为空，返回明确错误而不是 Python 异常。
+        if not task_id:
+            return ToolResult(
+                content=(
+                    "Error: TaskStop requires 'task_id'. The previous call had "
+                    "empty/missing input — likely a tool_call arguments JSON "
+                    "truncation. Retry with the worker's task_id."
+                ),
+                is_error=True,
+            )
+        try:
+            payload = self._manager.stop_task(task_id=task_id)
+        except ValueError as exc:
+            return ToolResult(content=f"Error: {exc}", is_error=True)
+        return ToolResult(content=json.dumps(payload, ensure_ascii=False))

tools/ask_user.py

@@ -0,0 +1,111 @@
+from __future__ import annotations
+
+from core.tool import Tool, ToolResult
+
+
+class AskUserQuestionTool(Tool):
+    @property
+    def name(self) -> str:
+        return "AskUserQuestion"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Ask the user a question with predefined options. Use this to gather "
+            "preferences, clarify ambiguous instructions, or get decisions on "
+            "implementation choices. Each question has 2-4 options plus an automatic "
+            "'Other' option for free-form input."
+        )
+
+    @property
+    def input_schema(self) -> dict:
+        return {
+            "type": "object",
+            "properties": {
+                "questions": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "question": {"type": "string"},
+                            "options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "label": {"type": "string"},
+                                        "description": {"type": "string"},
+                                    },
+                                    "required": ["label", "description"],
+                                },
+                                "minItems": 2,
+                                "maxItems": 4,
+                            },
+                            "multiSelect": {"type": "boolean", "default": False},
+                        },
+                        "required": ["question", "options"],
+                    },
+                    "minItems": 1,
+                    "maxItems": 4,
+                }
+            },
+            "required": ["questions"],
+        }
+
+    def is_read_only(self) -> bool:
+        return True
+
+    def execute(self, **kwargs) -> ToolResult:
+        questions = kwargs.get("questions", [])
+        if not questions:
+            return ToolResult(content="No questions provided.", is_error=True)
+
+        # 用 prompt_toolkit 而不是裸 input()：主 TUI 用 prompt_toolkit Application
+        # (bordered_prompt) 之后会调整 terminal 状态，加上 Rich Live spinner 的后台
+        # 重绘竞争，裸 input() 会出现按键被吞、必须按 Enter 才解锁的诡异现象。
+        # prompt_toolkit 的 prompt() 启动时会再次接管 terminal，与既有 TUI 链路兼容。
+        # 失败时（如非交互式环境）回退到 input() 保持原行为。
+        from prompt_toolkit import prompt as pt_prompt
+
+        def _ask(label: str) -> str:
+            try:
+                return pt_prompt(label).strip()
+            except Exception:
+                return input(label).strip()
+
+        answers: list[str] = []
+        for q in questions:
+            question_text = q.get("question", "")
+            options = q.get("options", [])
+            labels = [o["label"] for o in options]
+
+            from rich.console import Console
+            console = Console()
+            console.print(f"\n[bold]{question_text}[/bold]")
+            for i, o in enumerate(options, 1):
+                desc = o.get("description", "")
+                console.print(f"  {i}) {o['label']}" + (f" — {desc}" if desc else ""))
+            console.print(f"  {len(options)+1}) Other")
+
+            while True:
+                try:
+                    raw = _ask("  Choice: ")
+                except (EOFError, KeyboardInterrupt):
+                    return ToolResult(content="User cancelled the question.", is_error=True)
+                if raw.isdigit():
+                    idx = int(raw) - 1
+                    if 0 <= idx < len(options):
+                        answers.append(f"{question_text} => {labels[idx]}")
+                        break
+                    if idx == len(options):
+                        try:
+                            other = _ask("  Enter your answer: ")
+                        except (EOFError, KeyboardInterrupt):
+                            return ToolResult(content="User cancelled the question.", is_error=True)
+                        answers.append(f"{question_text} => {other}")
+                        break
+                elif raw:
+                    answers.append(f"{question_text} => {raw}")
+                    break
+
+        return ToolResult(content="User answered:\n" + "\n".join(answers))

tools/bash.py

@@ -0,0 +1,77 @@
+from __future__ import annotations
+
+import re
+import subprocess
+from core.tool import Tool, ToolResult
+
+_DEFAULT_TIMEOUT = 120
+
+# 匹配 Bash 输出重定向的目标路径：> path, >> path, 1> path, 2> path 等
+_REDIRECT_RE = re.compile(r'(?:>>|[12]?>>?)\s*([^\s|;&]+)')
+
+
+class BashTool(Tool):
+    name = "Bash"
+    description = (
+        "Executes a given bash command and returns its output.\n\n"
+        "IMPORTANT: Avoid using this tool to run `find`, `grep`, `cat`, `head`, `tail`, "
+        "`sed`, `awk`, or `echo` commands — use dedicated tools instead.\n\n"
+        " - File search: use Glob\n - Content search: use Grep\n"
+        " - Read files: use Read\n - Edit files: use Edit\n - Write files: use Write"
+    )
+    input_schema = {
+        "type": "object",
+        "properties": {
+            "command": {"type": "string", "description": "The bash command to execute"},
+            "description": {"type": "string", "description": "What this command does"},
+            "timeout": {"type": "integer", "description": "Timeout in seconds", "default": 120},
+        },
+        "required": ["command"],
+    }
+
+    def __init__(self, sandbox_manager=None):
+        self._sandbox = sandbox_manager
+
+    def get_activity_description(self, **kwargs) -> str | None:
+        command = kwargs.get("command", "")
+        preview = command[:60] + "…" if len(command) > 60 else command
+        return f"Running {preview}" if command else None
+
+    def execute(self, command: str, description: str = "",
+                timeout: int = _DEFAULT_TIMEOUT, **kwargs) -> ToolResult:
+        # 沙箱启用时先过滤危险命令，通过后再执行
+        if self._sandbox is not None:
+            allowed, reason = self._sandbox.check(command)
+            if not allowed:
+                return ToolResult(content=f"Error: {reason}", is_error=True)
+            # 检查网络外发域名（curl/wget 等）
+            allowed, reason = self._sandbox.check_network(command)
+            if not allowed:
+                return ToolResult(content=f"Error: {reason}", is_error=True)
+            # 检查重定向目标是否指向受保护路径
+            for m in _REDIRECT_RE.finditer(command):
+                target = m.group(1).strip().strip("'\"")
+                if target:
+                    allowed, reason = self._sandbox.check_path(target, "write")
+                    if not allowed:
+                        return ToolResult(content=f"Error: {reason}", is_error=True)
+        try:
+            result = subprocess.run(
+                command, shell=True, capture_output=True,
+                text=True, encoding="utf-8", errors="replace", timeout=timeout,
+            )
+            parts = []
+            if result.stdout:
+                stdout = result.stdout.rstrip()
+                if len(stdout) > 10_000:
+                    stdout = stdout[:10_000] + f"\n\n... (output truncated)"
+                parts.append(stdout)
+            if result.stderr:
+                parts.append(f"[stderr]\n{result.stderr.rstrip()}")
+            if result.returncode != 0:
+                parts.append(f"[exit code: {result.returncode}]")
+            return ToolResult(content="\n".join(parts) if parts else "(no output)")
+        except subprocess.TimeoutExpired:
+            return ToolResult(content=f"Error: Command timed out after {timeout}s", is_error=True)
+        except Exception as e:
+            return ToolResult(content=f"Error: {e}", is_error=True)