v4: Claude Code 4-layer memory (instructions + memory + session + compact)

codepilot_v4.py

@@ -84,50 +84,119 @@ class FeedbackDB:
 
 
 # ============================================================
-#  PROJECT CONTEXT — 記憶系統
+#  MEMORY SYSTEM — Claude Code 風格四層記憶
 # ============================================================
+# 匯入 memory.py 模組（如果存在），否則使用內建簡化版
+try:
+    from memory import (
+        load_instructions, load_memory, save_memory, append_memory,
+        build_full_system_prompt, SessionTranscript, FileStateCache,
+        should_compact, compact_messages, estimate_tokens
+    )
+    MEMORY_MODULE_AVAILABLE = True
+except ImportError:
+    MEMORY_MODULE_AVAILABLE = False
+
 class ProjectContext:
-    """專案上下文記憶"""
+    """
+    四層記憶：
+      L1: CODEPILOT.md 指令（遞迴搜尋 CWD 到根目錄）
+      L2: MEMORY.md 跨 session 記憶
+      L3: Session transcript (JSONL)
+      L4: 自動壓縮（context window 管理）
+    """
 
     def __init__(self, project_dir):
         self.project_dir = project_dir
-        self.memory_file = os.path.join(project_dir, "CODEPILOT.md")
+        self.cwd = project_dir
+
+        if MEMORY_MODULE_AVAILABLE:
+            # 用完整 memory.py 模組
+            self.transcript = SessionTranscript.find_latest(project_dir)
+            self.file_cache = FileStateCache()
+        else:
+            self.transcript = None
+            self.file_cache = None
+
+        # Session 文件（簡化版 fallback）
         self.session_file = os.path.join(CONFIG_DIR, "sessions",
             os.path.basename(project_dir) + ".json")
         os.makedirs(os.path.dirname(self.session_file), exist_ok=True)
 
+    def load_all_instructions(self):
+        """L1: 載入所有 CODEPILOT.md 指令"""
+        if MEMORY_MODULE_AVAILABLE:
+            return load_instructions(self.cwd)
+        # Fallback: 只讀當前目錄的
+        f = os.path.join(self.project_dir, "CODEPILOT.md")
+        return Path(f).read_text(encoding="utf-8") if os.path.exists(f) else ""
+
     def load_memory(self):
-        """讀取 CODEPILOT.md 專案記憶"""
-        if os.path.exists(self.memory_file):
-            return Path(self.memory_file).read_text(encoding="utf-8")
+        """L2: 載入跨 session 記憶"""
+        if MEMORY_MODULE_AVAILABLE:
+            return load_memory(self.cwd)
         return ""
 
-    def save_memory(self, content):
-        """保存專案記憶"""
-        Path(self.memory_file).write_text(content, encoding="utf-8")
+    def save_memory_entry(self, entry):
+        """L2: 追加一條記憶"""
+        if MEMORY_MODULE_AVAILABLE:
+            append_memory(self.cwd, entry)
 
     def load_session(self):
-        """載入上次對話"""
+        """L3: 載入上次對話"""
+        if MEMORY_MODULE_AVAILABLE and self.transcript:
+            return self.transcript.load_messages()
         if os.path.exists(self.session_file):
             try:
                 data = json.loads(Path(self.session_file).read_text())
-                # 只保留最近 20 輪對話（防止 context 爆掉）
                 msgs = data.get("messages", [])
-                if len(msgs) > 42:  # system + 20 rounds * 2 + buffer
-                    msgs = [msgs[0]] + msgs[-40:]
+                if len(msgs) > 42: msgs = [msgs[0]] + msgs[-40:]
                 return msgs
-            except:
-                pass
+            except: pass
         return None
 
     def save_session(self, messages):
-        """保存當前對話"""
-        # 只保最近 20 輪
-        if len(messages) > 42:
-            messages = [messages[0]] + messages[-40:]
+        """L3: 保存當前對話"""
+        if MEMORY_MODULE_AVAILABLE:
+            if not self.transcript:
+                self.transcript = SessionTranscript(self.cwd)
+            # 追加最新訊息到 JSONL
+            if messages:
+                last = messages[-1]
+                self.transcript.append(last.get("role", "user"), last)
+        # 也保存簡化版
+        if len(messages) > 42: messages = [messages[0]] + messages[-40:]
         Path(self.session_file).write_text(
-            json.dumps({"messages": messages, "timestamp": datetime.now().isoformat()},
-                       ensure_ascii=False))
+            json.dumps({"messages": messages, "timestamp": datetime.now().isoformat()}, ensure_ascii=False))
+
+    def check_compact(self, messages, model_chat_fn=None):
+        """L4: 檢查是否需要壓縮，自動執行"""
+        if not MEMORY_MODULE_AVAILABLE:
+            # Fallback: 簡單截斷
+            if len(messages) > 42:
+                return [messages[0]] + messages[-40:]
+            return messages
+
+        if should_compact(messages):
+            edited_files = self.file_cache.get_recently_edited() if self.file_cache else []
+            if model_chat_fn:
+                return compact_messages(messages, model_chat_fn, edited_files)
+            else:
+                return [messages[0]] + messages[-30:]
+        return messages
+
+    def build_system_prompt(self, git_context=""):
+        """組裝完整 system prompt"""
+        if MEMORY_MODULE_AVAILABLE:
+            return build_full_system_prompt(self.cwd, git_context)
+        # Fallback
+        memory = self.load_all_instructions()
+        mem = self.load_memory()
+        parts = ["You are CodePilot, an expert AI programming assistant."]
+        if memory: parts.append(memory)
+        if mem: parts.append(f"## Memory\n{mem}")
+        parts.append(f"Working directory: {self.cwd}\n{git_context}")
+        return "\n\n".join(parts)
 
 
 # ============================================================
