Complete: P0+P1+P2+Skills (2189 lines, 22 features)

codepilot_v4.py

@@ -340,6 +340,9 @@ class ProjectTools:
     def read_file(self, path, offset=1, limit=200):
         full = self._resolve(path)
         if not os.path.exists(full): return f"❌ 不存在: {path}"
+        # P2-3: 多模態檔案
+        mm = read_multimodal(full)
+        if mm is not None: return mm
         try:
             content = Path(full).read_text(encoding="utf-8", errors="replace"); lines = content.splitlines()
             self.read_cache[full] = {"time": os.path.getmtime(full), "content": content}
@@ -369,8 +372,12 @@ class ProjectTools:
         return f"✅ {'建立' if is_new else '覆寫'}: {path}"
 
     def run_command(self, command, timeout=120):
-        for d in {"rm -rf /", "git push --force", "git reset --hard"}:
-            if d in command: return f"⛔ 危險: {command}"
+        # P2-4: 安全分類器
+        safety, reason = classify_command(command)
+        if safety == "block":
+            return f"⛔ 危險指令被阻擋: {command}\n原因: {reason}"
+        if safety == "warn":
+            return f"⚠️ 警告: {reason}\n指令: {command}\n(在 --approval ask 模式下會要求確認)"
         try:
             r = subprocess.run(command, shell=True, cwd=self.cwd, capture_output=True, text=True, timeout=timeout)
             return (r.stdout + (f"\nSTDERR:\n{r.stderr}" if r.stderr else ""))[:10000]
@@ -442,9 +449,278 @@ def execute_tool(tools, call):
         elif n == "search_files": result = tools.search_files(p.get("pattern",""), p.get("glob"))
         elif n == "list_files": result = tools.list_files(p.get("pattern","*"), int(p.get("max_depth",3)))
         elif n == "git_status": result = tools.git_context()
+        elif n == "web_fetch": result = web_fetch(p.get("url",""))  # P2-1
+        elif n == "web_search": result = web_search(p.get("query",""))  # P2-1
         else: result = f"❌ 未知: {n}"
     except Exception as e: result = f"❌ {e}"
