dsh-markdown-typora 0.3.5 → 0.3.11

package/README.md

@@ -1,6 +1,6 @@
 # dsh-markdown-typora
 
-**A Markdown editor for the DeepSeek Harness right sidebar, built on MarkPilot CM6 3.6.9.**
+**A Markdown editor for the DeepSeek Harness right sidebar, built on MarkPilot CM6 3.6.16.**
 
 Write Markdown in DSH with Typora-style live rendering; select a passage and send its **Markdown source** straight into the current conversation.
 
@@ -29,6 +29,7 @@ Write Markdown in DSH with Typora-style live rendering; select a passage and sen
 - **Real editor, not a preview** — CodeMirror 6 with live headings, lists, tables, inline math, code blocks and Mermaid.
 - **Selection → chat** — a floating **Insert into chat** button appears beside a selection; `Ctrl/Cmd + Shift + Enter` does the same. The payload starts with the document's absolute path, then a blank line and the Markdown source (not the rendered text), inserted at the composer caret without stealing focus.
 - **Guarded saves** — debounced autosave with version checks; `Ctrl/Cmd + S` saves immediately with a visible result, whether the caret is in the editor or elsewhere in the panel. An external edit is never overwritten. A dirty buffer is kept in a recovery slot when the tab closes.
+- **Shared notes across windows** — the same file can be edited in the MarkPilot desktop app and the DSH sidebar at once. Unsaved changes are exchanged live, each window keeps its own undo history, and a genuine conflict is reported with the draft preserved.
 - **Save files outside the session workspace** — a file opened from the sidebar saves directly to its own folder even when it sits outside the workspace root of the current session; version checks and conflict warnings are unchanged. Files that are read-only or locked at the OS level still report an error.
 - **Theme-aware** — follows the host's light/dark theme, including the first frame.
 - **Offline assets** — KaTeX fonts, the Markdown worker and Mermaid ship with the plugin; no CDN.
@@ -36,15 +37,16 @@ Write Markdown in DSH with Typora-style live rendering; select a passage and sen
 - **Local images in the document** — `![](assets/diagram.png)` and parent-folder references such as `![](../figures/a.png)` render in the panel, read through the plugin's own read-only image route; a file that is genuinely missing still shows an explicit placeholder instead of an empty box.
 - **Edit right beside an image** — a click in the blank to the right of an image starts editing on the following line (headings, lists and task items keep their markers), instead of opening the image's Markdown source; clicking the image itself still opens its source.
 
-## What's new in the 3.6.9 engine
+## What's new in the 3.6.16 engine
 
-The editor engine is the same accepted build that ships with MarkPilot 3.6.9:
+The editor engine is the same accepted build that ships with MarkPilot 3.6.16. Since the 0.3.4 plugin, the right sidebar gained the engine's multi-window work and the save-path fixes that came with it:
 
-- **Image right-side clicks** — the blank to the right of an image edits the following line; the image itself still opens its source, and a click in the editor's right gutter no longer drops the caret.
-- **Source view for long documents** — documents that carry embedded images can now show the rendered page and editable source side by side.
-- **Embedded-image protection** — body text and the source view keep image payloads collapsed, and an image can be backed up to an `assets` folder next to the document before it is removed.
-- **Table editing** — Chinese IME composition, escaped pipes, formatting commands and undo/redo stay in sync with the cell source.
-- **Formula selections** — a selection that crosses an inline formula keeps the whole formula, so copying and continued editing stay predictable.
+- **Shared editing across windows** — the same note can be open in the desktop app and the DSH sidebar. Unsaved edits are exchanged live, each window undoes only its own typing, and a real conflict is shown with the draft kept instead of overwriting the other window.
+- **Save while typing** — a save in flight is re-synced to the latest text; an external writer is detected and reported; the recovery banner's **Keep my changes** now actually writes the shared draft; and a cut → undo → redo followed by Ctrl+S no longer fails as an invalid collaborative edit.
+- **Reverse selections** — dragging from a rendered formula across code, images or into the previous paragraph keeps the selection under the pointer, including auto-scroll at the top edge.
+- **Table and rich-paste editing** — cell commands, End/Backspace, escaped pipes, Chinese IME composition, and pasted HTML tables keep captions, source links, inline images and alignment.
+- **Cross-note cut** — real images and local Markdown links are re-based when a passage moves between lecture and summary notes; included definitions are renamed without breaking existing references.
+- **Plugin manager reload** — notes opened after a plugin reload still join the live session, and repeated reloads reuse the background writer instead of leaking workers.
 
 ## Install
 