@@ -451,21 +520,25 @@ def run_agent_loop(args):
     # Duel 模式開關
     duel_mode = args.duel and local_model_ref and cloud_model_ref
 
-    # 專案記憶
-    project_memory = ctx.load_memory()
+    # 專案記憶（四層）
+    instructions = ctx.load_all_instructions()
+    memory = ctx.load_memory()
 
     # Banner
     banner = f"[bold cyan]CodePilot v4[/]"
     if duel_mode: banner += " [bold yellow]⚔️ Duel ON[/]"
     banner += f"\n[dim]Model: {model.name}\nProject: {project_dir}[/]"
-    if project_memory: banner += f"\n[dim]📝 CODEPILOT.md loaded ({len(project_memory)} chars)[/]"
+    if instructions: banner += f"\n[dim]📋 CODEPILOT.md loaded[/]"
+    if memory: banner += f"\n[dim]🧠 MEMORY.md loaded ({len(memory)} chars)[/]"
+    if MEMORY_MODULE_AVAILABLE: banner += f"\n[dim]💾 Session JSONL + Auto-compact enabled[/]"
     console.print(Panel.fit(banner, border_style="cyan"))
 
     git_ctx = tools.git_context()
     if git_ctx != "(not a git repo)": console.print(Panel(git_ctx, title="📂 Project", border_style="dim"))
 
     # 嘗試恢復上次對話
-    system_prompt = build_system_prompt(tools, project_memory)
+    git_ctx = tools.git_context()
+    system_prompt = ctx.build_system_prompt(git_ctx)
     prev_session = ctx.load_session()
     if prev_session and len(prev_session) > 1:
         messages = prev_session
@@ -496,23 +569,46 @@ def run_agent_loop(args):
         elif cmd == "/duel off":
             duel_mode = False; console.print("[dim]Duel 模式已關閉[/]"); continue
 
-        elif cmd == "/memo":
-            console.print(f"[bold]📝 CODEPILOT.md[/]")
-            console.print("[dim]輸入專案筆記（END 結束），會注入每次對話的 system prompt:[/]")
-            lines = []
-            if project_memory: console.print(f"[dim]目前內容:\n{project_memory[:500]}[/]\n")
-            while True:
-                try:
-                    l = input()
-                    if l.strip() == "END": break
-                    lines.append(l)
-                except EOFError: break
-            if lines:
-                project_memory = "\n".join(lines)
-                ctx.save_memory(project_memory)
-                system_prompt = build_system_prompt(tools, project_memory)
-                messages[0] = {"role": "system", "content": system_prompt}
-                console.print(f"[green]✅ 已保存 CODEPILOT.md ({len(project_memory)} chars)[/]")
+        elif cmd == "/memo" or cmd.startswith("/memo "):
+            # /memo → 編輯 CODEPILOT.md 指令
+            # /memo + 文字 → 快速追加到 MEMORY.md
+            quick_note = cmd[5:].strip() if cmd.startswith("/memo ") else ""
+            if quick_note:
+                ctx.save_memory_entry(quick_note)
+                console.print(f"[green]🧠 已追加到 MEMORY.md: {quick_note}[/]")
+            else:
+                console.print(f"[bold]📋 CODEPILOT.md[/] — 專案指令（提交到 repo）")
+                console.print(f"[bold]🧠 MEMORY.md[/] — 自動記憶（跨 session）\n")
+                console.print("[dim]快速追加: /memo 這是一條記憶[/]")
+                console.print("[dim]編輯指令: 輸入內容（END 結束）[/]")
+                cur = ctx.load_all_instructions()
+                if cur: console.print(f"[dim]目前 CODEPILOT.md:\n{cur[:300]}...[/]\n")
+                cur_mem = ctx.load_memory()
+                if cur_mem: console.print(f"[dim]目前 MEMORY.md:\n{cur_mem[:300]}...[/]\n")
+                console.print("選擇: [cyan]1[/]=編輯 CODEPILOT.md  [cyan]2[/]=編輯 MEMORY.md  Enter=取消")
+                choice = Prompt.ask("  ", choices=["1","2",""], default="", show_choices=False)
+                if choice in ("1", "2"):
+                    console.print("輸入內容（END 結束）:")
+                    edit_lines = []
+                    while True:
+                        try:
+                            l = input()
+                            if l.strip() == "END": break
+                            edit_lines.append(l)
+                        except EOFError: break
+                    if edit_lines:
+                        content = "\n".join(edit_lines)
+                        if choice == "1":
+                            codepilot_md = os.path.join(project_dir, "CODEPILOT.md")
+                            Path(codepilot_md).write_text(content, encoding="utf-8")
+                            console.print(f"[green]✅ CODEPILOT.md 已保存[/]")
+                        else:
+                            if MEMORY_MODULE_AVAILABLE:
+                                save_memory(project_dir, content)
+                            console.print(f"[green]✅ MEMORY.md 已保存[/]")
+                        # 重建 system prompt
+                        system_prompt = ctx.build_system_prompt(tools.git_context())
+                        messages[0] = {"role": "system", "content": system_prompt}
             continue
 
         elif cmd == "/grind":
@@ -648,6 +744,10 @@ def run_agent_loop(args):
                 console.print("  [yellow]✏️[/]")
 
         messages.append({"role": "assistant", "content": full_response})
+
+        # L4: 自動壓縮檢查
+        messages = ctx.check_compact(messages, model_chat_fn=model.chat if hasattr(model, 'chat') else None)
+
         ctx.save_session(messages)
 
     console.print("\n[cyan]👋[/]")