-    return truncate_tool_result(result)  # P0-2: 自動截斷
+    return truncate_tool_result(result)
+
+
+# ============================================================
+#  P2-1: WEB FETCH / WEB SEARCH
+# ============================================================
+def web_fetch(url, max_chars=8000):
+    """讀取網頁內容（去掉 HTML 標籤）"""
+    try:
+        if not httpx: return "❌ 請安裝 httpx: pip install httpx"
+        resp = httpx.get(url, timeout=15, follow_redirects=True,
+                         headers={"User-Agent": "CodePilot/1.0"})
+        resp.raise_for_status()
+        content = resp.text
+        # 簡易去 HTML 標籤
+        content = re.sub(r'<script[^>]*>.*?</script>', '', content, flags=re.DOTALL)
+        content = re.sub(r'<style[^>]*>.*?</style>', '', content, flags=re.DOTALL)
+        content = re.sub(r'<[^>]+>', ' ', content)
+        content = re.sub(r'\s+', ' ', content).strip()
+        return content[:max_chars]
+    except Exception as e:
+        return f"❌ 抓取失敗: {e}"
+
+def web_search(query, max_results=5):
+    """網路搜尋（使用 DuckDuckGo HTML，不需要 API key）"""
+    try:
+        if not httpx: return "❌ 請安裝 httpx: pip install httpx"
+        resp = httpx.get("https://html.duckduckgo.com/html/",
+            params={"q": query}, timeout=10,
+            headers={"User-Agent": "CodePilot/1.0"})
+        # 提取搜尋結果
+        results = []
+        for match in re.finditer(r'<a[^>]+href="(https?://[^"]+)"[^>]*class="result__a"[^>]*>(.*?)</a>', resp.text, re.DOTALL):
+            url = match.group(1)
+            title = re.sub(r'<[^>]+>', '', match.group(2)).strip()
+            results.append(f"- [{title}]({url})")
+            if len(results) >= max_results: break
+        # 也嘗試提取摘要
+        for match in re.finditer(r'<a[^>]+class="result__snippet"[^>]*>(.*?)</a>', resp.text, re.DOTALL):
+            snippet = re.sub(r'<[^>]+>', '', match.group(1)).strip()
+            if snippet and len(results) > 0:
+                idx = min(len(results)-1, len([r for r in results if not r.startswith("  ")]) - 1)
+                if idx >= 0: results.insert(idx+1, f"  {snippet[:150]}")
+        return "\n".join(results) if results else f"無搜尋結果: {query}"
+    except Exception as e:
+        return f"❌ 搜尋失敗: {e}"
+
+
+# ============================================================
+#  P2-2: STREAMING OUTPUT（逐字輸出）
+# ============================================================
+def stream_local_chat(model, messages, console, max_tokens=4096):
+    """本地模型 streaming — 逐 token 顯示"""
+    if not hasattr(model, 'tokenizer') or not hasattr(model, 'model'):
+        return model.chat(messages, max_tokens)  # 非本地模型 fallback
+
+    from transformers import TextIteratorStreamer
+    import threading
+
+    text = model.tokenizer.apply_chat_template(messages, tokenize=False, add_generation_prompt=True)
+    inputs = model.tokenizer(text, return_tensors="pt").to(model.model.device)
+
+    streamer = TextIteratorStreamer(model.tokenizer, skip_prompt=True, skip_special_tokens=True)
+    gen_kwargs = dict(**inputs, max_new_tokens=max_tokens, do_sample=True,
+        temperature=0.7, top_p=0.9, repetition_penalty=1.1,
+        pad_token_id=model.tokenizer.pad_token_id, streamer=streamer)
+
+    thread = threading.Thread(target=model.model.generate, kwargs=gen_kwargs)
+    thread.start()
+
+    console.print(f"\n[bold blue]🤖 CodePilot:[/]", end="")
+    full_text = ""
+    for chunk in streamer:
+        print(chunk, end="", flush=True)
+        full_text += chunk
+    print()  # newline
+    thread.join()
+    return full_text
+
+
+# ============================================================
+#  P2-3: MULTIMODAL（圖片/PDF 讀取）
+# ============================================================
+def read_multimodal(path):
+    """讀取圖片/PDF/notebook 的文字描述"""
+    ext = Path(path).suffix.lower()
+
+    if ext in (".png", ".jpg", ".jpeg", ".gif", ".bmp", ".webp", ".svg"):
+        # 圖片：回傳檔案資訊
+        try:
+            size = os.path.getsize(path)
+            return f"[Image: {path}, {size/1024:.0f}KB, {ext}]\n(圖片內容無法在文字模式顯示。如需分析圖片，請使用支援多模態的雲端模型。)"
+        except: return f"❌ 無法讀取圖片: {path}"
+
+    elif ext == ".pdf":
+        # PDF：嘗試用 pdfminer 或 fallback
+        try:
+            from pdfminer.high_level import extract_text
+            text = extract_text(path, maxpages=20)
+            return f"[PDF: {path}, {len(text)} chars extracted]\n\n{text[:10000]}"
+        except ImportError:
+            try:
+                # fallback: pdftotext 指令
+                r = subprocess.run(["pdftotext", "-l", "20", path, "-"],
+                    capture_output=True, text=True, timeout=30)
+                return f"[PDF: {path}]\n\n{r.stdout[:10000]}"
+            except:
+                return f"[PDF: {path}] (安裝 pdfminer.six 以讀取: pip install pdfminer.six)"
+
+    elif ext == ".ipynb":
+        # Jupyter Notebook：提取 code cells 和 markdown
+        try:
+            nb = json.loads(Path(path).read_text())
+            cells = nb.get("cells", [])
+            output = []
+            for i, cell in enumerate(cells[:30]):
+                ctype = cell.get("cell_type", "")
+                source = "".join(cell.get("source", []))
+                if ctype == "markdown":
+                    output.append(f"[Markdown Cell {i+1}]\n{source}")
+                elif ctype == "code":
+                    output.append(f"[Code Cell {i+1}]\n```python\n{source}\n```")
+            return "\n\n".join(output)[:10000]
+        except Exception as e:
+            return f"❌ 無法讀取 notebook: {e}"
+
+    return None  # 非多模態檔案
+
+
+# ============================================================
+#  P2-4: SHELL SANDBOX（指令安全分類）
+# ============================================================
+# 不用 ML，用規則分類 — 比 ML 更可靠且不需要額外模型
+DANGEROUS_PATTERNS = [
+    r"rm\s+(-rf?|--recursive)\s+[/~]",  # rm -rf /
+    r"rm\s+-rf?\s+\.",                    # rm -rf .
+    r">(>?)\s*/dev/sd",                   # 覆寫磁碟
+    r"mkfs\.",                             # 格式化
+    r"dd\s+if=",                           # 磁碟操作
+    r":()\{.*\|.*&\s*\};:",              # fork bomb
+    r"chmod\s+777\s+/",                   # 危險權限
+    r"curl.*\|\s*(bash|sh)",              # pipe to shell
+    r"wget.*\|\s*(bash|sh)",              # pipe to shell
+]
+
+WARN_PATTERNS = [
+    r"git\s+push\s+.*--force",            # force push
+    r"git\s+reset\s+--hard",              # hard reset
+    r"git\s+clean\s+-fd",                 # clean untracked
+    r"npm\s+publish",                     # publish package
+    r"pip\s+install\s+--force",           # force install
+    r"docker\s+system\s+prune",           # docker cleanup
+    r"DROP\s+TABLE",                      # SQL drop
+    r"DELETE\s+FROM\s+\w+\s*;?\s*$",     # SQL delete all
+    r"sudo\s+",                           # sudo
+]
+
+def classify_command(command):
+    """
+    分類指令安全等級：
+    - 'block': 直接阻擋
+    - 'warn': 需要額外確認
+    - 'safe': 安全
+    """
+    for p in DANGEROUS_PATTERNS:
+        if re.search(p, command, re.IGNORECASE):
+            return "block", f"危險指令匹配: {p}"
+    for p in WARN_PATTERNS:
+        if re.search(p, command, re.IGNORECASE):
+            return "warn", f"需要確認: {p}"
+    return "safe", ""
+
+
+# ============================================================
+#  P2-5: MCP LITE（簡易外部工具協議）
+# ============================================================
+class MCPLite:
+    """
+    簡易 MCP — 讀取 .codepilot/mcp.json，連接外部工具伺服器。
+    支援 stdio 和 http 兩種傳輸方式。
+
+    .codepilot/mcp.json:
+    {
+        "servers": {
+            "database": {
+                "command": "python db_mcp_server.py",
+                "type": "stdio"
+            },
+            "api": {
+                "url": "http://localhost:9000/mcp",
+                "type": "http"
+            }
+        }
+    }
+    """
+    def __init__(self, project_dir):
+        self.servers = {}
+        self.processes = {}
+        mcp_file = os.path.join(project_dir, ".codepilot", "mcp.json")
+        if os.path.exists(mcp_file):
+            try:
+                config = json.loads(Path(mcp_file).read_text())
+                self.servers = config.get("servers", {})
+            except: pass
+
+    def call(self, server_name, method, params=None):
+        """呼叫 MCP 伺服器"""
+        server = self.servers.get(server_name)
+        if not server:
+            return f"❌ MCP 伺服器不存在: {server_name}（可用: {', '.join(self.servers.keys())}）"
+
+        if server.get("type") == "http":
+            return self._call_http(server, method, params)
+        else:
+            return self._call_stdio(server_name, server, method, params)
+
+    def _call_http(self, server, method, params):
+        try:
+            if not httpx: return "❌ 需要 httpx"
+            resp = httpx.post(server["url"], json={
+                "jsonrpc": "2.0", "id": 1, "method": method,
+                "params": params or {}
+            }, timeout=30)
+            resp.raise_for_status()
+            result = resp.json()
+            return json.dumps(result.get("result", result), ensure_ascii=False, indent=2)
+        except Exception as e:
+            return f"❌ MCP HTTP 錯誤: {e}"
+
+    def _call_stdio(self, name, server, method, params):
+        try:
+            # 啟動進程（如果還沒啟動）
+            if name not in self.processes or self.processes[name].poll() is not None:
+                self.processes[name] = subprocess.Popen(
+                    server["command"], shell=True,
+                    stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE, text=True)
+
+            proc = self.processes[name]
+            request = json.dumps({"jsonrpc": "2.0", "id": 1, "method": method,
+                                  "params": params or {}}) + "\n"
+            proc.stdin.write(request)
+            proc.stdin.flush()
+
+            # 讀取回應（1 行 JSON）
+            import select
+            ready, _, _ = select.select([proc.stdout], [], [], 10)
+            if ready:
+                line = proc.stdout.readline()
+                result = json.loads(line)
+                return json.dumps(result.get("result", result), ensure_ascii=False, indent=2)
+            return "⏰ MCP 伺服器無回應"
+        except Exception as e:
+            return f"❌ MCP stdio 錯誤: {e}"
+
+    def list_servers(self):
+        if not self.servers: return "(無 MCP 伺服器。建立 .codepilot/mcp.json)"
+        lines = []
+        for name, cfg in self.servers.items():
+            stype = cfg.get("type", "stdio")
+            target = cfg.get("url", cfg.get("command", "?"))
+            lines.append(f"  🔌 {name} ({stype}): {target}")
+        return "\n".join(lines)
+
+    def cleanup(self):
+        for proc in self.processes.values():
+            try: proc.kill()
+            except: pass
 
 
 # ============================================================