@@ -59,15 +61,14 @@ Or open **Settings → Plugins → Add plugin** and enter `dsh-markdown-typora`.
 
 ### From a GitHub release
 
-Download `dsh-markdown-typora-0.3.4.tgz` from the [MarkPilot releases](https://github.com/ltmroberthk915/markpilot/releases) and add it to the profile that runs your host:
+Download `dsh-markdown-typora-0.3.11.tgz` from the [MarkPilot releases](https://github.com/ltmroberthk915/markpilot/releases) and add it to the profile that runs your host:
 
 ```sh
-dsh plugin --profile web add ./dsh-markdown-typora-0.3.4.tgz
-dsh plugin --profile desktop add ./dsh-markdown-typora-0.3.4.tgz
+dsh plugin --profile web add ./dsh-markdown-typora-0.3.11.tgz
+dsh plugin --profile desktop add ./dsh-markdown-typora-0.3.11.tgz
 ```
 
-Use this only when you cannot install from npm; the package on npm tracks the same source.
-
+When the npm registry lists 0.3.11, installing by package name above gives this build; if the registry copy still lags, use the TGZ above to get exactly 0.3.11.
 ### Manual (development checkout)
 
 The plugin is the `dsh-markdown-typora/` subdirectory of the [MarkPilot repository](https://github.com/ltmroberthk915/markpilot). To load a checkout as a bundle:
@@ -87,7 +88,7 @@ Then add a junction/symlink from the profile's `node_modules` to `markpilot/dsh-
 
 ## How it is built
 
-The editor engine is the already-built MarkPilot CM6 3.6.6 renderer, copied byte-for-byte into `renderer-cm6/cm6/`. The plugin adds only:
+The editor engine is the already-built MarkPilot CM6 3.6.16 renderer, copied byte-for-byte into `renderer-cm6/cm6/`. The plugin adds only:
 
 - `renderer-cm6/index.html` + `dsh-bridge.js` + `dsh-selection.js` — the DSH skin and selection bridge;
 - `lib/index.js` — static routes, version-guarded file API, SSE change stream;

package/core.json

@@ -1,8 +1,8 @@
 {
   "core": "MarkPilot CM6",
-  "version": "3.6.9",
+  "version": "3.6.16",
   "source": "../MarkPilot-CM6/renderer/cm6",
-  "syncedAt": "2026-10-31T04:52:31.281Z",
+  "syncedAt": "2026-11-04T03:08:27.900Z",
   "generator": "scripts/sync-core.mjs",
   "files": [
     {
@@ -312,8 +312,8 @@
     },
     {
       "path": "app.js",
-      "sha256": "b06de411debe28862547239a9a9ed9d0fa27cabc804dd05d63c1f6ed2cc93e6d",
-      "bytes": 1485205
+      "sha256": "2dcff06daa8522a3d53a7cea642deed486d200394466ad58ecb4e682e9c29dcc",
+      "bytes": 1536788
     },
     {
       "path": "fonts/KaTeX_AMS-Regular-CYEKBG2K.woff",
@@ -626,5 +626,5 @@
       "bytes": 3572661
     }
   ],
-  "coreHash": "9150b5bb82c3384a427fd723f7f464a6c45ccbdf26df799a398ba69b7be6cdb4"
+  "coreHash": "8d51c9df5a97992b1d309c54f88fda5ebc3e8f4b583a37d2b1e4ecee700a4d9a"
 }

package/host/document-store.js

@@ -0,0 +1,181 @@
+'use strict';
+// Document metadata belongs to one editor session. Only disk operations are shared.
+const fs=require('node:fs/promises');
+const path=require('node:path');
+const crypto=require('node:crypto');
+const {decodeDocument,encodeDocument}=require('./text-codec');
+const {prepareFile}=require('./safe-file');
+// Local saves share the cross-process file-write reservation with the live
+// rooms authority (EXE windows, DSH hosts, model writes). LiveDocuments only
+// pulls this module lazily, so the require cycle stays load-time safe.
+const {withFileCommit, defaultDirectory: liveCommitDirectory}=require('./live-documents');
+const failure=(code,message)=>Object.assign(new Error(message),{code});
+const digest=bytes=>crypto.createHash('sha256').update(bytes).digest('hex');
+function createSession(){
+  return {documentId:crypto.randomUUID(),revision:0,lastSavedRevision:0,filePath:null,savedText:'',diskMtime:0,baseline:null,bom:false,eol:'\n',encoding:'utf8',dirty:false,saveAsRequest:0,saveAsGrant:null,lastSave:null,loadRequest:0,pendingSaves:new Set()};
+}
+class DocumentStore{
+  constructor({beforeReplace=async()=>{},prepareSaveAs=async()=>null,commitDirectory=liveCommitDirectory()}={}){
+    this.jobs=new Map();this.commitTail=Promise.resolve();this.beforeReplace=beforeReplace;this.prepareSaveAs=prepareSaveAs;
+    // Must match the LiveDocuments directory for same-lock reentrancy when a
+    // live save hands its writer down to this store's compare+replace commit.
+    this.commitDirectory=commitDirectory;
+  }
+  reset(S){const pending=S.pendingSaves,request=S.loadRequest+1;Object.assign(S,createSession(),{pendingSaves:pending,loadRequest:request});return this.metadata(S);}
+  metadata(S){return {documentId:S.documentId,revision:S.revision,filePath:S.filePath,text:S.savedText,bom:S.bom,eol:S.eol,encoding:S.encoding};}
+  async canonical(file){
+    const absolute=path.resolve(file);
+    try{return await fs.realpath(absolute);}catch(e){if(e.code!=='ENOENT')throw e;}
+    let parent=path.dirname(absolute),tail=[path.basename(absolute)];
+    for(;;){try{return path.join(await fs.realpath(parent),...tail);}catch(e){if(e.code!=='ENOENT')throw e;const next=path.dirname(parent);if(next===parent)return absolute;tail.unshift(path.basename(parent));parent=next;}}
+  }
+  key(file){return process.platform==='win32'?file.toLowerCase():file;}
+  queue(key,fn){
+    const previous=this.jobs.get(key)||Promise.resolve(),job=previous.catch(()=>{}).then(fn);
+    this.jobs.set(key,job);const clear=()=>{if(this.jobs.get(key)===job)this.jobs.delete(key);};job.then(clear,clear);return job;
+  }
+  commit(fn){const job=this.commitTail.catch(()=>{}).then(fn);this.commitTail=job;return job;}
+  async snapshot(file,{allowMissing=false}={}){
+    let handle;
+    try{
+      handle=await fs.open(file,'r');const first=await handle.stat();
+      if(!first.isFile())throw failure('MP_NOT_FILE','目标不是普通文件：'+file);
+      const bytes=await handle.readFile(),last=await handle.stat(),onPath=await fs.stat(file);
+      if(first.mtimeMs!==last.mtimeMs||first.size!==last.size||last.ino!==onPath.ino||last.dev!==onPath.dev||last.mtimeMs!==onPath.mtimeMs||last.size!==onPath.size)
+        throw failure('MP_FILE_CONFLICT','读取期间文件已被其他程序修改，请重新加载：'+file);
+      return {bytes,baseline:{sha256:digest(bytes),mtimeMs:last.mtimeMs,size:bytes.length,nlink:last.nlink}};
+    }catch(e){if(allowMissing&&e.code==='ENOENT')return null;throw e;}finally{await handle?.close();}
+  }
+  async load(S,file,expected=null){
+    if(typeof file!=='string'||!file)throw failure('MP_BAD_PATH','没有指定文件路径');
+    const origin=expected||{documentId:S.documentId,revision:S.revision,filePath:S.filePath};
+    const current=()=>S.documentId===origin.documentId&&S.revision===origin.revision&&this.key(S.filePath||'')===this.key(origin.filePath||'');
+    if(!current()||(expected&&expected.loadRequest!==S.loadRequest))throw failure('MP_DOC_MISMATCH','重载期间文档或编辑版本已改变');
+    const request=++S.loadRequest,canonical=await this.canonical(file);
+    if(expected&&this.key(canonical)!==this.key(expected.filePath))throw failure('MP_FILE_CONFLICT','原文件位置已改变，请另存为保留当前内容');
+    return this.queue(this.key(canonical),async()=>{
+      const snap=await this.snapshot(canonical),decoded=decodeDocument(snap.bytes,file);
+      if(this.key(await this.canonical(file))!==this.key(canonical))throw failure('MP_FILE_CONFLICT','读取期间文件位置已改变，已保留原文档：'+file);
+      if(request!==S.loadRequest||!current())throw failure('MP_DOC_MISMATCH','文档已切换或继续编辑，本次读取已取消');
+      const pending=S.pendingSaves,{text,...format}=decoded;
+      Object.assign(S,createSession(),format,{pendingSaves:pending,loadRequest:request,filePath:canonical,savedText:text,baseline:snap.baseline,diskMtime:snap.baseline.mtimeMs});
+      return this.metadata(S);
+    });
+  }
+  markDirty(S,{documentId,revision,dirty}){
+    if(documentId!==S.documentId||!Number.isSafeInteger(revision)||revision<S.revision)return false;
+    S.revision=revision;
+    S.dirty=!!dirty||revision!==S.lastSavedRevision;
+    return true;
+  }
+  beginSaveAs(S){
+    S.saveAsGrant=null;
+    return {documentId:S.documentId,serial:++S.saveAsRequest};
+  }
+  async grantSaveAs(S,file,request=this.beginSaveAs(S)){
+    const current=()=>request.documentId===S.documentId&&request.serial===S.saveAsRequest;
+    if(!current())throw failure('MP_SAVE_TARGET','另存为操作已被新的选择替代');
+    const documentId=request.documentId,canonical=await this.canonical(file),snap=await this.snapshot(canonical,{allowMissing:true});
+    if(!current())throw failure('MP_SAVE_TARGET','另存为操作已被新的选择替代');
+    const grant={token:crypto.randomUUID(),documentId,request:request.serial,filePath:path.resolve(file),canonical,baseline:snap?.baseline||null};
+    S.saveAsGrant=grant;return {ok:true,filePath:grant.filePath,documentId,saveAsToken:grant.token};
+  }
+  async grantOverwrite(S,expected,ownerCurrent=()=>true){
+    const current=()=>ownerCurrent()&&expected?.documentId===S.documentId&&expected.revision===S.revision&&expected.filePath===S.filePath;
+    if(!current()||!S.filePath)throw failure('MP_DOC_MISMATCH','文档或编辑版本已改变，覆盖已取消');
+    const grant=await this.grantSaveAs(S,S.filePath);
+    if(S.saveAsGrant?.token!==grant.saveAsToken)throw failure('MP_SAVE_TARGET','覆盖操作已被新的选择替代');
+    if(!current()||!S.saveAsGrant?.baseline){
+      if(S.saveAsGrant?.token===grant.saveAsToken)S.saveAsGrant=null;
+      throw failure(current()?'MP_FILE_MISSING':'MP_DOC_MISMATCH','文件已移除或编辑版本已改变，请另存为保留修改');
+    }
+    if(this.key(S.saveAsGrant.canonical)!==this.key(expected.filePath)){
+      S.saveAsGrant=null;
+      throw failure('MP_FILE_CONFLICT','原文件位置已改变，请另存为保留修改');
+    }
+    S.saveAsGrant.overwriteRevision=expected.revision;
+    return grant;
+  }
+  async validate(file,baseline){
+    const actual=await this.snapshot(file,{allowMissing:true});
+    if(baseline&&!actual)throw failure('MP_FILE_MISSING','原文件已不在磁盘上（可能被重命名或删除）：'+file);
+    if((!baseline&&actual)||(baseline&&actual?.baseline.sha256!==baseline.sha256))throw failure('MP_FILE_CONFLICT','文件已被其他窗口或程序修改，请重新加载或另存为：'+file);
+    if(actual?.baseline.nlink>1)throw failure('MP_FILE_LINKED','文件包含硬链接，请另存为独立文件后编辑：'+file);
+  }
+  save(S,request={}){
+    const job=(async()=>{
+      const {filePath,text,documentId,revision,saveAsToken}=request;
+      if(documentId!==S.documentId||typeof text!=='string'||!Number.isSafeInteger(revision)||revision<0)throw failure('MP_DOC_MISMATCH','文档或编辑版本已改变，保存已取消');
+      const sourcePath=S.filePath,ownerCurrent=typeof request.ownerCurrent==='function'?request.ownerCurrent:()=>true;
+      const grant=saveAsToken&&S.saveAsGrant;
+      const grantCurrent=()=>!grant||(S.documentId===grant.documentId&&S.saveAsRequest===grant.request);
+      if(saveAsToken&&(!grant||grant.token!==saveAsToken||grant.documentId!==documentId||grant.filePath!==path.resolve(filePath)))throw failure('MP_SAVE_TARGET','另存为许可已失效，请重新选择路径');
+      if(grant?.overwriteRevision!==undefined&&(revision!==grant.overwriteRevision||S.revision!==grant.overwriteRevision))throw failure('MP_DOC_MISMATCH','覆盖授权后继续编辑，请重新确认保存');
+      if(!grant&&(!S.filePath||path.resolve(filePath)!==S.filePath))throw failure('MP_SAVE_TARGET','保存目标不属于当前文档，请使用另存为');
+      if(grant)S.saveAsGrant=null; // One use, including a failed attempt.
+      const target=await this.canonical(filePath);
+      // Ordinary saves remain bound to the physical path captured at load.
+      // Only an explicit Save As may authorize a different target.
+      if(this.key(target)!==this.key(grant ? grant.canonical : sourcePath))throw failure('MP_FILE_CONFLICT','保存位置已改变，请重新选择路径');
+      return this.queue(this.key(target),async()=>{
+        // The whole local compare+atomic-replacement runs inside the same
+        // cross-process file-write reservation as LiveDocuments.save/external.
+        // A live-scoped writer reenters the inherited reservation instead of
+        // taking a second lease; standalone saves take the lease themselves,
+        // so two hosts on one baseline serialize and the later one loses only
+        // by the raw-baseline comparison, never by a torn interleave.
+        return withFileCommit(target,async()=>{
+        if(!grantCurrent())throw failure('MP_SAVE_TARGET','另存为操作已被新的选择替代');
+        if(S.documentId!==documentId||(!grant&&S.filePath!==path.resolve(filePath))||revision<S.lastSavedRevision)throw failure('MP_DOC_MISMATCH','文档已切换或已有更新的保存');
+        const baseline=grant?grant.baseline:S.baseline,format={bom:S.bom,eol:S.eol,encoding:S.encoding},out=encodeDocument(text,format);
+        await this.validate(target,baseline);
+        await fs.mkdir(path.dirname(target),{recursive:true});
+        const saveAsCurrent=()=>S.documentId===documentId&&grantCurrent()&&revision>=S.lastSavedRevision&&ownerCurrent();
+        const prepared=grant?await this.prepareSaveAs({sourcePath,filePath:target,text,canonical:f=>this.canonical(f),current:saveAsCurrent}):null;
+        const assets=prepared?.summary||prepared;
+        if(grant&&!saveAsCurrent())throw failure('MP_DOC_MISMATCH','另存为的文档或窗口已改变');
+        // A valid target may already use the filesystem's entire name budget.
+        // Keep the sibling staging/backup components independent of its basename.
+        const tmp=path.join(path.dirname(target),'.mp-tmp-'+process.pid+'-'+crypto.randomUUID());
+        let stage,primaryFailure;
+        try{
+          const outHash=digest(out);
+          stage=await prepareFile(target,tmp,{baseline,output:{bytes:out.length,sha256:outHash}});
+          await fs.writeFile(tmp,out,{flag:'r+'});
+          await this.beforeReplace({session:S,filePath:target,text,revision});
+          return await this.commit(async()=>{
+            // The short shared commit also protects alternate names of the same file.
+            if(typeof prepared?.validate==='function')await prepared.validate();
+            await this.validate(target,baseline);
+            if(this.key(await this.canonical(filePath))!==this.key(target))throw failure('MP_FILE_CONFLICT','保存位置已改变，请重新加载或另存为');
+            if(!grantCurrent())throw failure('MP_SAVE_TARGET','另存为操作已被新的选择替代');
+            if(grant&&!saveAsCurrent())throw failure('MP_DOC_MISMATCH','另存为的文档或窗口已改变');
+            if(grant?.overwriteRevision!==undefined&&S.revision!==grant.overwriteRevision)throw failure('MP_FILE_CONFLICT','覆盖确认后又有新输入，请重新确认保留修改');
+            const receipt=await stage.commit();const st=await fs.stat(target),id=crypto.randomUUID();
+            const current=S.documentId===documentId&&grantCurrent();
+            if(current){
+              S.filePath=target;S.savedText=text;S.baseline={sha256:outHash,mtimeMs:st.mtimeMs,size:out.length,nlink:st.nlink};S.diskMtime=st.mtimeMs;
+              S.lastSavedRevision=revision;S.dirty=S.revision!==revision;
+              S.lastSave={id,documentId,revision,filePath:S.filePath};
+            }
+            return {ok:true,saveId:id,documentId,revision,filePath:target,current,mtimeMs:st.mtimeMs,bytes:out.length,...(receipt?.backupRetained?{recoveryBackup:receipt.backupRetained}:{}),...(assets?{assets}:{})};
+          });
+        }catch(error){primaryFailure=error;throw error;}
+        finally{try{await stage?.abort();}catch(error){if(primaryFailure)primaryFailure.cleanupError=error.message;else throw error;}}
+        },this.commitDirectory);
+      });
+    })();
+    S.pendingSaves.add(job);const clear=()=>S.pendingSaves.delete(job);job.then(clear,clear);return job;
+  }
+  async pending(S){await Promise.allSettled([...S.pendingSaves]);}
+  async outsideChange(S,file){
+    if(file!==S.filePath)return {changed:false,stale:true};
+    const documentId=S.documentId,canonical=await this.canonical(file);
+    if(documentId!==S.documentId||file!==S.filePath)return {changed:false,stale:true};
+    if(this.key(canonical)!==this.key(file))return {changed:true,relocated:true};
+    const snap=await this.snapshot(canonical,{allowMissing:true});
+    if(documentId!==S.documentId||file!==S.filePath)return {changed:false,stale:true};
+    return {changed:!snap||snap.baseline.sha256!==S.baseline?.sha256,missing:!snap,mtimeMs:snap?.baseline.mtimeMs,size:snap?.baseline.size};
+  }
+}
+module.exports={DocumentStore,createSession,failure};