Resolve merge conflicts after pull

.claude/project-instructions.md

@@ -1,5 +1,19 @@
 # Obsidian PKM 助理工作指南
 
+
+
+## Memvid MCP memory rules
+
+- Use the `memvid` MCP server only for durable preferences, decisions, and long-lived project context.
+- At the start of each task, query memory before acting.
+  - Use `memvid_search` (or `memvid_search_by_tag` when tags are available).
+- After each task, write back any new durable preferences/decisions/constraints.
+  - Use `memvid_add_text` or `memvid_add_file`, then `memvid_commit`.
+- Never store secrets, tokens, credentials, or transient errors/logs.
+- Use consistent tags like `project`, `decision`, `preference`, `constraint`.
+- Default memory file path: `.claude/memory/memvid.mv2` (override only if user specifies).
+
+
 > 本指南叠加在 Claudian 基础能力之上，专注于个人知识管理的内容整理与组织。
 
 ---

.obsidian/plugins/claudian/data.json

@@ -1,5 +1,5 @@
 {
-  "activeConversationId": "conv-1767757538235-u1e3hirap",
+  "activeConversationId": "conv-1767796005456-scja60kdo",
   "lastEnvHash": "",
   "lastClaudeModel": "sonnet",
   "lastCustomModel": ""

.obsidian/vault-stats.json

@@ -1 +1 @@
-{"history":{"2026-01-05":{"words":0,"characters":0,"sentences":0,"pages":0,"files":0,"footnotes":0,"citations":0,"totalWords":715315,"totalCharacters":4209751,"totalSentences":15845,"totalFootnotes":15,"totalCitations":4,"totalPages":2384.000000000001},"2026-01-07":{"words":925,"characters":2796,"sentences":14,"pages":3.1,"files":511,"footnotes":0,"citations":0,"totalWords":718917,"totalCharacters":4247982,"totalSentences":16165,"totalFootnotes":15,"totalCitations":3,"totalPages":2396.300000000001}},"modifiedFiles":{"00_Inbox/2026-01-07.md":{"words":{"initial":24,"current":949},"characters":{"initial":172,"current":2968},"sentences":{"initial":1,"current":15},"footnotes":{"initial":0,"current":0},"citations":{"initial":0,"current":0},"pages":{"initial":0.1,"current":3.2}}}}
+{"history":{"2026-01-05":{"words":0,"characters":0,"sentences":0,"pages":0,"files":0,"footnotes":0,"citations":0,"totalWords":718734,"totalCharacters":4218987,"totalSentences":15868,"totalFootnotes":15,"totalCitations":5,"totalPages":2395.400000000001},"2026-01-06":{"words":46,"characters":343,"sentences":1,"pages":0.2,"files":537,"footnotes":0,"citations":0,"totalWords":727447,"totalCharacters":4282044,"totalSentences":16208,"totalFootnotes":15,"totalCitations":5,"totalPages":2424.500000000001},"2026-01-07":{"words":0,"characters":0,"sentences":0,"pages":0,"files":0,"footnotes":0,"citations":0,"totalWords":724224,"totalCharacters":4268755,"totalSentences":16158,"totalFootnotes":15,"totalCitations":4,"totalPages":2413.600000000001}},"modifiedFiles":{}}