@@ -657,6 +933,341 @@ class Hooks:
             return None
 
 
+# ============================================================
+#  SKILL SYSTEM（技能系統 — 仿 Claude Code SkillTool）
+# ============================================================
+"""
+Skill 和 Agent 的關鍵差異（來自 Claude Code 原始碼）：
+  - Skill  → 注入指令到「當前」context window（不建新 context）
+  - Agent  → spawn 一個「新的」隔離 context window
+
+Skill 定義方式：
+  .codepilot/skills/<name>/SKILL.md
+
+SKILL.md 格式：
+  ---
+  name: API Generator
+  description: Generate RESTful API endpoints from a data model
+  tools: [read_file, edit_file, write_file, run_command]
+  arguments:
+    - name: model_file
+      description: Path to the data model file
+    - name: framework
+      description: Web framework (fastapi, express, gin)
+      default: fastapi
+  hooks:
+    post_edit_file: "black {file}"
+  ---
+
+  你是一位 API 專家。根據用戶提供的 data model，生成完整的 RESTful CRUD API。
+
+  步驟：
+  1. 讀取 model_file 了解數據結構
+  2. 生成路由文件
+  3. 生成測試文件
+  4. 執行測試確認通過
+
+內建 Skills（bundled）：
+  - create-skill: 幫你建立新的 skill
+  - refactor: 重構程式碼
+  - test-gen: 自動產生測試
+  - doc-gen: 自動產生文檔
+  - debug: 除錯助手
+"""
+
+class SkillManager:
+    """管理和執行 Skills"""
+
+    def __init__(self, project_dir):
+        self.project_dir = project_dir
+        self.skills = {}
+
+        # 載入自訂 skills
+        skills_dir = os.path.join(project_dir, ".codepilot", "skills")
+        if os.path.isdir(skills_dir):
+            for skill_dir in Path(skills_dir).iterdir():
+                if skill_dir.is_dir():
+                    skill_md = skill_dir / "SKILL.md"
+                    if skill_md.exists():
+                        skill = self._parse_skill(skill_md)
+                        if skill:
+                            self.skills[skill["name"]] = skill
+
+        # 載入全域 skills
+        global_skills = CONFIG_DIR / "skills" if isinstance(CONFIG_DIR, Path) else Path(CONFIG_DIR) / "skills"
+        if global_skills.is_dir():
+            for skill_dir in global_skills.iterdir():
+                if skill_dir.is_dir() and (skill_dir / "SKILL.md").exists():
+                    skill = self._parse_skill(skill_dir / "SKILL.md")
+                    if skill and skill["name"] not in self.skills:
+                        self.skills[skill["name"]] = skill
+
+        # 註冊內建 bundled skills
+        self._register_bundled_skills()
+
+    def _parse_skill(self, skill_md_path):
+        """解析 SKILL.md"""
+        try:
+            content = Path(skill_md_path).read_text(encoding="utf-8")
+            skill = {
+                "name": skill_md_path.parent.name,
+                "path": str(skill_md_path.parent),
+                "description": "",
+                "prompt": content,
+                "tools": None,       # None = 全部工具, list = 限定
+                "arguments": [],
+                "hooks": {},
+                "model": None,
+                "fork": False,       # True = 在隔離 context 中執行
+            }
+
+            # 解析 YAML frontmatter
+            if content.startswith("---"):
+                parts = content.split("---", 2)
+                if len(parts) >= 3:
+                    for line in parts[1].strip().split("\n"):
+                        line = line.strip()
+                        if not line or line.startswith("#"):
+                            continue
+                        if ":" in line:
+                            k, v = line.split(":", 1)
+                            k, v = k.strip(), v.strip()
+                            if k == "name": skill["name"] = v
+                            elif k == "description": skill["description"] = v
+                            elif k == "model": skill["model"] = v
+                            elif k == "fork": skill["fork"] = v.lower() in ("true", "yes", "1")
+                            elif k == "tools":
+                                if v.startswith("["):
+                                    skill["tools"] = [x.strip().strip("'\"") for x in v[1:-1].split(",")]
+                            elif k == "arguments":
+                                pass  # 複雜結構，在下面處理
+                            elif k == "hooks":
+                                pass  # 在下面處理
+
+                    # 解析 arguments（簡易版）
+                    in_args = False
+                    current_arg = {}
+                    for line in parts[1].strip().split("\n"):
+                        line = line.strip()
+                        if line.startswith("arguments:"):
+                            in_args = True; continue
+                        if in_args:
+                            if line.startswith("- name:"):
+                                if current_arg: skill["arguments"].append(current_arg)
+                                current_arg = {"name": line.split(":", 1)[1].strip()}
+                            elif line.startswith("description:") and current_arg:
+                                current_arg["description"] = line.split(":", 1)[1].strip()
+                            elif line.startswith("default:") and current_arg:
+                                current_arg["default"] = line.split(":", 1)[1].strip()
+                            elif not line.startswith(" ") and not line.startswith("-"):
+                                in_args = False
+                    if current_arg and "name" in current_arg:
+                        skill["arguments"].append(current_arg)
+
+                    # hooks
+                    in_hooks = False
+                    for line in parts[1].strip().split("\n"):
+                        line = line.strip()
+                        if line.startswith("hooks:"):
+                            in_hooks = True; continue
+                        if in_hooks and ":" in line and line.startswith(" "):
+                            hk, hv = line.strip().split(":", 1)
+                            skill["hooks"][hk.strip()] = hv.strip().strip('"').strip("'")
+                        elif in_hooks and not line.startswith(" "):
+                            in_hooks = False
+
+                    skill["prompt"] = parts[2].strip()
+
+            return skill
+        except Exception as e:
+            return None
+
+    def _register_bundled_skills(self):
+        """註冊內建 skills"""
+        bundled = {
+            "create-skill": {
+                "name": "create-skill",
+                "description": "建立新的 skill",
+                "prompt": """幫用戶在 .codepilot/skills/<name>/SKILL.md 建立一個新的 skill。
+
+先問用戶：
+1. Skill 名稱
+2. 用途描述
+3. 需要用到哪些工具
+
+然後��生 SKILL.md，包含 YAML frontmatter 和詳細指令。""",
+                "tools": ["write_file", "list_files"],
+                "arguments": [{"name": "name", "description": "skill 名稱"}],
+                "hooks": {},
+                "fork": False,
+                "path": "(bundled)",
+            },
+            "refactor": {
+                "name": "refactor",
+                "description": "重構程式碼：提取函數、重命名、簡化邏輯",
+                "prompt": """你是重構專家。閱讀用戶指定的文件，進行以下改進：
+1. 提取重複的程式碼為函數
+2. 改善命名（變數、函數、類別）
+3. 簡化複雜的條件邏輯
+4. 加入或改進 docstring
+5. 確保修改後測試仍然通過
+
+每次只做一個小修改，驗證後再做下一個。""",
+                "tools": ["read_file", "edit_file", "run_command", "search_files"],
+                "arguments": [{"name": "file", "description": "要重構的文件路徑"}],
+                "hooks": {},
+                "fork": False,
+                "path": "(bundled)",
+            },
+            "test-gen": {
+                "name": "test-gen",
+                "description": "自動產生測試",
+                "prompt": """你是測試工程師。為用戶指定的文件或函數產生完整的測試。
+
+步驟：
+1. 讀取原始碼，了解所有公開函數和類別
+2. 為每個函數產生：正常輸入、邊界值、錯誤輸入的測試
+3. 使用專案現有的測試框架（pytest/jest/等）
+4. 把測試寫入對應的 tests/ 目錄
+5. 執行測試確認通過""",
+                "tools": ["read_file", "write_file", "run_command", "search_files", "list_files"],
+                "arguments": [{"name": "file", "description": "要產生測試的文件"}],
+                "hooks": {},
+                "fork": False,
+                "path": "(bundled)",
+            },
+            "doc-gen": {
+                "name": "doc-gen",
+                "description": "自動產生文檔（docstring / README / API docs）",
+                "prompt": """你是技術文件專家。為用戶的程式碼產生或改善文檔。
+
+可以：
+1. 為所有函數加上 docstring
+2. 產生或更新 README.md
+3. 產生 API 文檔（如有 web framework）
+4. 產生 CHANGELOG
+
+根據用戶的要求決定做哪個。""",
+                "tools": ["read_file", "edit_file", "write_file", "search_files", "list_files"],
+                "arguments": [{"name": "target", "description": "文件或目錄", "default": "."}],
+                "hooks": {},
+                "fork": False,
+                "path": "(bundled)",
+            },
+            "debug": {
+                "name": "debug",
+                "description": "除錯助手：分析錯誤訊息、找出原因、修復",
+                "prompt": """你是除錯專家。用戶會給你一個錯誤訊息或描述問題。
+
+步驟：
+1. 分析錯誤訊息，定位問題文件和行數
+2. 讀取相關程式碼
+3. 搜尋可能相關的其他文件
+4. 找出根本原因
+5. 提出修復方案
+6. 實施修復
+7. 跑測試驗證
+
+先分析再動手，不要急著改。""",
+                "tools": ["read_file", "edit_file", "run_command", "search_files", "list_files", "git_status"],
+                "arguments": [{"name": "error", "description": "錯誤訊息或問題描述"}],
+                "hooks": {},
+                "fork": False,
+                "path": "(bundled)",
+            },
+        }
+        for name, skill in bundled.items():
+            if name not in self.skills:
+                self.skills[name] = skill
+
+    def list_skills(self):
+        """列出所有可用 skills"""
+        lines = []
+        bundled = []
+        custom = []
+        for name, s in sorted(self.skills.items()):
+            icon = "📦" if s.get("path") == "(bundled)" else "🔧"
+            desc = s.get("description", "")
+            args = ", ".join(a["name"] for a in s.get("arguments", []))
+            entry = f"  {icon} {name}: {desc}"
+            if args: entry += f" [dim]({args})[/]"
+            if s.get("path") == "(bundled)":
+                bundled.append(entry)
+            else:
+                custom.append(entry)
+        if custom:
+            lines.append("[bold]自訂 Skills:[/]")
+            lines.extend(custom)
+        if bundled:
+            lines.append("[bold]內建 Skills:[/]")
+            lines.extend(bundled)
+        return "\n".join(lines) if lines else "(無 skill。用 /skill create-skill 建立)"
+
+    def invoke(self, skill_name, args_dict, model, tools, console, messages=None):
+        """
+        執行 skill。
+        核心差異：skill 注入到當前 context（不像 agent 建新 context）
+        """
+        from rich.markdown import Markdown
+
+        skill = self.skills.get(skill_name)
+        if not skill:
+            console.print(f"[red]❌ 未知 skill: {skill_name}[/]")
+            console.print(self.list_skills())
+            return None, None
+
+        console.print(f"\n[bold magenta]⚡ Skill: {skill['name']}[/] — {skill.get('description','')}")
+
+        # 組裝 skill prompt + 用戶參數
+        skill_prompt = skill["prompt"]
+
+        # 替換參數
+        for arg_def in skill.get("arguments", []):
+            arg_name = arg_def["name"]
+            arg_val = args_dict.get(arg_name, arg_def.get("default", ""))
+            skill_prompt = skill_prompt.replace(f"{{{arg_name}}}", str(arg_val))
+
+        if skill.get("fork"):
+            # Fork 模式：隔離 context（像 agent）
+            console.print(f"  [dim](fork mode — 隔離 context)[/]")
+            fork_messages = [
+                {"role": "system", "content": skill_prompt},
+                {"role": "user", "content": json.dumps(args_dict, ensure_ascii=False)},
+            ]
+            full_response = ""
+            for rnd in range(8):
+                with console.status(f"[magenta]{skill_name} round {rnd+1}..."):
+                    try: response = model.chat(fork_messages)
+                    except: break
+                tcalls = parse_tool_calls(response)
+                text = TOOL_PATTERN.sub("", response).strip()
+                if text: console.print(Markdown(text))
+                full_response += response + "\n"
+                if not tcalls: break
+                fork_messages.append({"role": "assistant", "content": response})
+                results = []
+                for call in tcalls:
+                    # 工具權限過濾
+                    if skill.get("tools") and call["tool"] not in skill["tools"]:
+                        results.append(f"[{call['tool']}] ❌ 此 skill 不允許"); continue
+                    result = execute_tool(tools, call)
+                    console.print(f"  [dim]🔧 {call['tool']}[/]")
+                    results.append(f"[{call['tool']}] {result}")
+                    # 觸發 skill 自帶的 hooks
+                    if call["tool"] in ("edit_file", "write_file"):
+                        fpath = call["params"].get("path", "")
+                        hook_cmd = skill.get("hooks", {}).get(f"post_{call['tool']}")
+                        if hook_cmd and fpath:
+                            subprocess.run(hook_cmd.replace("{file}", fpath), shell=True,
+                                cwd=tools.project_dir, capture_output=True, timeout=30)
+                fork_messages.append({"role": "user", "content": "Tool results:\n" + "\n\n".join(results)})
+            return full_response, None
+        else:
+            # 注入模式（預設）：把 skill 指令注入當前 context
+            inject_msg = f"[Skill: {skill_name}]\n\n{skill_prompt}\n\nUser arguments: {json.dumps(args_dict, ensure_ascii=False)}"
+            return None, inject_msg  # 回傳注入內容，由主循環處理
+
+
 # ============================================================
 #  P1-1: APPROVAL SYSTEM（權限/審批）
 # ============================================================
