P0+P1 complete: approval, background tasks, custom agents, auto git commit

codepilot_v4.py

@@ -645,7 +645,6 @@ class Hooks:
         cmd_template = self.hooks.get(event)
         if not cmd_template:
             return None
-        # 替換變數
         cmd = cmd_template
         if context:
             for k, v in context.items():
@@ -658,6 +657,230 @@ class Hooks:
             return None
 
 
+# ============================================================
+#  P1-1: APPROVAL SYSTEM（權限/審批）
+# ============================================================
+APPROVAL_MODES = {
+    "auto": "全自動（只擋危險指令）",
+    "auto-edit": "文件修改自動，shell 指令要確認",
+    "ask": "每次工具呼叫都確認",
+}
+
+# 不需要確認的工具（只讀）
+SAFE_TOOLS = {"read_file", "search_files", "list_files", "git_status"}
+
+def check_approval(tool_name, params, approval_mode, console):
+    """檢查工具是否需要用戶確認。回傳 True = 允許, False = 拒絕"""
+    if approval_mode == "auto":
+        return True  # 全自動（危險指令在 run_command 裡已經擋了）
+    if tool_name in SAFE_TOOLS:
+        return True  # 只讀工具永遠通過
+    if approval_mode == "auto-edit" and tool_name in ("edit_file", "write_file"):
+        return True  # auto-edit 模式下文件修改自動通過
+
+    # 需要用戶確認
+    from rich.prompt import Confirm
+    param_preview = json.dumps(params, ensure_ascii=False)[:120]
+    console.print(f"  [yellow]⚠️ {tool_name}({param_preview})[/]")
+    return Confirm.ask("  允許執行?", default=True)
+
+
+# ============================================================
+#  P1-2: BACKGROUND TASKS（背景任務管理）
+# ============================================================
+import threading, uuid as _uuid
+
+class BackgroundTaskManager:
+    """背景任務管理器 — 長時間指令不阻塞主循環"""
+
+    def __init__(self):
+        self._tasks = {}  # id → {process, command, start_time, output}
+
+    def start(self, command, cwd):
+        """啟動背景任務"""
+        task_id = str(_uuid.uuid4())[:6]
+        proc = subprocess.Popen(
+            command, shell=True, cwd=cwd,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+            text=True)
+        self._tasks[task_id] = {
+            "process": proc, "command": command,
+            "start_time": datetime.now(), "output_lines": []
+        }
+        # 背景讀取輸出
+        def _reader():
+            for line in proc.stdout:
+                self._tasks[task_id]["output_lines"].append(line)
+        threading.Thread(target=_reader, daemon=True).start()
+        return task_id
+
+    def check(self, task_id):
+        """檢查任務狀態"""
+        t = self._tasks.get(task_id)
+        if not t: return {"status": "not_found"}
+        running = t["process"].poll() is None
+        elapsed = (datetime.now() - t["start_time"]).seconds
+        output = "".join(t["output_lines"][-20:])  # 最後 20 行
+        return {
+            "status": "running" if running else "done",
+            "exit_code": t["process"].returncode,
+            "elapsed": elapsed,
+            "output": output,
+            "command": t["command"],
+        }
+
+    def list_tasks(self):
+        """列出所有背景任務"""
+        results = []
+        for tid, t in self._tasks.items():
+            running = t["process"].poll() is None
+            elapsed = (datetime.now() - t["start_time"]).seconds
+            results.append(f"  {'🟢' if running else '⚫'} {tid}: {t['command'][:50]} ({elapsed}s)")
+        return "\n".join(results) if results else "  (無背景任務)"
+
+    def kill(self, task_id):
+        """終止任務"""
+        t = self._tasks.get(task_id)
+        if t and t["process"].poll() is None:
+            t["process"].kill()
+            return True
+        return False
+
+
+# ============================================================
+#  P1-3: CUSTOM AGENTS（自訂代理 .codepilot/agents/*.md）
+# ============================================================
+def load_custom_agents(project_dir):
+    """載入 .codepilot/agents/*.md 自訂代理"""
+    agents_dir = os.path.join(project_dir, ".codepilot", "agents")
+    agents = {}
+    if not os.path.isdir(agents_dir):
+        return agents
+    for f in sorted(Path(agents_dir).glob("*.md")):
+        content = f.read_text(encoding="utf-8")
+        name = f.stem
+        # 解析 YAML frontmatter
+        config = {"name": name, "prompt": content}
+        if content.startswith("---"):
+            parts = content.split("---", 2)
+            if len(parts) >= 3:
+                try:
+                    # 簡易 YAML 解析
+                    for line in parts[1].strip().split("\n"):
+                        if ":" in line:
+                            k, v = line.split(":", 1)
+                            k, v = k.strip(), v.strip()
+                            if v.startswith("[") and v.endswith("]"):
+                                v = [x.strip().strip("'\"") for x in v[1:-1].split(",")]
+                            config[k] = v
+                except: pass
+                config["prompt"] = parts[2].strip()
+        agents[name] = config
+    return agents
+
+
+def run_custom_agent(agent_config, user_task, model, tools, console):
+    """執行自訂代理"""
+    from rich.markdown import Markdown
+    name = agent_config["name"]
+    prompt = agent_config["prompt"]
+    allowed = agent_config.get("tools")  # list or None
+    denied = agent_config.get("disallowedTools", [])
+
+    console.print(f"\n[bold magenta]🤖 Agent: {name}[/]")
+
+    agent_messages = [
+        {"role": "system", "content": prompt},
+        {"role": "user", "content": user_task},
+    ]
+
+    full_response = ""
+    for rnd in range(5):  # 子代理最多 5 輪
+        with console.status(f"[magenta]{name} 思考中 (round {rnd+1})..."):
+            try: response = model.chat(agent_messages)
+            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:
+            console.print(f"  [magenta][{name}][/] {text_parts[:300]}")
+        full_response += response + "\n"
+        if not tool_calls: break
+
+        agent_messages.append({"role": "assistant", "content": response})
+        results = []
+        for call in tool_calls:
+            # 權限檢查
+            if allowed and call["tool"] not in allowed:
+                results.append(f"[{call['tool']}] ❌ 此代理不允許使用 {call['tool']}")
+                continue
+            if call["tool"] in denied:
+                results.append(f"[{call['tool']}] ❌ 此代理禁止使用 {call['tool']}")
+                continue
+            result = execute_tool(tools, call)
+            results.append(f"[{call['tool']}] {result}")
+        agent_messages.append({"role": "user", "content": "Tool results:\n" + "\n\n".join(results)})
+
+    return full_response
+
+
+# ============================================================
+#  P1-4: AUTO GIT COMMIT
+# ============================================================
+def auto_git_commit(tools, model, edited_files, console):
+    """自動 stage 修改的文件並 commit"""
+    if not edited_files:
+        console.print("[dim]沒有修改的文件[/]")
+        return
+
+    # 只 stage 明確修改過的文件（不用 git add -A）
+    rel_files = []
+    for f in edited_files:
+        try:
+            rel = os.path.relpath(f, tools.project_dir)
+            rel_files.append(rel)
+        except: continue
+
+    if not rel_files:
+        return
+
+    console.print(f"  [dim]📁 Stage: {', '.join(rel_files[:5])}{'...' if len(rel_files)>5 else ''}[/]")
+
+    # git add 個別文件
+    for f in rel_files:
+        subprocess.run(["git", "add", f], cwd=tools.project_dir, capture_output=True)
+
+    # 用模型生成 commit message
+    diff = subprocess.run(["git", "diff", "--cached", "--stat"],
+        cwd=tools.project_dir, capture_output=True, text=True).stdout
+
+    with console.status("[dim]生成 commit message..."):
+        msg_prompt = f"Generate a concise git commit message (1 line, max 72 chars) for:\n\n{diff[:2000]}"
+        try:
+            commit_msg = model.chat([{"role": "user", "content": msg_prompt}], max_tokens=100)
+            # 清理：取第一行，去掉引號
+            commit_msg = commit_msg.strip().split("\n")[0].strip('"').strip("'")
+            if len(commit_msg) > 72: commit_msg = commit_msg[:69] + "..."
+        except:
+            commit_msg = f"codepilot: update {len(rel_files)} file(s)"
+
+    console.print(f"  [dim]💬 {commit_msg}[/]")
+
+    from rich.prompt import Confirm
+    if Confirm.ask("  Commit?", default=True):
+        result = subprocess.run(["git", "commit", "-m", commit_msg],
+            cwd=tools.project_dir, capture_output=True, text=True)
+        if result.returncode == 0:
+            console.print(f"  [green]✅ Committed[/]")
+        else:
+            console.print(f"  [red]❌ {result.stderr[:200]}[/]")
+    else:
+        # unstage
+        subprocess.run(["git", "reset", "HEAD"] + rel_files,
+            cwd=tools.project_dir, capture_output=True)
+        console.print("  [dim]已取消[/]")
+
+
 def build_system_prompt(tools, project_memory=""):
     memory_section = f"\n\n## Project Memory (CODEPILOT.md)\n{project_memory}" if project_memory else ""
     return f"""You are CodePilot, an expert AI programming assistant working in the user's project.
@@ -873,10 +1096,16 @@ def run_agent_loop(args):
     else:
         messages = [{"role": "system", "content": system_prompt}]
 
-    hooks = Hooks(project_dir)  # P0-Bonus: Hooks 系統
-    edited_files_this_session = []  # 追蹤修改過的文件
+    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: 審批模式
+    edited_files_this_session = []
+
+    if custom_agents:
+        console.print(f"[dim]🤖 自訂���理: {', '.join(custom_agents.keys())}[/]")
 
-    console.print("[dim]/init /duel on|off /memo /verify /grind /ls /git /clear /status /train /quit[/]\n")
+    console.print(f"[dim]指令: /init /verify /commit /agent /bg /approval | /duel /memo /grind /ls /git /clear /status /train /quit[/]\n")
 
     while True:
         try: user_input = Prompt.ask("\n[bold green]🧑 You")
@@ -954,6 +1183,81 @@ def run_agent_loop(args):
             n = Prompt.ask("刷幾題？", default="50")
             run_grind(args, int(n)); continue
 
+        elif cmd == "/commit":
+            # P1-4: 自動 git commit
+            auto_git_commit(tools, model, edited_files_this_session, console)
+            continue
+
+        elif cmd.startswith("/agent"):
+            # P1-3: 自訂代理
+            parts = cmd.split(None, 2)
+            if len(parts) < 2:
+                console.print("[bold]可用代理:[/]")
+                if custom_agents:
+                    for name, cfg in custom_agents.items():
+                        desc = cfg.get("description", "")
+                        console.print(f"  🤖 {name}: {desc}")
+                    console.print(f"\n[dim]用法: /agent <名稱> <任務>[/]")
+                else:
+                    console.print("[dim]無自訂代理。建立 .codepilot/agents/*.md[/]")
+                    console.print("[dim]範例: .codepilot/agents/reviewer.md[/]")
+                continue
+            agent_name = parts[1]
+            agent_task = parts[2] if len(parts) > 2 else Prompt.ask("任務")
+            if agent_name in custom_agents:
+                result = run_custom_agent(custom_agents[agent_name], agent_task, model, tools, console)
+            elif agent_name == "explore":
+                # 內建 Explore agent（只讀）
+                result = run_custom_agent(
+                    {"name": "explore", "prompt": "You are an exploration agent. Read and search files to investigate. NEVER modify or create files.",
+                     "tools": ["read_file", "search_files", "list_files", "git_status"]},
+                    agent_task, model, tools, console)
+            elif agent_name == "plan":
+                # 內建 Plan agent
+                result = run_custom_agent(
+                    {"name": "plan", "prompt": "You are a planning agent. Analyze the task and create a detailed step-by-step plan. Do NOT execute any changes.",
+                     "tools": ["read_file", "search_files", "list_files", "git_status"]},
+                    agent_task, model, tools, console)
+            else:
+                console.print(f"[red]未知代理: {agent_name}[/]")
+                console.print(f"[dim]可用: {', '.join(list(custom_agents.keys()) + ['explore', 'plan'])}[/]")
+            continue
+
+        elif cmd.startswith("/bg"):
+            # P1-2: 背景任務
+            parts = cmd.split(None, 1)
+            if len(parts) < 2 or parts[1] == "list":
+                console.print(bg_tasks.list_tasks())
+            elif parts[1].startswith("run "):
+                bg_cmd = parts[1][4:]
+                tid = bg_tasks.start(bg_cmd, tools.cwd)
+                console.print(f"  [green]🚀 背景任務 {tid}: {bg_cmd}[/]")
+            elif parts[1].startswith("check "):
+                tid = parts[1][6:].strip()
+                info = bg_tasks.check(tid)
+                console.print(f"  狀態: {info['status']} | 耗時: {info.get('elapsed',0)}s")
+                if info.get("output"): console.print(Panel(info["output"][:500], title=f"bg:{tid}", border_style="dim"))
+            elif parts[1].startswith("kill "):
+                tid = parts[1][5:].strip()
+                if bg_tasks.kill(tid): console.print(f"  [red]⛔ 已終止 {tid}[/]")
+                else: console.print(f"  [dim]任務不存在或已結束[/]")
+            else:
+                console.print("[dim]/bg list | /bg run <cmd> | /bg check <id> | /bg kill <id>[/]")
+            continue
+
+        elif cmd.startswith("/approval"):
+            # P1-1: 切換審批模式
+            parts = cmd.split()
+            if len(parts) > 1 and parts[1] in APPROVAL_MODES:
+                approval_mode = parts[1]
+                console.print(f"  [green]審批模式: {approval_mode} — {APPROVAL_MODES[approval_mode]}[/]")
+            else:
+                console.print(f"  目前: [bold]{approval_mode}[/] — {APPROVAL_MODES.get(approval_mode,'')}")
+                for k, v in APPROVAL_MODES.items():
+                    marker = "→" if k == approval_mode else " "
+                    console.print(f"  {marker} /approval {k}: {v}")
+            continue
+
         elif cmd == "/status":
             s = db.count()
             t = Table(title="📊 統計"); t.add_column("", style="cyan"); t.add_column("", style="green")
@@ -1057,6 +1361,12 @@ def run_agent_loop(args):
             results = []
             for call in tool_calls:
                 console.print(f"  [dim]🔧 {call['tool']}[/]")
+
+                # P1-1: 審批檢查
+                if not check_approval(call["tool"], call["params"], approval_mode, console):
+                    results.append(f"[{call['tool']}] ⛔ 用戶拒絕執行")
+                    continue
+
                 result = execute_tool(tools, call)  # 已含 P0-2 截斷
                 tools_used_this_turn.append(call["tool"])
 
@@ -1168,6 +1478,8 @@ def main():
                    help="模型: local, openai, anthropic, openrouter, ollama, codex")
     p.add_argument("--api-key", type=str); p.add_argument("--cloud-model", type=str)
     p.add_argument("--duel", action="store_true", help="啟動時開啟 Duel 模式")
+    p.add_argument("--approval", type=str, choices=["auto","auto-edit","ask"], default="auto",
+                   help="審批模式: auto=全自動, auto-edit=指令要確認, ask=全部確認")
     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="刷幾題")