@fgbg/mdocs 0.7.8 → 0.7.9

package/dist/server/documents/commit-graph.js

@@ -7,7 +7,6 @@ import { findCommitById, listParentCommitIds } from "../db/repositories/commit.r
 export function isAncestorOf(db, ancestorId, nodeId) {
     if (ancestorId === nodeId)
         return true;
-    // hash set优化
     const visited = new Set();
     const queue = [nodeId];
     while (queue.length > 0) {
@@ -16,7 +15,6 @@ export function isAncestorOf(db, ancestorId, nodeId) {
         for (const p of parents) {
             if (p === ancestorId)
                 return true;
-            // bfs的时候会存在重复遍历的情况，set 去重
             if (!visited.has(p)) {
                 visited.add(p);
                 queue.push(p);
@@ -32,21 +30,54 @@ export function assertCommitBelongsToDocument(db, commitId, documentId) {
         throw new DocumentError("INVALID_COMMIT", "提交节点不存在或不属于该文档", 400);
     }
 }
+/**
+ * 求两提交在 DAG 上的最近公共祖先（LCA），用于 merge 三路 diff 的 mergeBaseCommitId。
+ * 若一方是另一方的祖先，返回祖先侧节点。
+ */
+export function findMergeBaseCommitId(db, commitA, commitB) {
+    if (commitA === commitB)
+        return commitA;
+    if (isAncestorOf(db, commitA, commitB))
+        return commitA;
+    if (isAncestorOf(db, commitB, commitA))
+        return commitB;
+    const ancestorsOfA = new Set();
+    const queueA = [commitA];
+    while (queueA.length > 0) {
+        const cur = queueA.shift();
+        if (ancestorsOfA.has(cur))
+            continue;
+        ancestorsOfA.add(cur);
+        for (const p of listParentCommitIds(db, cur)) {
+            queueA.push(p);
+        }
+    }
+    const visitedB = new Set();
+    const queueB = [commitB];
+    while (queueB.length > 0) {
+        const cur = queueB.shift();
+        if (ancestorsOfA.has(cur))
+            return cur;
+        if (visitedB.has(cur))
+            continue;
+        visitedB.add(cur);
+        for (const p of listParentCommitIds(db, cur)) {
+            queueB.push(p);
+        }
+    }
+    throw new DocumentError("BAD_REQUEST", "无法计算 mergeBaseCommitId：两提交无公共祖先", 400);
+}
 /**
  * merge 发布前校验分叉关系。
- * - base 与 expectedHead 不能相同（否则应走普通线性发布）
- * - base 必须是 expectedHead 的祖先（共同祖先之后分两路改）
+ * - localBaseCommitId 与 remoteCommitId 不能相同（否则应走普通线性发布）
+ * - localBaseCommitId 必须是 remoteCommitId 的祖先（允许远端在分叉后线性前进）
  */
-export function assertMergeFork(db, baseCommitId, expectedHeadCommitId) {
-    /*
-     * 如果 base(本地 commit 的父节点) 和 expect(远端文章最新的节点)相同
-     * 则不走 conflict merge逻辑, 应该走普通线性发布逻辑
-     */
-    if (baseCommitId === expectedHeadCommitId) {
-        throw new DocumentError("BAD_REQUEST", "合并发布要求 base 与 expectedHead 不同", 400);
+export function assertMergeFork(db, localBaseCommitId, remoteCommitId) {
+    if (localBaseCommitId === remoteCommitId) {
+        throw new DocumentError("BAD_REQUEST", "合并发布要求 localBaseCommitId 与 remoteCommitId 不同", 400);
     }
-    if (!isAncestorOf(db, baseCommitId, expectedHeadCommitId)) {
-        throw new DocumentError("BAD_REQUEST", "base 不是 expectedHead 的祖先，无法合并", 400);
+    if (!isAncestorOf(db, localBaseCommitId, remoteCommitId)) {
+        throw new DocumentError("BAD_REQUEST", "localBaseCommitId 不是 remoteCommitId 的祖先，无法合并", 400);
     }
 }
 //# sourceMappingURL=commit-graph.js.map

package/dist/server/documents/commit-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-graph.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExF;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,EAAqB,EACrB,UAAkB,EAClB,MAAc;IAEd,IAAI,UAAU,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACvC,aAAa;IACb,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAC3B,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7C,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YAClC,0BAA0B;YAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,6BAA6B,CAC3C,EAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,EAAqB,EACrB,YAAoB,EACpB,oBAA4B;IAE5B;;;OAGG;IACH,IAAI,YAAY,KAAK,oBAAoB,EAAE,CAAC;QAC1C,MAAM,IAAI,aAAa,CACrB,aAAa,EACb,+BAA+B,EAC/B,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,EAAE,oBAAoB,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,aAAa,CACrB,aAAa,EACb,+BAA+B,EAC/B,GAAG,CACJ,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"commit-graph.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.ts"],"names":[],"mappings":"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"}

package/dist/server/documents/commit-graph.test.js

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeAll } from "vitest";
 import Database from "better-sqlite3";
 import { applySchema } from "../db/schema.js";
 import { insertCommit, insertCommitParent } from "../db/repositories/commit.repo.js";
-import { isAncestorOf, assertMergeFork } from "./commit-graph.js";
+import { isAncestorOf, assertMergeFork, findMergeBaseCommitId } from "./commit-graph.js";
 import { DocumentError } from "../access/access-control.js";
 describe("commit-graph", () => {
     let db;
@@ -43,10 +43,15 @@ describe("commit-graph", () => {
         expect(isAncestorOf(db, "commit-c", "commit-d")).toBe(true);
         expect(isAncestorOf(db, "commit-d", "commit-a")).toBe(false);
     });
-    it("assertMergeFork：base 必须是 expectedHead 的真祖先", () => {
+    it("assertMergeFork：localBase 必须是 remote 的真祖先", () => {
         expect(() => assertMergeFork(db, "commit-a", "commit-d")).not.toThrow();
         expect(() => assertMergeFork(db, "commit-d", "commit-d")).toThrow(DocumentError);
         expect(() => assertMergeFork(db, "commit-d", "commit-a")).toThrow(DocumentError);
     });
+    it("findMergeBaseCommitId：线性链与 reset 方向", () => {
+        expect(findMergeBaseCommitId(db, "commit-a", "commit-d")).toBe("commit-a");
+        expect(findMergeBaseCommitId(db, "commit-d", "commit-a")).toBe("commit-a");
+        expect(findMergeBaseCommitId(db, "commit-c", "commit-d")).toBe("commit-c");
+    });
 });
 //# sourceMappingURL=commit-graph.test.js.map

package/dist/server/documents/commit-graph.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-graph.test.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commit-graph.test.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.test.ts"],"names":[],"mappings":"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"}

package/dist/server/documents/document-commit.integration.test.js

@@ -8,8 +8,10 @@ import { createHash } from "node:crypto";
 const testDbRef = vi.hoisted(() => ({ db: null }));
 const fileStoreMocks = vi.hoisted(() => ({
     lastWriteContent: "",
+    commitBlobs: new Map(),
     reset() {
         fileStoreMocks.lastWriteContent = "";
+        fileStoreMocks.commitBlobs.clear();
     },
 }));
 vi.mock("../db/connection.js", () => ({
@@ -27,18 +29,28 @@ vi.mock("../storage/file-store.js", () => ({
             .update(fileStoreMocks.lastWriteContent || "{}")
             .digest("hex"),
     }),
-    writeCommitBlob: (contentHash, content) => ({
-        blobRef: `${contentHash.slice(0, 2)}/${contentHash.slice(2)}`,
-        bytes: content.length,
-    }),
+    writeCommitBlob: (contentHash, content) => {
+        const blobRef = `${contentHash.slice(0, 2)}/${contentHash.slice(2)}`;
+        fileStoreMocks.commitBlobs.set(blobRef, content);
+        return { blobRef, bytes: content.length };
+    },
+    readCommitBlob: (blobRef) => {
+        const content = fileStoreMocks.commitBlobs.get(blobRef);
+        if (!content)
+            throw new Error("commit blob not found");
+        return content;
+    },
     deleteDocumentFile: () => { },
     sha256: (buf) => createHash("sha256").update(buf).digest("hex"),
 }));
 import { DocumentError } from "../access/access-control.js";
-import { createDocument, updateDocument } from "./document.service.js";
+import { createDocument, getDocumentMergeContext, updateDocument } from "./document.service.js";
+import { findCommitById } from "../db/repositories/commit.repo.js";
 import { findDocumentById } from "../db/repositories/document.repo.js";
+import { insertDocumentInvite } from "../db/repositories/document.repo.js";
 import { countParents, listParentCommitIds, } from "../db/repositories/commit.repo.js";
 const OWNER = "owner-commit-test";
+const INVITED_EDITOR = "invited-editor";
 beforeAll(() => {
     const db = new Database(":memory:");
     applySchema(db);
@@ -46,6 +58,8 @@ beforeAll(() => {
     const now = new Date().toISOString();
     db.prepare(`INSERT INTO visitors (visitor_id, visitor_name, visitor_token_hash, created_at)
      VALUES (?, ?, ?, ?)`).run(OWNER, "Owner", "hash", now);
+    db.prepare(`INSERT INTO visitors (visitor_id, visitor_name, visitor_token_hash, created_at)
+     VALUES (?, ?, ?, ?)`).run(INVITED_EDITOR, "Invited", "hash2", now);
 });
 afterEach(() => {
     const db = testDbRef.db;
@@ -56,6 +70,22 @@ afterEach(() => {
     fileStoreMocks.reset();
 });
 describe("updateDocument 版本冲突", () => {
+    it("invite 编辑者发布后返回 invitedEdit=true", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "invite-edit.md",
+            content: '{"v":1}',
+            domainId: "default",
+        });
+        insertDocumentInvite(testDbRef.db, created.documentId, INVITED_EDITOR, "edit");
+        const updated = updateDocument({
+            actorVisitorId: INVITED_EDITOR,
+            documentId: created.documentId,
+            content: '{"v":2}',
+            version: { localBaseCommitId: created.headCommitId },
+        });
+        expect(updated.invitedEdit).toBe(true);
+    });
     it("base 与 head 一致时成功并推进 head", () => {
         const created = createDocument({
             actorVisitorId: OWNER,
@@ -68,7 +98,7 @@ describe("updateDocument 版本冲突", () => {
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"v":2}',
-            version: { baseCommitId: base },
+            version: { localBaseCommitId: base },
         });
         expect(updated.headCommitId).not.toBe(base);
         const row = findDocumentById(testDbRef.db, created.documentId);
@@ -86,21 +116,21 @@ describe("updateDocument 版本冲突", () => {
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"v":2}',
-            version: { baseCommitId: base },
+            version: { localBaseCommitId: base },
         });
         fileStoreMocks.lastWriteContent = '{"v":2}';
         expect(() => updateDocument({
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"v":3}',
-            version: { baseCommitId: base },
+            version: { localBaseCommitId: base },
         })).toThrow(DocumentError);
         try {
             updateDocument({
                 actorVisitorId: OWNER,
                 documentId: created.documentId,
                 content: '{"v":3}',
-                version: { baseCommitId: base },
+                version: { localBaseCommitId: base },
             });
         }
         catch (e) {
@@ -140,7 +170,7 @@ describe("updateDocument merge 发布", () => {
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"remote":true}',
-            version: { baseCommitId: base },
+            version: { localBaseCommitId: base },
         });
         const head = remote.headCommitId;
         const merged = updateDocument({
@@ -148,9 +178,9 @@ describe("updateDocument merge 发布", () => {
             documentId: created.documentId,
             content: '{"merged":true}',
             version: {
-                baseCommitId: base,
+                localBaseCommitId: base,
                 merge: {
-                    expectedHeadCommitId: head,
+                    remoteCommitId: head,
                     localSnapshotContent: '{"local":true}',
                 },
             },
@@ -163,7 +193,7 @@ describe("updateDocument merge 发布", () => {
         expect(localCommitId).toBeTruthy();
         expect(listParentCommitIds(testDbRef.db, localCommitId)).toEqual([base]);
     });
-    it("expectedHead 与当前 head 不一致时 409", () => {
+    it("remoteCommitId 与当前 head 不一致时 409", () => {
         const created = createDocument({
             actorVisitorId: OWNER,
             fileName: "merge-stale.md",
@@ -175,23 +205,46 @@ describe("updateDocument merge 发布", () => {
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"r":1}',
-            version: { baseCommitId: base },
+            version: { localBaseCommitId: base },
         });
         updateDocument({
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"r":2}',
-            version: { baseCommitId: remote.headCommitId },
+            version: { localBaseCommitId: remote.headCommitId },
         });
         expect(() => updateDocument({
             actorVisitorId: OWNER,
             documentId: created.documentId,
             content: '{"m":1}',
             version: {
-                baseCommitId: base,
-                merge: { expectedHeadCommitId: remote.headCommitId },
+                localBaseCommitId: base,
+                merge: { remoteCommitId: remote.headCommitId },
             },
         })).toThrow(DocumentError);
     });
 });
+describe("getDocumentMergeContext", () => {
+    it("线性落后：LCA 为 localBase 并返回其 blob 正文", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "merge-ctx.md",
+            content: '{"v":1}',
+            domainId: "default",
+        });
+        const localBase = created.headCommitId;
+        const remote = updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"v":2}',
+            version: { localBaseCommitId: localBase },
+        });
+        const ctx = getDocumentMergeContext(created.documentId, localBase, remote.headCommitId);
+        expect(ctx.mode).toBe("three_way");
+        expect(ctx.mergeBaseCommitId).toBe(localBase);
+        const baseCommit = findCommitById(testDbRef.db, localBase);
+        expect(ctx.mergeBaseContent).toBe(fileStoreMocks.commitBlobs.get(baseCommit.blob_ref));
+        expect(ctx.mergeBaseContent).toBe('{"v":1}');
+    });
+});
 //# sourceMappingURL=document-commit.integration.test.js.map

package/dist/server/documents/document-commit.integration.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"document-commit.integration.test.js","sourceRoot":"","sources":["../../../src/server/documents/document-commit.integration.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document-commit.integration.test.js","sourceRoot":"","sources":["../../../src/server/documents/document-commit.integration.test.ts"],"names":[],"mappings":"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"}

package/dist/server/documents/document.service.js

@@ -2,12 +2,13 @@ import { randomUUID } from "node:crypto";
 import { getDb } from "../db/connection.js";
 import { deleteDocument, findDocumentById, findDocumentByPath, findDocumentInvite, findChildrenByParent, insertDocument, insertDocumentInvite, deleteDocumentInvite, listDocumentInvites, listDocumentsByDomain, listDocumentsByPathPrefix, updateDocumentContent, updateDocumentHeadCommit, } from "../db/repositories/document.repo.js";
 import { insertCommit, insertCommitParent } from "../db/repositories/commit.repo.js";
-import { assertCommitBelongsToDocument, assertMergeFork, isAncestorOf, } from "./commit-graph.js";
+import { assertCommitBelongsToDocument, assertMergeFork, findMergeBaseCommitId, isAncestorOf, } from "./commit-graph.js";
+import { findCommitById } from "../db/repositories/commit.repo.js";
 import { findDomainById, isDomainMember, } from "../db/repositories/domain.repo.js";
 import { resolveDomainAccess, canEnterDomainTree, } from "../access/domain-access.js";
 import { DocumentError, Permission, canReadDocument, canEditDocument, validateDomainPermission, } from "../access/access-control.js";
 import { insertAuditLog } from "../db/repositories/audit.repo.js";
-import { deleteDocumentFile, readDocument, sha256, writeCommitBlob, writeDocument, } from "../storage/file-store.js";
+import { deleteDocumentFile, readCommitBlob, readDocument, sha256, writeCommitBlob, writeDocument, } from "../storage/file-store.js";
 import { markDirty, removeIndex, rebuildDocument, } from "../search/document-index-manager.js";
 import { getConfig } from "../config/index.js";
 import { markdownToLexicalJson } from "./markdown-to-lexical.js";
@@ -263,12 +264,12 @@ export function updateDocument(params) {
     const displayName = params.displayName?.trim() || row.display_name;
     const now = new Date().toISOString();
     const version = params.version;
-    const baseCommitId = version?.baseCommitId;
+    const localBaseCommitId = version?.localBaseCommitId;
     const mergeCtx = version?.merge;
     // 冲突解决后的合并发布：插 r_local + 双父 merge 节点
     if (mergeCtx) {
-        if (!baseCommitId) {
-            throw new DocumentError("BAD_REQUEST", "merge 发布需要在 version 中提供 baseCommitId", 400);
+        if (!localBaseCommitId) {
+            throw new DocumentError("BAD_REQUEST", "merge 发布需要在 version 中提供 localBaseCommitId", 400);
         }
         const localSnapshotContent = mergeCtx.localSnapshotContent !== undefined
             ? normalizeDocumentContent(mergeCtx.localSnapshotContent, params.contentFormat)
@@ -279,14 +280,14 @@ export function updateDocument(params) {
             content,
             displayName,
             permission: params.permission,
-            baseCommitId,
-            expectedHeadCommitId: mergeCtx.expectedHeadCommitId,
+            localBaseCommitId,
+            remoteCommitId: mergeCtx.remoteCommitId,
             localSnapshotContent,
             now,
         });
     }
     // 普通线性发布：客户端 base 必须等于当前 head（未传 version 则跳过校验）
-    assertNoVersionConflict(db, row, baseCommitId);
+    assertNoVersionConflict(db, row, localBaseCommitId);
     const write = writeDocument(row.domain_id, row.relative_path, content);
     const commitId = randomUUID();
     const blob = writeCommitBlob(write.contentHash, content);
@@ -339,6 +340,10 @@ export function updateDocument(params) {
             // ignore
         }
     });
+    // 写后直接返回最新 DocumentDetail（而非要求前端再 GET）：
+    // 1) 降低竞争态：避免 PUT 与后续 GET 间隙被他人再次推进 head；
+    // 2) 单一真相：以后端实际落库结果为准（权限、head、invite 派生字段等）。
+    const invitedEdit = resolveInvitedEditFlag(db, row, params.actorVisitorId);
     return buildDocumentDetail(row, {
         displayName,
         content,
@@ -347,6 +352,7 @@ export function updateDocument(params) {
         updatedAt: now,
         permission: params.permission !== undefined ? params.permission : row.permission,
         headCommitId: commitId,
+        invitedEdit,
     });
 }
 // ============================================================
@@ -505,6 +511,7 @@ function buildDocumentDetail(row, overrides) {
         updatedBy: overrides.updatedBy,
         updatedAt: overrides.updatedAt,
         permission: overrides.permission,
+        ...(overrides.invitedEdit ? { invitedEdit: true } : {}),
     };
 }
 /**
@@ -519,19 +526,19 @@ function throwVersionConflict(row, serverContent, serverContentHash) {
     });
 }
 /**
- * 普通发布前的乐观锁：baseCommitId 与 head 不一致则冲突。
- * 未传 baseCommitId 时跳过（兼容尚未接入的前端）。
+ * 普通发布前的乐观锁：localBaseCommitId 与 head 不一致则冲突。
+ * 未传 localBaseCommitId 时跳过（兼容尚未接入的前端）。
  */
-function assertNoVersionConflict(db, row, baseCommitId) {
-    // 客户端没传 base：旧版前端或未启用冲突检测，直接放行（不进行冲突校验）
+function assertNoVersionConflict(db, row, localBaseCommitId) {
+    // 客户端没传 localBase：旧版前端或未启用冲突检测，直接放行（不进行冲突校验）
     // 文档尚无 head：历史数据/异常态，无法比对，也放行
-    if (!baseCommitId || !row.head_commit_id)
+    if (!localBaseCommitId || !row.head_commit_id)
         return;
     // 客户端认为的「我基于的那一版」仍等于服务端当前 head → 无人插队，可 fast-forward 发布
-    if (baseCommitId === row.head_commit_id)
+    if (localBaseCommitId === row.head_commit_id)
         return;
-    // 走到这里：base 有值且与 head 不同 → 说明在你编辑期间 head 已被别人/另一标签推进 → 409
-    assertCommitBelongsToDocument(db, baseCommitId, row.document_id);
+    // 走到这里：localBase 有值且与 head 不同 → 说明在你编辑期间 head 已被别人/另一标签推进 → 409
+    assertCommitBelongsToDocument(db, localBaseCommitId, row.document_id);
     const { content, contentHash } = readDocument(row.domain_id, row.relative_path);
     throwVersionConflict(row, content, contentHash);
 }
@@ -540,14 +547,14 @@ function assertNoVersionConflict(db, row, baseCommitId) {
  *
  * 提交图（merge 完成后）示意：
  *
- *     base（开编时的 head，version.baseCommitId）
- *      ├── expectedHead（冲突时远端最新，version.merge.expectedHeadCommitId）
- *      └── r_local（本地支，本次首次落库；父 = base）
+ *     localBaseCommitId（开编分叉点，version.localBaseCommitId）
+ *      ├── remoteCommitId（冲突时远端 tip，version.merge.remoteCommitId）
+ *      └── localCommitId（r_local，本次首次落库；父 = localBaseCommitId）
  *             \      /
- *              merge（合成稿，新 head；父 = expectedHead + r_local）
+ *              mergeCommitId（合成稿，新 head；父 = remoteCommitId + localCommitId）
  *
  * 步骤：
- * 1. 校验：expectedHead 仍为当前 head；base 是 expectedHead 的祖先（assertMergeFork）
+ * 1. 校验：remoteCommitId 仍为当前 head；localBase 是 remote 的祖先（assertMergeFork）
  * 2. 写盘：工作区 = 合成稿；commits 目录落 r_local / merge 快照（writeCommitBlob）
  * 3. 事务：插 r_local + merge 节点与边，更新 documents.head_commit_id
  */
@@ -559,13 +566,13 @@ function publishMergeDocument(params) {
         throw new DocumentError("BAD_REQUEST", "文档尚无提交历史，无法合并发布", 400);
     }
     // 合并过程中若 head 又被别人推进，同样 409
-    if (params.expectedHeadCommitId !== row.head_commit_id) {
+    if (params.remoteCommitId !== row.head_commit_id) {
         const { content: serverContent, contentHash } = readDocument(row.domain_id, row.relative_path);
         throwVersionConflict(row, serverContent, contentHash);
     }
-    assertCommitBelongsToDocument(db, params.baseCommitId, row.document_id);
-    assertCommitBelongsToDocument(db, params.expectedHeadCommitId, row.document_id);
-    assertMergeFork(db, params.baseCommitId, params.expectedHeadCommitId);
+    assertCommitBelongsToDocument(db, params.localBaseCommitId, row.document_id);
+    assertCommitBelongsToDocument(db, params.remoteCommitId, row.document_id);
+    assertMergeFork(db, params.localBaseCommitId, params.remoteCommitId);
     // 写盘：工作区 + 两份历史快照（r_local 支 / merge 结果）
     const localContent = params.localSnapshotContent ?? content;
     const localHash = sha256(Buffer.from(localContent, "utf8"));
@@ -597,7 +604,7 @@ function publishMergeDocument(params) {
         });
         insertCommitParent(db, {
             childCommitId: localCommitId,
-            parentCommitId: params.baseCommitId,
+            parentCommitId: params.localBaseCommitId,
         });
         updateDocumentContent(db, {
             documentId: row.document_id,
@@ -620,7 +627,7 @@ function publishMergeDocument(params) {
         // 这里存储的是远端head
         insertCommitParent(db, {
             childCommitId: mergeCommitId,
-            parentCommitId: params.expectedHeadCommitId,
+            parentCommitId: params.remoteCommitId,
         });
         // 这里存储的是r_local
         insertCommitParent(db, {
@@ -639,8 +646,8 @@ function publishMergeDocument(params) {
             targetType: "document",
             targetId: row.document_id,
             metadata: {
-                baseCommitId: params.baseCommitId,
-                expectedHeadCommitId: params.expectedHeadCommitId,
+                localBaseCommitId: params.localBaseCommitId,
+                remoteCommitId: params.remoteCommitId,
                 localCommitId,
                 mergeCommitId,
             },
@@ -657,6 +664,10 @@ function publishMergeDocument(params) {
             // ignore
         }
     });
+    // merge 发布同样采用“写后即返回最新资源”：
+    // - 避免前端二次查询引入时序偏差；
+    // - 确保 UI 使用服务端合并后的最终状态作为唯一真相。
+    const invitedEdit = resolveInvitedEditFlag(db, row, actorVisitorId);
     return buildDocumentDetail(row, {
         displayName,
         content,
@@ -665,6 +676,7 @@ function publishMergeDocument(params) {
         updatedAt: now,
         permission: params.permission !== undefined ? params.permission : row.permission,
         headCommitId: mergeCommitId,
+        invitedEdit,
     });
 }
 function deriveDisplayName(raw, relativePath) {
@@ -678,32 +690,68 @@ function deriveDisplayName(raw, relativePath) {
 function normalizeDocumentContent(content, contentFormat) {
     return contentFormat === "markdown" ? markdownToLexicalJson(content) : content;
 }
+function resolveInvitedEditFlag(db, row, actorVisitorId) {
+    if (row.owner_visitor_id === actorVisitorId)
+        return false;
+    const invite = findDocumentInvite(db, row.document_id, actorVisitorId);
+    return invite?.permission === "edit";
+}
 // ============================================================
 //  同步状态（轻量轮询，不返回正文）
 // ============================================================
 /**
- * 比较客户端 baseCommitId 与服务端 head，用于 Sync 指示。
- * - up_to_date：base 未传、无 head、或 base === head
- * - behind：base 是 head 的祖先（远端有更新）
- * - ahead：其余（含分叉、脏 base）
+ * 比较客户端 localBaseCommitId 与服务端 head（remoteCommitId），用于 Sync 指示。
+ * - up_to_date：localBase 未传、无 head、或 localBase === head
+ * - behind：localBase 是 head 的祖先（远端有更新）
+ * - ahead：其余（含分叉、历史回退等）
  */
-export function getDocumentSyncStatus(documentId, baseCommitId) {
+export function getDocumentSyncStatus(documentId, localBaseCommitId) {
     const row = findDocumentById(getDb(), documentId);
     if (!row)
         throw new DocumentError("DOC_NOT_FOUND", "文档不存在", 404);
     const head = row.head_commit_id;
-    if (!baseCommitId || !head) {
+    if (!localBaseCommitId || !head) {
         return { status: "up_to_date", headCommitId: head };
     }
-    if (baseCommitId === head) {
+    if (localBaseCommitId === head) {
         return { status: "up_to_date", headCommitId: head };
     }
     const db = getDb();
-    if (isAncestorOf(db, baseCommitId, head)) {
+    if (isAncestorOf(db, localBaseCommitId, head)) {
         return { status: "behind", headCommitId: head };
     }
     return { status: "ahead", headCommitId: head };
 }
+/**
+ * 为 merge UI 提供 LCA 正文：根据 localBase / remote 在 DAG 上求 mergeBase，读取 blob。
+ * 无法求 LCA 或读 blob 失败时返回 two_way（前端可退化为开编快照或两方 diff）。
+ */
+export function getDocumentMergeContext(documentId, localBaseCommitId, remoteCommitId) {
+    const row = findDocumentById(getDb(), documentId);
+    if (!row)
+        throw new DocumentError("DOC_NOT_FOUND", "文档不存在", 404);
+    const db = getDb();
+    assertCommitBelongsToDocument(db, localBaseCommitId, documentId);
+    assertCommitBelongsToDocument(db, remoteCommitId, documentId);
+    let mergeBaseCommitId;
+    try {
+        mergeBaseCommitId = findMergeBaseCommitId(db, localBaseCommitId, remoteCommitId);
+    }
+    catch {
+        return { mode: "two_way", mergeBaseCommitId: null, mergeBaseContent: null };
+    }
+    const baseCommit = findCommitById(db, mergeBaseCommitId);
+    if (!baseCommit) {
+        return { mode: "two_way", mergeBaseCommitId: null, mergeBaseContent: null };
+    }
+    try {
+        const mergeBaseContent = readCommitBlob(baseCommit.blob_ref);
+        return { mode: "three_way", mergeBaseCommitId, mergeBaseContent };
+    }
+    catch {
+        return { mode: "two_way", mergeBaseCommitId: null, mergeBaseContent: null };
+    }
+}
 /** 内容格式转换（merge 发布：markdown → Lexical）。 */
 export function convertDocumentContent(params) {
     if (params.from === params.to)