@@ -1097,15 +1708,18 @@ def run_agent_loop(args):
         messages = [{"role": "system", "content": system_prompt}]
 
     hooks = Hooks(project_dir)
-    bg_tasks = BackgroundTaskManager()  # P1-2: 背景任務
-    custom_agents = load_custom_agents(project_dir)  # P1-3: 自訂代理
-    approval_mode = args.approval or "auto"  # P1-1: 審批模式
+    bg_tasks = BackgroundTaskManager()
+    custom_agents = load_custom_agents(project_dir)
+    mcp = MCPLite(project_dir)
+    skill_mgr = SkillManager(project_dir)  # Skill 系統
+    approval_mode = args.approval or "auto"
+    use_streaming = args.stream and provider_key == "local"
     edited_files_this_session = []
 
     if custom_agents:
         console.print(f"[dim]🤖 自訂代理: {', '.join(custom_agents.keys())}[/]")
 
-    console.print(f"[dim]指令: /init /verify /commit /agent /bg /approval | /duel /memo /grind /ls /git /clear /status /train /quit[/]\n")
+    console.print(f"[dim]指令: /init /verify /commit /agent /bg /approval /web /mcp /stream | /duel /memo /grind /ls /git /clear /status /train /quit[/]\n")
 
     while True:
         try: user_input = Prompt.ask("\n[bold green]🧑 You")
