feat: advance local-first conflict and search indexing

- 补齐本地 markdown 冲突处理与合并写回路径\n- 增加本地搜索索引路由、刷新与 browser smoke\n- 同步更新 current-priority checklist 的阶段进度

rust/crates/mnote-web/src/ssr/styles.rs

@@ -1190,6 +1190,9 @@ a:hover {
 .wolai-search-result-title{color:#2F2D29;font-size:14px;line-height:1.35;word-break:break-word}
 .wolai-search-result-title mark,.wolai-search-result-snippet mark{padding:0 1px;border-radius:2px;background:#FFE9E6;color:#D83A32}
 .wolai-search-result-snippet,.wolai-search-empty{color:#8B8780;font-size:12px;line-height:1.35}
+.wolai-search-result-path{display:flex;align-items:center;gap:8px;color:#A09B93;font-size:11px;line-height:1.3;min-width:0}
+.wolai-search-result-path span:first-child{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.wolai-search-result-type{flex:0 0 auto;padding:1px 5px;border-radius:4px;background:rgba(55,53,47,.06);color:#6F6A63;text-transform:uppercase;font-size:10px;letter-spacing:0}
 .wolai-search-empty,.wolai-search-recent{padding:28px 12px 32px;text-align:center;color:#8B8780;font-size:12px;line-height:1.35}
 
 @media (max-width: 768px) {
@@ -2544,6 +2547,7 @@ body {
 }
 
 .mnote-conflict-diff-panel pre,
+.mnote-conflict-merge-box textarea,
 .mnote-conflict-diff-status {
   min-height: 96px;
   max-height: 260px;
@@ -2558,6 +2562,16 @@ body {
   line-height: 18px;
 }
 
+.mnote-conflict-merge-box {
+  grid-column: 1 / -1;
+}
+
+.mnote-conflict-merge-box textarea {
+  width: 100%;
+  min-height: 132px;
+  resize: vertical;
+}
+
 @media (max-width: 768px) {
   .mnote-conflict-diff-panel {
     grid-template-columns: 1fr;