npm - finch-markdown-editor - Versions diffs - 0.1.0 → 0.1.2 - Mend

finch-markdown-editor 0.1.0 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/panel.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>Markdown Editor</title>
+<title>写作</title>
 <style>
 :root{
   --bg:var(--finch-bg-root,#f7f7f8);
@@ -70,6 +70,10 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
 .doc-sub{margin-top:2px;display:flex;gap:6px;font-size:11px;line-height:1.4;color:var(--muted)}
 .doc-sub .doc-path{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;text-align:left}
 .doc-sub .doc-time{flex:none;opacity:.8}
+.doc-reveal{position:absolute;top:6px;right:6px;z-index:1;display:flex;align-items:center;justify-content:center;width:24px;height:24px;padding:0;border:none;border-radius:7px;background:color-mix(in srgb, var(--bg) 72%, transparent);color:var(--muted);cursor:pointer;opacity:0;transition:opacity .12s ease,background .12s ease,color .12s ease}
+.doc-reveal svg{width:14px;height:14px}
+.doc-card:hover .doc-reveal,.doc-reveal:focus-visible{opacity:1}
+.doc-reveal:hover{background:var(--card);color:var(--text)}
 .home-hint{margin:0;padding:22px 0;text-align:center;font-size:12.5px;color:var(--muted)}
 .home-hint[hidden],.home-recent[hidden]{display:none}
 .status{font-size:12px;color:var(--muted);padding:5px 10px;text-align:center;border-top:1px solid var(--border);background:var(--bg)}
@@ -141,7 +145,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       <div class="home">
         <header class="home-head">
           <div>
-            <h1 data-i18n="home.title">Markdown Editor</h1>
+            <h1 data-i18n="home.title">写作</h1>
             <p id="homeTagline"></p>
           </div>
           <div class="home-cta">
@@ -230,7 +234,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   var STR = {
     zh: {
       'meta.title': '公众号文章预览',
-      'home.title': 'Markdown 编辑',
+      'home.title': '写作',
       'home.tagline.withAssistant': '你与{name}一起编排 Markdown 文件',
       'home.tagline.default': '打开一个 Markdown 文件开始编辑与预览，或新建一篇文章。',
       'home.openFile': '打开文件',
@@ -239,11 +243,12 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'home.hintScoped': '这个目录里还没有用编辑器打开过的 Markdown 文档。',
       'home.hintDefault': '打开一个 Markdown 文件，之后这里会列出最近编辑的文档。',
       'home.untitled': '未命名',
+      'home.revealInFileManager': '在文件管理器中定位',
       'home.emptyDoc': '（空文档）',
       'home.cwdTitle': '在访达 / 文件资源管理器中打开：{path}',
       'home.today': '今天 {clock}',
       'home.yesterday': '昨天 {clock}',
-      'editor.ariaLabel': 'Markdown 编辑器',
+      'editor.ariaLabel': '写作编辑器',
       'actions.copyToWx': '复制到公众号',
       'actions.copyImg': '复制图片',
       'actions.exportImg': '导出图片（下载）',
@@ -283,7 +288,12 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'toolbar.fontSize.large': '大',
       'toolbar.fontFamily.default': '默认（无衬线）',
       'toolbar.fontFamily.serif': '衬线体',
+      'toolbar.comfort.read': '紧凑',
+      'toolbar.comfort.write': '舒适',
+      'toolbar.focus.tooltipOn': '专注已开启：非当前行半透明',
+      'toolbar.focus.tooltipOff': '开启专注：非当前行半透明',
       'toolbar.more.reload': '重新渲染',
+      'toolbar.more.reveal': '在文件管理器中定位',
       'toolbar.more.about': '关于渲染',
       'annotate.lineUnknown': '（未能精确定位对应行号，请以下方引用文本为准）',
       'annotate.lineSingle': '第 {a} 行',
@@ -314,6 +324,9 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'status.noSourceFile': '未关联本地文件：点击工具栏「打开」重新选择一次即可关联并启用保存。',
       'status.pickerTimeout': '文件选择器长时间无响应，已切换为浏览器内选择器：请重新点击"打开"。',
       'status.externalUpdateSkipped': '检测到文件外部更新；为避免覆盖未保存内容，暂未载入。',
+      'status.draftRestored': '已恢复上次未保存的编辑内容（与磁盘文件不同）。如需放弃，点击「打开」重新选择该文件并选择"放弃"。',
+      'status.draftConflict': '检测到本地存有未保存草稿，但文件在别处已被修改保存；已加载最新文件内容，草稿仍保留在本地未丢弃。',
+      'status.sourceMissing': '原文件已被移动或删除；当前内容仍保留在编辑器中，保存将在原路径重新创建文件。',
       'status.externalUpdateApplied': '检测到文件更新，已刷新。',
       'status.openingPicker': '正在打开文件选择器…',
       'status.opening': '正在打开…',
@@ -340,6 +353,10 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'status.exported': '已导出：{path}',
       'status.annotateOn': '批注已开启：选中文字可发起 AI 修改。',
       'status.annotateOff': '批注已关闭。',
+      'status.comfortWrite': '已切换为舒适模式（行距加宽）。',
+      'status.comfortRead': '已切换为紧凑模式。',
+      'status.focusOn': '专注已开启：非当前行半透明。',
+      'status.focusOff': '专注已关闭。',
       'status.saveFailedNoReturn': '保存失败，未返回首页。',
       'status.rendererAbout': '渲染器：本机 bmmd CLI（bm.md，AGPL-3.0）。',
       'status.appliedStyleSlot': '已应用「{label}」。',
@@ -355,7 +372,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     },
     en: {
       'meta.title': 'Article Preview',
-      'home.title': 'Markdown Editor',
+      'home.title': 'Writing',
       'home.tagline.withAssistant': 'Write Markdown together with {name}',
       'home.tagline.default': 'Open a Markdown file to start editing and previewing, or create a new article.',
       'home.openFile': 'Open File',
@@ -364,11 +381,12 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'home.hintScoped': 'No Markdown documents have been opened from this folder yet.',
       'home.hintDefault': 'Open a Markdown file — recently edited documents will show up here.',
       'home.untitled': 'Untitled',
+      'home.revealInFileManager': 'Show in file manager',
       'home.emptyDoc': '(Empty document)',
       'home.cwdTitle': 'Open in Finder / File Explorer: {path}',
       'home.today': 'Today {clock}',
       'home.yesterday': 'Yesterday {clock}',
-      'editor.ariaLabel': 'Markdown editor',
+      'editor.ariaLabel': 'Writing editor',
       'actions.copyToWx': 'Copy for WeChat',
       'actions.copyImg': 'Copy image',
       'actions.exportImg': 'Export image (download)',
@@ -408,7 +426,12 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'toolbar.fontSize.large': 'Large',
       'toolbar.fontFamily.default': 'Default (sans-serif)',
       'toolbar.fontFamily.serif': 'Serif',
+      'toolbar.comfort.read': 'Compact',
+      'toolbar.comfort.write': 'Comfortable',
+      'toolbar.focus.tooltipOn': 'Focus mode is on — inactive lines are dimmed',
+      'toolbar.focus.tooltipOff': 'Turn on focus mode: dim inactive lines',
       'toolbar.more.reload': 'Re-render',
+      'toolbar.more.reveal': 'Show in file manager',
       'toolbar.more.about': 'About rendering',
       'annotate.lineUnknown': "(Couldn't pinpoint the exact line — use the quoted text below as reference)",
       'annotate.lineSingle': 'Line {a}',
@@ -439,6 +462,9 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'status.noSourceFile': 'Not linked to a local file: click “Open” in the toolbar again to link it and enable saving.',
       'status.pickerTimeout': 'The file picker took too long to respond and switched to the in-browser picker — please click "Open" again.',
       'status.externalUpdateSkipped': 'Detected an external file update; not loaded yet to avoid overwriting unsaved changes.',
+      'status.draftRestored': 'Restored your last unsaved edits (differs from the file on disk). To discard, click "Open" and pick this file again, then choose "Discard".',
+      'status.draftConflict': 'A local unsaved draft exists, but the file was changed and saved elsewhere; loaded the latest file content — the draft is kept, not discarded.',
+      'status.sourceMissing': 'The original file was moved or deleted; your content is still here — saving will recreate the file at its original path.',
       'status.externalUpdateApplied': 'Detected a file update and refreshed.',
       'status.openingPicker': 'Opening the file picker…',
       'status.opening': 'Opening…',
@@ -465,6 +491,10 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       'status.exported': 'Exported: {path}',
       'status.annotateOn': 'Annotate is on — select text to ask AI to revise it.',
       'status.annotateOff': 'Annotate is off.',
+      'status.comfortWrite': 'Comfortable mode is on — roomier line spacing.',
+      'status.comfortRead': 'Compact mode is on.',
+      'status.focusOn': 'Focus mode is on — inactive lines are dimmed.',
+      'status.focusOff': 'Focus mode is off.',
       'status.saveFailedNoReturn': 'Save failed — staying on this document.',
       'status.rendererAbout': 'Renderer: local bmmd CLI (bm.md, AGPL-3.0).',
       'status.appliedStyleSlot': 'Applied \u201c{label}\u201d.',
@@ -553,6 +583,11 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   };
   var editorFontSize = 14;
   var editorFont = 'rounded';
+  // Comfortable mode: roomier line spacing while composing. Default off
+  // (compact mode keeps the tighter 2px/1.7rem layout).
+  var comfortWriting = false;
+  // Focus mode ("专注"): dims every line except the cursor's own line.
+  var focusMode = false;
   try {
     // Only the three menu tiers are valid; anything else (missing, corrupt,
     // or from an older tier set) falls back to the default 14px tier.
@@ -561,6 +596,8 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     var savedEditorFont = localStorage.getItem('md-editor-font-family');
     if (EDITOR_FONTS[savedEditorFont]) editorFont = savedEditorFont;
     else if (savedEditorFont) localStorage.removeItem('md-editor-font-family');
+    comfortWriting = localStorage.getItem('md-editor-comfort-writing') === '1';
+    focusMode = localStorage.getItem('md-editor-focus-mode') === '1';
   } catch (e) {}
   var markdown = '';
   var name = '';
@@ -732,6 +769,9 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     for (var i = 0; i < list.length; i++) {
       var doc = list[i] || {};
       cards += '<button class="doc-card" type="button" data-path="' + escapeHtml(doc.path || '') + '" title="' + escapeHtml(doc.path || '') + '">'
+        + '<span class="doc-reveal" data-reveal-path="' + escapeHtml(doc.path || '') + '" role="button" tabindex="0" title="' + escapeHtml(t('home.revealInFileManager')) + '" aria-label="' + escapeHtml(t('home.revealInFileManager')) + '">'
+        + '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m6 14 1.45-2.9A2 2 0 0 1 9.24 10H20a2 2 0 0 1 1.94 2.5l-1.55 6a2 2 0 0 1-1.94 1.5H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h3.9a2 2 0 0 1 1.69.9l.81 1.2a2 2 0 0 0 1.67.9H18a2 2 0 0 1 2 2v2"/></svg>'
+        + '</span>'
         + '<div class="doc-preview">' + escapeHtml(doc.preview || t('home.emptyDoc')) + '</div>'
         + '<div class="doc-foot">'
         + '<div class="doc-title">' + escapeHtml(doc.title || doc.fileName || t('home.untitled')) + '</div>'
@@ -751,14 +791,35 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   var loadingFromHome = false;
   if (homeGrid) homeGrid.addEventListener('click', function (event) {
+    if (!api || !api.postMessage) return;
+    var reveal = event.target && event.target.closest ? event.target.closest('.doc-reveal') : null;
+    if (reveal) {
+      event.preventDefault();
+      event.stopPropagation();
+      var revealPath = reveal.getAttribute('data-reveal-path') || '';
+      if (revealPath) api.postMessage({ type: 'openPath', path: revealPath });
+      return;
+    }
     var card = event.target && event.target.closest ? event.target.closest('.doc-card') : null;
-    if (!card || !api || !api.postMessage) return;
+    if (!card) return;
     var docPath = card.getAttribute('data-path') || '';
     if (!docPath) return;
     loadingFromHome = true;
     setStatus(t('status.opening'));
     api.postMessage({ type: 'loadPath', path: docPath });
   });
+  // The reveal control is keyboard-focusable (role="button" tabindex="0")
+  // since it's nested inside the card's own <button>; Enter/Space need their
+  // own handler because a non-<button> element doesn't get native activation.
+  if (homeGrid) homeGrid.addEventListener('keydown', function (event) {
+    if (event.key !== 'Enter' && event.key !== ' ') return;
+    var reveal = event.target && event.target.closest ? event.target.closest('.doc-reveal') : null;
+    if (!reveal || !api || !api.postMessage) return;
+    event.preventDefault();
+    event.stopPropagation();
+    var revealPath = reveal.getAttribute('data-reveal-path') || '';
+    if (revealPath) api.postMessage({ type: 'openPath', path: revealPath });
+  });
   function updateEmptyState() {
     empty.hidden = hasDocument();
@@ -867,11 +928,22 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       // the user first clicked somewhere in the page. Those actions now sit
       // in the in-page floating bar over the preview (see `.actions` above),
       // where a click is a real user gesture and they succeed on first try.
+      {
+        // Focus mode ("专注"): dims every line except the cursor's own, a
+        // checked toggle like annotate. Editing-only; preview has no lines.
+        // Icon-only like `open` — the tooltip explains what it does.
+        id: 'focus', icon: 'ext:markdown-editor-icons/feather',
+        tooltip: hasDoc ? (focusMode ? t('toolbar.focus.tooltipOn') : t('toolbar.focus.tooltipOff')) : t('toolbar.needDoc'),
+        checked: focusMode, disabled: !hasDoc || mode === 'preview',
+      },
       {
         type: 'menu', id: 'font-size', icon: 'ext:markdown-editor-icons/type',
         tooltip: !hasDoc ? t('toolbar.needDoc') : mode === 'preview' ? t('toolbar.fontSize.tooltipPreview') : t('toolbar.fontSize.tooltipEdit'),
         disabled: !hasDoc || mode === 'preview',
         items: [
+          { id: 'comfort:read', label: t('toolbar.comfort.read'), checked: !comfortWriting },
+          { id: 'comfort:write', label: t('toolbar.comfort.write'), checked: comfortWriting },
+          { id: 'font-comfort-sep', label: '', separator: true },
           { id: 'font-size:14', label: t('toolbar.fontSize.small'), checked: editorFontSize === 14 },
           { id: 'font-size:16', label: t('toolbar.fontSize.medium'), checked: editorFontSize === 16 },
           { id: 'font-size:18', label: t('toolbar.fontSize.large'), checked: editorFontSize === 18 },
@@ -884,6 +956,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
         type: 'menu', id: 'more', icon: 'settings',
         items: [
           { id: 'reload', label: t('toolbar.more.reload'), disabled: mode !== 'preview' },
+          { id: 'reveal', label: t('toolbar.more.reveal'), disabled: !hasDoc },
           { id: 'more-sep', label: '', separator: true },
           { id: 'about', label: t('toolbar.more.about') },
         ],
@@ -938,6 +1011,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       closePopup();
       updateEmptyState();
       setDirty(true);
+      scheduleDraftSave();
     },
     onOpenLink: function (url) {
       if (api && api.postMessage) api.postMessage({ type: 'openLink', url: url });
@@ -960,6 +1034,8 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   });
   cm.setFontSize(editorFontSize);
   cm.setFontFamily(EDITOR_FONTS[editorFont]);
+  cm.setComfortWriting(comfortWriting);
+  cm.setFocusMode(focusMode);
   cm.scrollDOM.addEventListener('scroll', closePopup);
   // ---- Markdown <-> bm.md rendering ----
@@ -1274,6 +1350,22 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   async function submitAnnotation() {
     var comment = popupInput.value.trim();
     if (!selection.text || !api || !api.composer) return;
+    // The prompt tells the AI it can read/overwrite the file at `sourcePath`
+    // directly — but if there are unsaved edits, disk still has the old
+    // content: the AI would read stale context (or, if it applies a
+    // full-document rewrite based on that stale read, would clobber the
+    // very edits the user hasn't saved yet). Flush to disk first whenever
+    // there's somewhere to save to, so the file the AI reads always matches
+    // what's on screen. A brand new unsaved document (no sourcePath) has
+    // nowhere to save to yet — the prompt already says so via
+    // `annotate.pathMissing` — so there's nothing to flush in that case.
+    if (dirty && sourcePath) {
+      var saved = await saveNowAndWait();
+      if (!saved) {
+        setStatus(t('status.saveFailedNoReturn'), true);
+        return;
+      }
+    }
     try {
       await api.composer.addContexts([{
         type: 'annotation',
@@ -1321,6 +1413,59 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   var dirty = false;
   var savedFlash = false; // true for ~3s right after a successful save, drives the save-check icon
+  // ---- Unsaved-draft recovery: mirror edits to a backend sidecar file so a
+  // crash, an accidental "Open" over unsaved work, or just closing without
+  // saving never actually loses anything — reopening the same path resumes
+  // from here instead of the last save.
+  //
+  // This used to debounce the send itself (~1.2s after typing stopped) and
+  // then try to force-flush on blur/pagehide/visibilitychange when the tab
+  // looked like it might be closing. That was unreliable in practice: a
+  // Cmd/Ctrl+W on an already-focused panel tears it down directly without
+  // reliably running page-lifecycle JS first, so the "flush on the way out"
+  // half of that plan couldn't be counted on — losing whatever was typed in
+  // the last debounce window.
+  //
+  // So instead: every keystroke posts immediately, with no client-side
+  // delay at all — by the time this call returns, the latest content has
+  // already left the panel. The *disk write* is debounced on the backend
+  // instead (see `scheduleDraftWrite` in index.ts), where the timer lives
+  // in the long-running extension host rather than in this page, so it
+  // keeps ticking (and still writes) even if the panel is destroyed a
+  // moment later. The host also flushes immediately on panel disposal, so
+  // real teardown never has to wait out any debounce either.
+  var draftPathSaved = ''; // path the last-sent draft belongs to, so a document switch can't cross-write it
+  var draftLastSent = null; // content of the most recent saveDraft actually posted, to skip redundant re-sends
+  function postDraftSave(path) {
+    draftPathSaved = path;
+    draftLastSent = markdown;
+    // `base` = the last disk-confirmed content, so the backend can record
+    // a baseline and detect if the file changes elsewhere before we reopen.
+    api.postMessage({ type: 'saveDraft', path: path, markdown: markdown, base: savedMarkdown });
+  }
+  function scheduleDraftSave() {
+    if (!sourcePath || !api || !api.postMessage) return;
+    if (draftPathSaved === sourcePath && draftLastSent === markdown) return; // nothing actually changed
+    postDraftSave(sourcePath);
+  }
+  // No-op now that there's no client-side timer to cancel — kept as a named
+  // call so the "we're done editing this document" call sites (save
+  // success, reset to home, document switch) still read as intentional and
+  // reset the dedupe state below them, without every call site needing to
+  // know the send is already synchronous.
+  function cancelDraftSave() {
+    draftPathSaved = '';
+    draftLastSent = null;
+  }
+  function discardDraftFor(path) {
+    cancelDraftSave();
+    if (path && api && api.postMessage) api.postMessage({ type: 'discardDraft', path: path });
+  }
   function setDirty(next, justSaved) {
     dirty = next;
     if (savedFlashTimer) { clearTimeout(savedFlashTimer); savedFlashTimer = 0; }
@@ -1344,6 +1489,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
         savedMarkdown = content;
         setDirty(markdown !== content, markdown === content);
         setStatus(markdown === content ? t('status.saved') : t('status.savedWithNewChanges'));
+        cancelDraftSave();
         return true;
       } catch (e) {
         setStatus(t('status.saveFailed', { err: String(e) }), true);
@@ -1385,8 +1531,13 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     fileHandle = null;
   }
-  function applyDocument(nextMarkdown, nextName, nextPath, force) {
-    if (!force && dirty && cm.hasFocus() && savedMarkdown !== null && nextMarkdown !== savedMarkdown) {
+  function applyDocument(nextMarkdown, nextName, nextPath, force, diskBaseline) {
+    // Deliberately does NOT check cm.hasFocus(): unsaved local edits must
+    // never be silently clobbered by an external update, whether or not the
+    // editor happens to have DOM focus at that instant (e.g. the panel was
+    // blurred mid-edit). The user's own uncommitted work always wins here;
+    // the (still-running) draft mirror already backs it up on disk either way.
+    if (!force && dirty && savedMarkdown !== null && nextMarkdown !== savedMarkdown) {
       setStatus(t('status.externalUpdateSkipped'), true);
       return false;
     }
@@ -1394,7 +1545,15 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     name = nextName;
     if (nextPath) sourcePath = nextPath;
     fileName = pathFileName(nextPath || sourcePath) || nextName || 'Markdown';
-    savedMarkdown = markdown;
+    // `savedMarkdown` must track the file's real *on-disk* content, not
+    // necessarily what's being displayed — when a restored draft differs
+    // from disk (`diskBaseline` provided and != nextMarkdown), keeping
+    // `savedMarkdown` at the draft's own text would poison the next draft
+    // mirror's baseline hash: it'd be recorded against a draft that was
+    // never actually on disk, so a later reopen would see the *true* disk
+    // content sitting unchanged at the real baseline and wrongly report
+    // an external-edit conflict that never happened.
+    savedMarkdown = typeof diskBaseline === 'string' ? diskBaseline : markdown;
     cm.setValue(markdown);
     setDirty(false); // also rebuilds+syncs the whole toolbar, picking up the new sourcePath/fileName below
     setPanelTitle(fileName);
@@ -1467,7 +1626,21 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     }, 20000);
   }
+  // Picking a *different* file to open would otherwise silently replace
+  // whatever's currently in the buffer — this is the same "unsaved work"
+  // hazard as the Home button, just reached from a different toolbar item,
+  // so it gets the same confirm-first treatment.
   async function openFile() {
+    if (dirty) {
+      var choice = await askUnsavedConfirm(t('confirm.message', { file: fileName || t('common.markdownDocDefault') }));
+      if (choice === 'cancel') return;
+      if (choice === 'save') {
+        var saved = await saveNowAndWait();
+        if (!saved) { setStatus(t('status.saveFailedNoReturn'), true); return; }
+      } else if (choice === 'discard') {
+        discardDraftFor(sourcePath);
+      }
+    }
     stopWatching();
     if (pickFileSupported && api && api.postMessage) {
       if (nativePickPending) {
@@ -2019,9 +2192,42 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     syncToolbar();
   }
+  function setComfortWriting(on) {
+    comfortWriting = !!on;
+    cm.setComfortWriting(comfortWriting);
+    try { localStorage.setItem('md-editor-comfort-writing', comfortWriting ? '1' : '0'); } catch (e) {}
+    syncToolbar();
+    setStatus(comfortWriting ? t('status.comfortWrite') : t('status.comfortRead'));
+  }
+  function toggleFocusMode() {
+    focusMode = !focusMode;
+    // Mirror of the annotate guard in toggleAnnotations: annotate dims
+    // nothing but needs the whole doc readable to pick passages, while
+    // focus deliberately dims everything else — the two modes are
+    // mutually exclusive, so turning focus on forces annotate off.
+    if (focusMode && annotationsEnabled) {
+      annotationsEnabled = false;
+      closePopup();
+    }
+    cm.setFocusMode(focusMode);
+    try { localStorage.setItem('md-editor-focus-mode', focusMode ? '1' : '0'); } catch (e) {}
+    syncToolbar();
+    setStatus(focusMode ? t('status.focusOn') : t('status.focusOff'));
+  }
   function toggleAnnotations() {
     annotationsEnabled = !annotationsEnabled;
     if (!annotationsEnabled) closePopup();
+    // Annotate and focus mode fight each other: focus dims every non-active
+    // line, which makes it hard to spot the text you're about to annotate
+    // elsewhere in the doc. Turning annotate on forces focus off so the
+    // whole document reads normally while selecting passages.
+    if (annotationsEnabled && focusMode) {
+      focusMode = false;
+      cm.setFocusMode(false);
+      try { localStorage.setItem('md-editor-focus-mode', '0'); } catch (e) {}
+    }
     syncToolbar();
     setStatus(annotationsEnabled ? t('status.annotateOn') : t('status.annotateOff'));
   }
@@ -2062,6 +2268,7 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
   // tells the backend to stop watching it, then shows the launch page again.
   function resetToHome() {
     stopWatching();
+    cancelDraftSave();
     closePopup();
     markdown = '';
     name = '';
@@ -2099,8 +2306,11 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
       if (choice === 'save') {
         var saved = await saveNowAndWait();
         if (!saved) { setStatus(t('status.saveFailedNoReturn'), true); return; }
+      } else if (choice === 'discard') {
+        // The user explicitly threw these edits away — don't let the draft
+        // ghost-reappear next time this file is opened.
+        discardDraftFor(sourcePath);
       }
-      // choice === 'discard' falls through and leaves without saving.
     }
     resetToHome();
   }
@@ -2113,8 +2323,12 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
     if (itemId === 'mode') { setMode(mode === 'edit' ? 'preview' : 'edit'); return; }
     if (itemId === 'save') { saveNow(); return; }
     if (itemId === 'reload') { render(); return; }
+    if (itemId === 'reveal') { if (sourcePath && api && api.postMessage) api.postMessage({ type: 'openPath', path: sourcePath }); return; }
     if (itemId && itemId.indexOf('font-size:') === 0) { setEditorFontSize(Number(itemId.slice('font-size:'.length))); return; }
     if (itemId && itemId.indexOf('font-family:') === 0) { setEditorFont(itemId.slice('font-family:'.length)); return; }
+    if (itemId === 'comfort:read') { setComfortWriting(false); return; }
+    if (itemId === 'comfort:write') { setComfortWriting(true); return; }
+    if (itemId === 'focus') { toggleFocusMode(); return; }
     if (itemId === 'about') { setStatus(t('status.rendererAbout')); return; }
     // These two must be checked before the generic 'style:' fallback below,
     // since both also start with the literal prefix "style:".
@@ -2242,10 +2456,33 @@ body{margin:0;background:var(--bg);color:var(--text);font:13px var(--finch-font-
         var isFirst = savedMarkdown === null;
         var wasLoadingFromHome = loadingFromHome;
         loadingFromHome = false;
-        var applied = applyDocument(incoming, m.title || t('common.markdownDocDefault'), m.path || sourcePath, openedFromPicker || isFirst || isDifferentDocument);
-        if (!applied) syncToolbar(); // still clear the "open" button's pending/disabled state
-        if (applied && wasLoadingFromHome) setStatus(t('status.opened', { file: fileName }));
-        else if (applied && !isFirst) setStatus(t('status.contentUpdated'));
+        var applied = applyDocument(incoming, m.title || t('common.markdownDocDefault'), m.path || sourcePath, openedFromPicker || isFirst || isDifferentDocument, m.diskMarkdown);
+        if (!applied) { syncToolbar(); return; } // still clear the "open" button's pending/disabled state
+        if (m.draftRestored) {
+          // The buffer we just loaded is an unsaved draft, not what's on
+          // disk — keep it marked dirty so Save (or the draft-mirror timer)
+          // stays active, and say so briefly instead of pretending nothing
+          // happened. No blocking prompt: it's just the user's own last edit.
+          setDirty(true);
+          setStatus(t('status.draftRestored'));
+        } else if (m.draftConflict) {
+          // A draft existed, but the file was saved elsewhere (another
+          // editor, an AI apply) after that draft was taken — loading the
+          // draft over that would silently discard someone else's confirmed
+          // save, and loading disk over the draft without saying anything
+          // would silently discard the user's own edit. Load disk (the only
+          // version anyone else can see) and say so plainly instead of
+          // guessing; the stale draft file itself is left alone on disk.
+          setStatus(t('status.draftConflict'), true);
+        } else if (wasLoadingFromHome) {
+          setStatus(t('status.opened', { file: fileName }));
+        } else if (!isFirst) {
+          setStatus(t('status.contentUpdated'));
+        }
+        return;
+      }
+      if (m.type === 'sourceMissing') {
+        if (m.path && m.path === sourcePath) setStatus(t('status.sourceMissing'), true);
         return;
       }
       if (m.type === 'bmRendered') {

package/i18n/zh-CN.json CHANGED Viewed

@@ -1,9 +1,9 @@
 {
-  "name": "Markdown 编辑",
+  "name": "写作",
   "description": "在 Finch 中编辑 Markdown，并可预览为微信公众号文章样式；支持框选文字请求 AI 修改和自定义排版。",
   "systemPrompt": "当用户要编辑或预览本地 Markdown 文件时，调用 markdown_editor_document，action 使用 open，并提供绝对路径。当用户要新建/起草一篇全新的 Markdown 文档时，自己先写好完整 Markdown 正文，再调用 action=create 并提供一个尚不存在的绝对路径和 markdown 内容——会一次性写入文件并在 Markdown 编辑器中打开（编辑器界面本身故意不提供“新建”按钮）。当用户要修改编辑器或预览中框选的文字时，给出精确的替换 Markdown，确认后调用 action=apply 并提供完整更新后的 Markdown。当用户要求自定义/AI 设计公众号排版风格时，编写限定在 #bm-md 下的普通 CSS（标签/id 选择器，不用 class，必要时用 !important 覆盖基础风格），可参考 bm.md 内置风格（kami、bauhaus、blueprint、botanical、newsprint、retro、sketch、terminal），然后调用 action=set_style 并提供 css 与简短 label，会立即应用到当前打开的预览。",
   "appPanel": {
-    "title": "Markdown 编辑",
+    "title": "写作",
     "toolbar": {
       "open": { "tooltip": "打开 Markdown 文件" },
       "annotate": { "label": "批注", "tooltip": "开启批注" },

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "finch-markdown-editor",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A Markdown editor and WeChat Official Account style preview, with selection-based AI edits and AI-generated custom styles.",
   "author": {
     "name": "PuterJam",
@@ -34,7 +34,7 @@
   "finch": {
     "manifestVersion": 1,
     "minVersion": "1.6.0",
-    "name": "MD Editor",
+    "name": "写作",
     "description": "Edit Markdown and preview it as a WeChat Official Account article. Select text for AI edits, or ask AI to design a custom style.",
     "systemPrompt": "When the user wants to edit or preview a local Markdown file, call markdown_editor_document with action 'open' and its absolute path. When the user asks to create/draft a brand-new Markdown document, write the full Markdown yourself and call action 'create' with an absolute path that does not exist yet plus the markdown content — this writes the file and opens it in Markdown Editor in one step (Markdown Editor's own UI intentionally has no 'new file' button). When the user asks to revise a passage selected in Markdown Editor, propose precise replacement Markdown and, once approved, call action 'apply' with the full updated Markdown. When the user asks for a custom/AI-designed WeChat layout style, write plain CSS scoped under #bm-md (tag/id selectors only, use !important where needed to override the base style) inspired by bm.md's built-in styles (kami, bauhaus, blueprint, botanical, newsprint, retro, sketch, terminal), then call action 'set_style' with that css and a short label — it applies immediately in the open preview.",
     "main": "dist/index.js",
@@ -50,7 +50,7 @@
       "iconPacks": [
         {
           "id": "markdown-editor-icons",
-          "label": "Markdown Editor Icons"
+          "label": "写作图标"
         }
       ],
       "appPanel": {
@@ -156,6 +156,10 @@
                 "id": "reload",
                 "label": "Re-render"
               },
+              {
+                "id": "reveal",
+                "label": "Show in file manager"
+              },
               {
                 "id": "more-sep",
                 "label": "",