@@ -1188,6 +1802,46 @@ def run_agent_loop(args):
             auto_git_commit(tools, model, edited_files_this_session, console)
             continue
 
+        elif cmd.startswith("/skill"):
+            # Skill 系統
+            parts = cmd.split(None, 2)
+            if len(parts) < 2 or parts[1] == "list":
+                console.print(skill_mgr.list_skills())
+                continue
+            skill_name = parts[1]
+            # 收集參數
+            skill_def = skill_mgr.skills.get(skill_name)
+            skill_args = {}
+            if skill_def:
+                # 如果指令裡有第三段，用它作為第一個參數
+                if len(parts) > 2 and skill_def.get("arguments"):
+                    skill_args[skill_def["arguments"][0]["name"]] = parts[2]
+                else:
+                    for arg_def in skill_def.get("arguments", []):
+                        default = arg_def.get("default", "")
+                        val = Prompt.ask(f"  {arg_def['name']} ({arg_def.get('description','')})", default=default)
+                        if val: skill_args[arg_def["name"]] = val
+            result, inject = skill_mgr.invoke(skill_name, skill_args, model, tools, console, messages)
+            if inject:
+                # 注入模式：加入當前對話
+                messages.append({"role": "user", "content": inject})
+                with console.status("[bold cyan]執行 skill..."):
+                    response = chat_with_recovery(model, messages, ctx=ctx, console=console)
+                console.print(f"\n[bold blue]🤖 CodePilot:[/]")
+                from rich.markdown import Markdown as _Md
+                console.print(_Md(TOOL_PATTERN.sub("", response).strip()))
+                messages.append({"role": "assistant", "content": response})
+                # 處理工具呼叫
+                tcalls = parse_tool_calls(response)
+                if tcalls:
+                    results = []
+                    for call in tcalls:
+                        console.print(f"  [dim]🔧 {call['tool']}[/]")
+                        r = execute_tool(tools, call)
+                        results.append(f"[{call['tool']}] {r}")
+                    messages.append({"role": "user", "content": "Tool results:\n" + "\n\n".join(results)})
+            continue
+
         elif cmd.startswith("/agent"):
             # P1-3: 自訂代理
             parts = cmd.split(None, 2)
