merge

.codebuddy/hooks/capture_session_end.py

@@ -127,12 +127,16 @@ def _read_event() -> dict:
 def _resolve_repo_path(event: dict) -> str:
     """Resolve the repo root, preferring authoritative sources.
 
-    Priority: CODEBUDDY_PROJECT_DIR env var (CodeBuddy-specific) >
-    CLAUDE_PROJECT_DIR (compat) > event's cwd > this script's repo location.
-    Candidates that don't exist on disk are skipped.
+    Priority: the host's *_PROJECT_DIR env var (each host injects its own:
+    CODEBUDDY/QODER/GEMINI/TRAE, plus CLAUDE_PROJECT_DIR compat) > event's
+    cwd > this script's repo location. Candidates that don't exist on disk
+    are skipped.
     """
     candidates = [
         os.environ.get("CODEBUDDY_PROJECT_DIR"),
+        os.environ.get("QODER_PROJECT_DIR"),
+        os.environ.get("GEMINI_PROJECT_DIR"),
+        os.environ.get("TRAE_PROJECT_DIR"),
         os.environ.get("CLAUDE_PROJECT_DIR"),
         event.get("cwd"),
         str(REPO),

.codebuddy/hooks/task_session_start.py

@@ -54,6 +54,9 @@
 from pathlib import Path
 
 REPO = Path(__file__).resolve().parents[2]  # <repo>/.codebuddy/hooks/ -> <repo>
+# 本副本安装所在的 IDE 配置目录名（".codebuddy"/".qoder"/…）；
+# 包内源副本位于 codewiki/hooks/，取值为 "codewiki"。
+IDE_DIR_NAME = Path(__file__).resolve().parents[1].name
 
 
 def _read_event() -> dict:
@@ -79,12 +82,16 @@ def _read_event() -> dict:
 def _resolve_repo_path(event: dict) -> str:
     """Resolve the repo root, preferring authoritative sources.
 
-    Priority: CODEBUDDY_PROJECT_DIR env var (CodeBuddy-specific) >
-    CLAUDE_PROJECT_DIR (compat) > event's cwd > this script's repo location.
-    Candidates that don't exist on disk are skipped.
+    Priority: the host's *_PROJECT_DIR env var (each host injects its own:
+    CODEBUDDY/QODER/GEMINI/TRAE, plus CLAUDE_PROJECT_DIR compat) > event's
+    cwd > this script's repo location. Candidates that don't exist on disk
+    are skipped.
     """
     candidates = [
         os.environ.get("CODEBUDDY_PROJECT_DIR"),
+        os.environ.get("QODER_PROJECT_DIR"),
+        os.environ.get("GEMINI_PROJECT_DIR"),
+        os.environ.get("TRAE_PROJECT_DIR"),
         os.environ.get("CLAUDE_PROJECT_DIR"),
         event.get("cwd"),
         str(REPO),
@@ -253,6 +260,44 @@ def _load_doctrine(repo_path: str) -> str:
     )
 
 
+def _load_knowledge_overview(repo_path: str) -> str:
+    """One-paragraph knowledge-base overview for the fresh session (P2-2 thin).
+
+    claude-mem borrowing: SessionStart is the "visible before work starts"
+    channel — the tool description (P0-3) only fires when the agent already
+    thinks of calling query_wiki. This section says the knowledge base EXISTS
+    (N notes / recent key decisions) and carries the one-line four-layer
+    retrieval strategy, so agents that never thought to search still do.
+
+    Deliberately thin: counts files and reads only the 3 newest note titles
+    (stdlib-only line scan of ``metadata.date``-style filename prefixes —
+    note filenames start with YYYY-MM-DD). Degrades to "" when repowiki/
+    notes is absent or empty; never breaks the task prompt.
+    """
+    try:
+        notes_dir = Path(repo_path) / "repowiki" / "notes"
+        if not notes_dir.is_dir():
+            return ""
+        notes = sorted(
+            (p for p in notes_dir.glob("*.md") if p.is_file()),
+            key=lambda p: p.name,
+            reverse=True,
+        )
+        if not notes:
+            return ""
+        recent = [p.name[:-3] for p in notes[:3]]
+        lines = [
+            "【知识库提示】本仓库有 repowiki 知识库"
+            f"（{len(notes)} 条笔记），改文件/做设计前先查：",
+            "- 改某文件前：query_wiki(by_file=<路径>) 查该文件的历史决策与教训；",
+            "- 主题检索：query_wiki(mode='check') 先轻量预检，再全文检索（结果带 est_tokens 成本）；",
+            f"- 最新笔记：{ '；'.join(recent) }",
+        ]
+        return "\n".join(lines)
+    except OSError:
+        return ""
+
+
 def _build_message(event: dict, repo_path: str) -> str:
     """Build the guidance injected into the fresh session.
 
@@ -318,12 +363,23 @@ def _build_message(event: dict, repo_path: str) -> str:
         for tid, n in sorted(pending_counts.items()):
             label = f"任务 {tid}" if tid else "未关联任务"
             lines.append(f"  - {label}: {n} 条")
-        lines.append(
-            "绑定任务之后，立即用 Task 工具 spawn「蒸馏 worker」subagent "
-            "（.codebuddy/agents/distill-worker.md，已授权 codewiki MCP）后台执行补蒸馏；"
-            "主 Agent 不要亲自 read_file raw 原文、也不等蒸馏完成，直接开始回答用户提问。"
-            "蒸馏 worker 走 Mode C（纯 MCP JSON）流程："
-        )
+        if IDE_DIR_NAME == ".codebuddy":
+            lines.append(
+                "绑定任务之后，立即用 Task 工具 spawn「蒸馏 worker」subagent "
+                "（.codebuddy/agents/distill-worker.md，已授权 codewiki MCP）后台执行补蒸馏；"
+                "主 Agent 不要亲自 read_file raw 原文、也不等蒸馏完成，直接开始回答用户提问。"
+            )
+        else:
+            # claude 家族（Qoder/Claude Code/Gemini CLI）：自定义子代理拿不到
+            # MCP 权限（实测），委托改走内置 general-purpose 子代理，
+            # 以 distill-worker.md 正文为剧本。包内源副本同走此分支。
+            lines.append(
+                "绑定任务之后，立即用 Task 工具 spawn 内置 general-purpose 子代理后台执行补蒸馏："
+                f"让它先读 {IDE_DIR_NAME}/agents/distill-worker.md（蒸馏 worker 剧本），"
+                "再按其中 Mode C 流程执行（本宿主自定义子代理拿不到 MCP 权限，须用内置子代理）；"
+                "主 Agent 不要亲自 read_file raw 原文、也不等蒸馏完成，直接开始回答用户提问。"
+            )
+        lines.append("蒸馏子代理走 Mode C（纯 MCP JSON）流程：")
         lines.append(
             '  1. distill_conversation(mode="prepare", task_id=<绑定的任务id>) '
             "获取该任务的积压对话清单"
@@ -361,6 +417,14 @@ def _build_message(event: dict, repo_path: str) -> str:
         lines.append("")
         lines.append(doctrine)
 
+    # P2-2 (claude-mem borrowing, thin): knowledge-base overview — make the
+    # KB's existence and the cheapest retrieval entries visible before work
+    # starts, complementing P0-3's call-time tool description.
+    overview = _load_knowledge_overview(repo_path)
+    if overview:
+        lines.append("")
+        lines.append(overview)
+
     return "\n".join(lines)
 
 

.codebuddy/settings.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "python \"d:\\repos\\CodeWiki-CN\\.codebuddy\\hooks\\task_session_start.py\"",
+            "command": "python \".codebuddy/hooks/task_session_start.py\"",
             "timeout": 15
           }
         ]
@@ -18,7 +18,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "python \"d:\\repos\\CodeWiki-CN\\.codebuddy\\hooks\\capture_session_end.py\"",
+            "command": "python \".codebuddy/hooks/capture_session_end.py\"",
             "timeout": 30
           }
         ]

.codebuddy/skills/grill-me/SKILL.md

@@ -0,0 +1,7 @@
+---
+name: grill-me
+description: A relentless interview to sharpen a plan or design.
+disable-model-invocation: true
+---
+
+Call the Skill tool with "grilling".

.codebuddy/skills/grill-me/agents/openai.yaml

@@ -0,0 +1,5 @@
+interface:
+  display_name: "Grill Me"
+  short_description: "Sharpen a plan through interview"
+policy:
+  allow_implicit_invocation: false

.codebuddy/skills/grilling/SKILL.md

@@ -0,0 +1,22 @@
+---
+name: grilling
+description: Grill the user relentlessly about a plan, decision, or idea. Use when the user wants to stress-test their thinking, or uses any 'grill' trigger phrases.
+---
+
+Interview the user relentlessly until you reach a shared understanding. Map this as a **design tree**: every decision branches into the decisions that hang off it.
+
+Work the tree in **rounds**. The **frontier** is every decision whose prerequisites are already settled: the questions you can ask _now_ without guessing at answers you haven't heard yet. Ask the whole frontier in one round: number each question and give your recommended answer. Then wait for the user's answers before the next round.
+
+Each question should be formatted like so:
+
+```
+❓ **Q1** - **<question title>**: <question body, might be multiple paragraphs, including multiple choices>
+
+➡️ <your recommended answer>
+```
+
+Each round the user answers reshapes the tree: settled decisions push the frontier outward and unblock questions that depended on them. Recompute the frontier and ask the next round. A question whose answer depends on another question still open in this round belongs to a _later_ round, not this one.
+
+Finding _facts_ is your job, never the user's. When a frontier question needs a fact from the environment (filesystem, tools, etc.), dispatch a sub-agent to find it; don't ask the user for anything you could look up yourself. Don't block on it: a running exploration is an unsettled prerequisite, so only the questions downstream of it wait for the sub-agent to report; ask the rest of the frontier now. The _decisions_ are the user's: put each to them and wait.
+
+The session is done when the frontier is empty: every branch of the design tree visited, nothing left silently assumed. Do not act on it until the user confirms you have reached a shared understanding.

.codebuddy/skills/grilling/agents/openai.yaml

@@ -0,0 +1,3 @@
+interface:
+  display_name: "Grilling"
+  short_description: "Stress-test thinking a round of questions at a time"

.codebuddy/teams/3145cf7354b441ffacadba3e15874bef/_auto_3145cf7354b441ffacadba3e15874bef/config.json

@@ -0,0 +1,19 @@
+{
+  "name": "_auto_3145cf7354b441ffacadba3e15874bef",
+  "mainConversationId": "3145cf7354b441ffacadba3e15874bef",
+  "workspacePath": "d:\\repos\\CodeWiki-CN",
+  "createdAt": "2026-09-05T11:08:37.175Z",
+  "options": {
+    "workspacePath": "d:\\repos\\CodeWiki-CN",
+    "isAutoTeam": true
+  },
+  "isAutoTeam": true,
+  "members": [
+    {
+      "memberId": "distill-worker@_auto_3145cf7354b441ffacadba3e15874bef",
+      "name": "distill-worker",
+      "role": "补蒸馏产品维护积压对话",
+      "sessionId": "aa58dfd742054c83bd11ec7ef7a8c6fe"
+    }
+  ]
+}

.codebuddy/teams/3145cf7354b441ffacadba3e15874bef/_auto_3145cf7354b441ffacadba3e15874bef/distill-worker.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/3145cf7354b441ffacadba3e15874bef/_auto_3145cf7354b441ffacadba3e15874bef/team-lead.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/31582129a47a43c4bb3d69f6c74aeca0/distill-backfill/config.json

@@ -0,0 +1,23 @@
+{
+  "name": "distill-backfill",
+  "mainConversationId": "31582129a47a43c4bb3d69f6c74aeca0",
+  "workspacePath": "d:/repos/CodeWiki-CN",
+  "createdAt": "2026-09-04T05:58:30.032Z",
+  "options": {
+    "workspacePath": "d:/repos/CodeWiki-CN"
+  },
+  "members": [
+    {
+      "memberId": "distill-he2@distill-backfill",
+      "name": "distill-he2",
+      "role": "补蒸馏他山之石积压",
+      "sessionId": "7e6f083993734e8ea891a6935f1ce8b7"
+    },
+    {
+      "memberId": "hook-probe@distill-backfill",
+      "name": "hook-probe",
+      "role": "调查 CodeWiki hook/注入设施",
+      "sessionId": "d7e74f690c1b452a94ef174bc494f967"
+    }
+  ]
+}

.codebuddy/teams/31582129a47a43c4bb3d69f6c74aeca0/distill-backfill/distill-he2.json

@@ -0,0 +1,11 @@
+[
+  {
+    "id": "shutdown-1788501682764",
+    "from": "team-lead",
+    "to": "distill-he2",
+    "type": "shutdown_request",
+    "content": "{\"type\":\"shutdown_request\",\"request_id\":\"shutdown-1788501682764\",\"reason\":\"补蒸馏汇报已收到，使命完成，感谢。另确认：你提到「2 条 caveman architecture 笔记已 stable」与用户实际决定有出入——用户此前已拒绝其中 1 条（caveman 生效机制）并 reject_note 标记 deprecated，另 1 条（hook 工程化防御）保留待定。请勿在后续输出中把已拒绝笔记当作生效知识引用。可关闭。\",\"from\":\"team-lead\",\"timestamp\":\"2026-09-04T06:01:22.764Z\"}",
+    "timestamp": "2026-09-04T06:01:22.764Z",
+    "read": true
+  }
+]

.codebuddy/teams/31582129a47a43c4bb3d69f6c74aeca0/distill-backfill/hook-probe.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/31582129a47a43c4bb3d69f6c74aeca0/distill-backfill/team-lead.json

@@ -0,0 +1,20 @@
+[
+  {
+    "id": "msg-1788501657041-qgnffd",
+    "from": "distill-he2",
+    "to": "team-lead",
+    "type": "message",
+    "content": "「他山之石」补蒸馏完成汇报。\n\n【结论】该任务有 1 条待蒸馏积压（conv-https-github.com-JuliusBrussee-caveman.git-研究下这个技能是如何生效的，27 轮 supersede 续捕版）。raw 的旧 12 轮版本此前已蒸馏并产出 2 条 stable 笔记（caveman 生效机制 / hook 工程化防御，已确认落盘）。本次处理的是新增内容（CodeBuddy 使用方式），非重复提交。\n\n【本次提交】\n- 新建笔记 1 条（decision，draft 待确认）：\n  《在 CodeBuddy 使用跨 Agent 技能：纯 SKILL.md 直接装 ~/.codebuddy/skills/，hooks 需 CLI/插件市场、Native Pack 无 codebuddy target》\n  内容：CodeBuddy 兼容性边界实测表（纯 SKILL.md 技能 ✅ 支持 / Plugin hooks ⚠️ 需 CLI+写死 ~/.claude / 本地代理 ❌ 无 codebuddy target / TOML slash 命令 ❌ 只认 Markdown 版）+ 推荐做法（把 caveman 当普通 Skill 全量安装到 ~/.codebuddy/skills/）。\n  落盘：repowiki/notes/2026-09-04-在-codebuddy-使用跨-agent-技能纯-skillmd-直接装-codebuddyskillshooks-需.md\n- 去重抑制/合并：0（仅一次冲突，判定 store 通过——候选笔记只覆盖 caveman 机制，不含 CodeBuddy 兼容内容）\n- 落盘任务记忆 3 条（memories_written=3，直写 memories 文件）：\n  1) caveman 研究已完成、2 条 architecture 笔记已确认落盘；\n  2) 用户拍板把 caveman 全量安装到 ~/.codebuddy/skills/，安装动作在会话末尾仍在执行，需确认完成并清理 .caveman-tmp；\n  3) raw/ 另有 14 条「未关联任务」pending raw（带 .lck 空锁，误批处理所致无副作用），建议主 Agent 统一安排归属。\n\n【归档】raw 主体已归档至 conversations/conv-...-a51ed2.md，暂存文件已自动清理。\n\n【建议展示给用户的待确认草稿】1 条：上述 CodeBuddy 技能安装 decision 笔记（另 2 条同主题 caveman architecture 笔记此前已 stable，无需再确认）。注意：draft 笔记确认前只作只读参考。",
+    "timestamp": "2026-09-04T06:00:57.041Z",
+    "read": true
+  },
+  {
+    "id": "resp-1788501683018-5p9a0i",
+    "from": "distill-he2",
+    "to": "team-lead",
+    "type": "shutdown_response",
+    "content": "{\"type\":\"shutdown_response\",\"request_id\":\"shutdown-1788501682764\",\"approve\":true,\"reason\":\"Auto-acknowledged by team-member runtime\",\"from\":\"distill-he2\",\"timestamp\":\"2026-09-04T06:01:23.018Z\"}",
+    "timestamp": "2026-09-04T06:01:23.018Z",
+    "read": true
+  }
+]

.codebuddy/teams/8dc3144e030e401a942b5d77f8d4bfcb/_auto_8dc3144e030e401a942b5d77f8d4bfcb/config.json

@@ -0,0 +1,19 @@
+{
+  "name": "_auto_8dc3144e030e401a942b5d77f8d4bfcb",
+  "mainConversationId": "8dc3144e030e401a942b5d77f8d4bfcb",
+  "workspacePath": "d:\\repos\\CodeWiki-CN",
+  "createdAt": "2026-09-05T10:32:04.626Z",
+  "options": {
+    "workspacePath": "d:\\repos\\CodeWiki-CN",
+    "isAutoTeam": true
+  },
+  "isAutoTeam": true,
+  "members": [
+    {
+      "memberId": "distill-他山之石@_auto_8dc3144e030e401a942b5d77f8d4bfcb",
+      "name": "distill-他山之石",
+      "role": "补蒸馏他山之石任务",
+      "sessionId": "4e77bbad99d446cd9ac307f548735c87"
+    }
+  ]
+}

.codebuddy/teams/8dc3144e030e401a942b5d77f8d4bfcb/_auto_8dc3144e030e401a942b5d77f8d4bfcb/distill-他山之石.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/8dc3144e030e401a942b5d77f8d4bfcb/_auto_8dc3144e030e401a942b5d77f8d4bfcb/team-lead.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/a70f83a01faf4c36b42b2819fd61bf45/codewiki-product-maintenance/config.json

@@ -0,0 +1,17 @@
+{
+  "name": "codewiki-product-maintenance",
+  "mainConversationId": "a70f83a01faf4c36b42b2819fd61bf45",
+  "workspacePath": "d:/repos/CodeWiki-CN",
+  "createdAt": "2026-09-05T11:27:43.987Z",
+  "options": {
+    "workspacePath": "d:/repos/CodeWiki-CN"
+  },
+  "members": [
+    {
+      "memberId": "distill-worker@codewiki-product-maintenance",
+      "name": "distill-worker",
+      "role": "后台补蒸馏未关联积压",
+      "sessionId": "8e7d9ceea0864d518f2538b3850ef21b"
+    }
+  ]
+}

.codebuddy/teams/a70f83a01faf4c36b42b2819fd61bf45/codewiki-product-maintenance/distill-worker.json

@@ -0,0 +1 @@
+[]

.codebuddy/teams/a70f83a01faf4c36b42b2819fd61bf45/codewiki-product-maintenance/team-lead.json

@@ -0,0 +1 @@
+[]

.gitignore

@@ -53,9 +53,26 @@ repowiki/.meta/retrieval_stats.db
 # T2 (团队方案): 共享遥测事件流 .meta/telemetry/ 默认入库；本机退化模式
 # (conventions.telemetry.enabled: false) 的写入位置不入库
 repowiki/.meta/telemetry-local/
+# P2-3: 原子写残留（崩溃/被杀时 .tmp.<pid>.<tid> 不及清理）与 sidecar 锁文件
+# 是本机瞬态产物，永远不入库（历史误提交的 Administrator.jsonl.tmp.19748 即此类残留）
+repowiki/.meta/telemetry/*.tmp.*
+repowiki/.meta/telemetry/*.lck
 # T3 (团队方案): search_index.json 是秒级可重建的本机派生索引——
 # 入库只会制造最大的全量重写冲突面，且可能固化过期索引（T1 自愈兜底重建）
 repowiki/.meta/search_index.json
+# Team-layout Phase 1 (D1): 可重建派生物不入库（详见 docs/团队化文件冲突治理与同步策略设计方案.md）
+repowiki/wiki/index.md
+repowiki/.meta/edit_history.json
+repowiki/.meta/metadata.json
+repowiki/.meta/module_tree.json
+repowiki/.meta/symbol_map.json
+repowiki/.meta/project.json
+repowiki/.meta/overview_refs.json
+repowiki/.meta/aggregate_state.json
+repowiki/.meta/source_registry.json
+repowiki/.meta/task_bindings/
+repowiki/tasks/.index.json
+repowiki/distill-jobs.json
 # team-memory fusion: raw/ is a transient staging area for captured
 # conversations (deleted after distillation) — never commit it.
 repowiki/raw/
@@ -81,6 +98,10 @@ Thumbs.db
 *.tmp
 *.log
 *.bak
+# KnowledgeStore lock files (centralized under repowiki/.meta/locks/; *.lck
+# also covers legacy co-located sidecars)
+repowiki/.meta/locks/
+*.lck
 .trash/
 .codewiki/
 .workbuddy/