@@ -1245,6 +1899,42 @@ def run_agent_loop(args):
                 console.print("[dim]/bg list | /bg run <cmd> | /bg check <id> | /bg kill <id>[/]")
             continue
 
+        elif cmd.startswith("/web "):
+            # P2-1: 快速網頁搜尋/抓取
+            query = cmd[5:].strip()
+            if query.startswith("http"):
+                console.print(f"[dim]🌐 抓取 {query}...[/]")
+                result = web_fetch(query)
+            else:
+                console.print(f"[dim]🔍 搜尋: {query}...[/]")
+                result = web_search(query)
+            console.print(result[:2000])
+            continue
+
+        elif cmd.startswith("/mcp"):
+            # P2-5: MCP 伺服器管理
+            parts = cmd.split(None, 3)
+            if len(parts) < 2 or parts[1] == "list":
+                console.print(f"[bold]🔌 MCP 伺服器[/]")
+                console.print(mcp.list_servers())
+            elif len(parts) >= 3:
+                server = parts[1]
+                method = parts[2]
+                params = json.loads(parts[3]) if len(parts) > 3 else {}
+                console.print(f"[dim]🔌 {server}.{method}...[/]")
+                result = mcp.call(server, method, params)
+                console.print(result[:1000])
+            else:
+                console.print("[dim]/mcp list | /mcp <server> <method> [json_params][/]")
+            continue
+
+        elif cmd == "/stream on":
+            use_streaming = (provider_key == "local")
+            console.print(f"[green]{'✅ Streaming ON' if use_streaming else '❌ Streaming 只支援本地模型'}[/]")
+            continue
+        elif cmd == "/stream off":
+            use_streaming = False; console.print("[dim]Streaming OFF[/]"); continue
+
         elif cmd.startswith("/approval"):
             # P1-1: 切換審批模式
             parts = cmd.split()
@@ -1339,19 +2029,23 @@ def run_agent_loop(args):
         tools_used_this_turn = []  # 追蹤這輪用了哪些工具
 
         for rnd in range(10):
-            with console.status(f"[bold cyan]{'思考中' if rnd == 0 else f'工具 round {rnd+1}'}..."):
-                try:
-                    # P0-3: 使用帶恢復的 chat
-                    response = chat_with_recovery(
-                        model, messages, ctx=ctx, console=console,
-                        fallback_model=local_model_ref if provider_key != "local" else None)
-                except Exception as e:
-                    console.print(f"[red]❌ 所有重試失敗: {e}[/]")
-                    break
+            try:
+                if use_streaming and rnd == 0 and provider_key == "local":
+                    # P2-2: Streaming 輸出（第一輪，本地模型）
+                    response = stream_local_chat(model, messages, console)
+                else:
+                    with console.status(f"[bold cyan]{'思考中' if rnd == 0 else f'工具 round {rnd+1}'}..."):
+                        response = chat_with_recovery(
+                            model, messages, ctx=ctx, console=console,
+                            fallback_model=local_model_ref if provider_key != "local" else None)
+            except Exception as e:
+                console.print(f"[red]❌ 所有重試失敗: {e}[/]")
+                break
 
             tool_calls = parse_tool_calls(response)
             text_parts = TOOL_PATTERN.sub("", response).strip()
-            if text_parts:
+            if text_parts and not (use_streaming and rnd == 0):
+                # streaming 模式已經顯示過了，不��複
                 console.print(f"\n[bold blue]🤖 CodePilot:[/]")
                 console.print(Markdown(text_parts))
             full_response += response + "\n"
@@ -1427,6 +2121,7 @@ def run_agent_loop(args):
 
         ctx.save_session(messages)
 
+    mcp.cleanup()
     console.print("\n[cyan]👋[/]")
 
 
@@ -1483,6 +2178,7 @@ def main():
     p.add_argument("--distill", action="store_true")
     p.add_argument("--grind", action="store_true", help="LeetCode 自動刷題")
     p.add_argument("--grind-count", type=int, default=100, help="刷幾題")
+    p.add_argument("--stream", action="store_true", help="啟用 streaming 輸出（本地模型）")
     p.add_argument("--stats", action="store_true"); p.add_argument("--train", action="store_true")
     a = p.parse_args()
     if a.stats: show_stats()