AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
Bind memo saves to edit sessions
yoma7b085fd9f9e2
diff --git a/apps/api/src/index.ts b/apps/api/src/index.tsindex 453ee1cd..26cdd443 100644--- a/apps/api/src/index.ts+++ b/apps/api/src/index.ts@@ -9,6 +9,7 @@ import {LoginSchema,markdownToDoc,isSuspiciousMemoOverwrite,+ isMemoEditBindingValid,MemoCreateSchema,MemoUpdateSchema,MergeMemosSchema,@@ -20,6 +21,7 @@ import {type ApiToken,type CreatedApiToken,type MemoDetail,+ type MemoEditSession,type MemoRevision,type MemoSummary,type MemoUpdateInput,@@ -131,6 +133,16 @@ type MemoRevisionRow = {created_at: string;};+type MemoEditSessionRow = {+ id: string;+ memo_id: string;+ actor_type: "user" | "agent";+ actor_id: string | null;+ base_revision: number;+ base_content_hash: string;+ expires_at: string;+};+type UserRow = {id: string;username: string;@@ -1039,6 +1051,53 @@ app.get("/api/v1/memos/:id", async (c) => {return c.json({ memo });});+app.post("/api/v1/memos/:id/edit-sessions", async (c) => {+ const denied = requireScopes(c, "write:memos");++ if (denied) {+ return denied;+ }++ const memoId = c.req.param("id");+ const current = await getMemoDetailRow(c.env.DB, memoId);++ if (!current) {+ return notFound(c, "Memo not found");+ }++ const actor = getAuditActor(c);+ const now = isoNow();+ const session: MemoEditSession = {+ id: createId("edit"),+ memoId,+ baseRevision: current.revision,+ baseContentHash: current.content_hash,+ expiresAt: new Date(Date.now() + 30 * 24 * 60 * 60_000).toISOString(),+ };++ await c.env.DB.batch([+ c.env.DB.prepare(`DELETE FROM memo_edit_sessions WHERE expires_at <= ?`).bind(now),+ c.env.DB.prepare(+ `INSERT INTO memo_edit_sessions (+ id, memo_id, actor_type, actor_id, base_revision, base_content_hash,+ expires_at, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`+ ).bind(+ session.id,+ memoId,+ actor.actorType,+ actor.actorId,+ session.baseRevision,+ session.baseContentHash,+ session.expiresAt,+ now,+ now+ ),+ ]);++ return c.json({ editSession: session });+});+app.get("/api/v1/memos/:id/revisions", async (c) => {const denied = requireScopes(c, "read:memos");@@ -1495,6 +1554,57 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateI);}+ const hasDocumentUpdate = input.contentJson !== undefined || input.contentMarkdown !== undefined;+ let editSession: MemoEditSessionRow | null = null;++ if (hasDocumentUpdate) {+ if (!input.editSessionId || !input.expectedContentHash || input.expectedRevision === undefined) {+ return c.json(+ { error: { code: "edit_session_required", message: "A bound edit session is required to save note content." } },+ 428+ );+ }++ if (input.expectedContentHash !== current.content_hash) {+ return c.json(+ { error: { code: "content_conflict", message: "Note content changed after this edit session started." } },+ 409+ );+ }++ editSession = await c.env.DB.prepare(+ `SELECT id, memo_id, actor_type, actor_id, base_revision, base_content_hash, expires_at+ FROM memo_edit_sessions+ WHERE id = ? AND memo_id = ? AND actor_type = ? AND actor_id IS ? AND expires_at > ?`+ )+ .bind(input.editSessionId, id, actor.actorType, actor.actorId, isoNow())+ .first<MemoEditSessionRow>();++ if (+ !editSession ||+ !isMemoEditBindingValid(+ { memoId: id, revision: current.revision, contentHash: current.content_hash },+ {+ id: editSession.id,+ memoId: editSession.memo_id,+ baseRevision: editSession.base_revision,+ baseContentHash: editSession.base_content_hash,+ },+ {+ editSessionId: input.editSessionId,+ memoId: id,+ expectedRevision: input.expectedRevision,+ expectedContentHash: input.expectedContentHash,+ }+ )+ ) {+ return c.json(+ { error: { code: "edit_session_conflict", message: "The edit session is stale or belongs to another note." } },+ 409+ );+ }+ }+const isPinned = input.isPinned ?? Boolean(current.is_pinned);const hasContentUpdate =input.notebookId !== undefined ||@@ -1557,6 +1667,32 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateIconst revisionStatements = (await shouldSnapshotMemoRevision(c.env.DB, current, title, JSON.stringify(tags), contentHash, updatedAt))? [createMemoRevisionStatement(c.env.DB, current, actorLabel, updatedAt)]: [];+ const editSessionStatements = editSession+ ? [+ c.env.DB.prepare(+ `UPDATE memo_edit_sessions+ SET base_revision = ?, base_content_hash = ?, updated_at = ?+ WHERE id = ? AND memo_id = ? AND base_revision = ? AND base_content_hash = ?`+ ).bind(nextRevision, contentHash, updatedAt, editSession.id, id, current.revision, current.content_hash),+ ]+ : [+ c.env.DB.prepare(+ `UPDATE memo_edit_sessions+ SET base_revision = ?, base_content_hash = ?, updated_at = ?+ WHERE memo_id = ? AND actor_type = ? AND actor_id IS ?+ AND base_revision = ? AND base_content_hash = ? AND expires_at > ?`+ ).bind(+ nextRevision,+ contentHash,+ updatedAt,+ id,+ actor.actorType,+ actor.actorId,+ current.revision,+ current.content_hash,+ updatedAt+ ),+ ];await c.env.DB.batch([...revisionStatements,@@ -1576,6 +1712,7 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateI`INSERT INTO memos_fts (memo_id, title, content_text, tags)VALUES (?, ?, ?, ?)`).bind(id, title, contentText, tags.join(" ")),+ ...editSessionStatements,auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.update", "memo", id, {revision: nextRevision,}),@@ -3104,6 +3241,7 @@ const mapMemoDetail = (row: MemoDetailRow): MemoDetail => ({contentJson: parseDoc(row.content_json),contentMarkdown: row.content_markdown,contentText: row.content_text,+ contentHash: row.content_hash,sourceMemoIds: parseJsonArray(row.source_memo_ids),mergeSourceCount: row.merge_source_count,mergedIntoMemoId: row.merged_into_memo_id,diff --git a/apps/mobile/src/lib/sync-queue.ts b/apps/mobile/src/lib/sync-queue.tsindex 6c8396da..5bdb6ea4 100644--- a/apps/mobile/src/lib/sync-queue.ts+++ b/apps/mobile/src/lib/sync-queue.ts@@ -7,6 +7,7 @@ const SYNC_QUEUE_KEY = "edgeever.mobile.syncQueue.v1";export type MobileMemoUpdateSyncPayload = {memoId: string;expectedRevision: number;+ expectedContentHash: string;title: string;contentMarkdown: string;notebookId: string;@@ -145,8 +146,19 @@ export const shouldQueueMobileMemoSaveError = (error: unknown) => {};const syncMobileQueueItem = async (client: ReturnType<typeof createEdgeEverClient>, item: MobileSyncQueueItem) => {+ const { editSession } = await client.createMemoEditSession(item.memoId);++ if (+ editSession.baseRevision !== item.payload.expectedRevision ||+ editSession.baseContentHash !== item.payload.expectedContentHash+ ) {+ throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict");+ }+const response = await client.updateMemo(item.memoId, {expectedRevision: item.payload.expectedRevision,+ expectedContentHash: item.payload.expectedContentHash,+ editSessionId: editSession.id,title: item.payload.title,contentMarkdown: item.payload.contentMarkdown,notebookId: item.payload.notebookId,diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsxindex 02461f86..af104d50 100644--- a/apps/mobile/src/screens/WorkspaceScreen.tsx+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx@@ -606,8 +606,17 @@ export const WorkspaceScreen = () => {throw new Error("Client is not ready");}+ const editSessionResponse = payload.contentMarkdown !== undefined+ ? await client.createMemoEditSession(memo.id)+ : null;const response = await client.updateMemo(memo.id, {expectedRevision: memo.revision,+ ...(editSessionResponse+ ? {+ expectedContentHash: memo.contentHash,+ editSessionId: editSessionResponse.editSession.id,+ }+ : {}),...payload,});@@ -3285,9 +3294,12 @@ const ResourcesModal = ({}setUploadProgress("写入笔记正文");+ const { editSession } = await client.createMemoEditSession(activeMemo.id);const { memo } = await client.updateMemo(activeMemo.id, {contentMarkdown: nextMarkdown,expectedRevision: activeMemo.revision,+ expectedContentHash: activeMemo.contentHash,+ editSessionId: editSession.id,});return { memo, resources };@@ -4300,6 +4312,7 @@ const EditMemoModal = ({await queueMobileMemoUpdate({memoId: memo.id,expectedRevision: memo.revision,+ expectedContentHash: memo.contentHash,title: title.trim() || DEFAULT_MEMO_TITLE,contentMarkdown,notebookId,diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsxindex 9059516e..5669e17b 100644--- a/apps/web/src/components/EditorPane.tsx+++ b/apps/web/src/components/EditorPane.tsx@@ -52,7 +52,7 @@ import { RevisionHistoryDialog } from "./dialogs/RevisionHistoryDialog";import { api } from "@/lib/api";import { consumeStandaloneMobileEditorReturn, openStandaloneMobileEditor } from "@/lib/mobile-editor";import { cn, formatDateTime, parseTagsText } from "@/lib/utils";-import { docToMarkdown, markdownToDoc, type Notebook, type MemoDetail, type TiptapDoc } from "@edgeever/shared";+import { docToMarkdown, markdownToDoc, type Notebook, type MemoDetail, type MemoEditSession, type TiptapDoc } from "@edgeever/shared";import { compressImageForUpload } from "@/lib/image-compression";import { localDb, type MemoUpdateSyncPayload } from "@/lib/local-db";import { getMemoUpdateQueueId, queueMemoUpdate, shouldQueueMemoSaveError } from "@/lib/sync-queue";@@ -493,6 +493,7 @@ const MobileNativeEditorPane = ({const draftTimerRef = useRef<number | null>(null);const saveTimerRef = useRef<number | null>(null);const memoRef = useRef<MemoDetail | null>(memo);+ const editSessionRef = useRef<MemoEditSession | null>(null);const editingMemoIdRef = useRef<string | null>(memo?.id ?? null);const hasUnsavedChangesRef = useRef(false);const hydratingRef = useRef(false);@@ -554,7 +555,8 @@ const MobileNativeEditorPane = ({const currentMemo = memoRef.current;const snapshot = currentSnapshot();- if (!currentMemo || currentMemo.isDeleted || !snapshot || savingRef.current) {+ const editSession = editSessionRef.current;+ if (!currentMemo || currentMemo.isDeleted || !snapshot || savingRef.current || !editSession) {return false;}@@ -566,6 +568,8 @@ const MobileNativeEditorPane = ({const payload: MemoUpdateSyncPayload = {memoId: currentMemo.id,expectedRevision: currentMemo.revision,+ expectedContentHash: currentMemo.contentHash,+ editSessionId: editSession.id,title: getTitleValue(),contentJson,tags: parseTagsText(getTagsValue()),@@ -574,12 +578,19 @@ const MobileNativeEditorPane = ({try {const data = await api.updateMemo(currentMemo.id, {expectedRevision: payload.expectedRevision,+ expectedContentHash: payload.expectedContentHash,+ editSessionId: payload.editSessionId,title: payload.title,contentJson: payload.contentJson,tags: payload.tags,});memoRef.current = data.memo;+ editSessionRef.current = {+ ...editSession,+ baseRevision: data.memo.revision,+ baseContentHash: data.memo.contentHash,+ };await onSaved(data.memo);if (currentSnapshot() === snapshot) {@@ -682,6 +693,7 @@ const MobileNativeEditorPane = ({useEffect(() => {if (!memo) {memoRef.current = null;+ editSessionRef.current = null;return;}@@ -694,11 +706,12 @@ const MobileNativeEditorPane = ({}void (async () => {- const [draft, queuedUpdate] = memo.isDeleted- ? [null, null]+ const [draft, queuedUpdate, editSessionResponse] = memo.isDeleted+ ? [null, null, null]: await Promise.all([localDb.drafts.get(memo.id),localDb.syncQueue.get(getMemoUpdateQueueId(memo.id)),+ api.createMemoEditSession(memo.id),]);if (cancelled) {@@ -711,6 +724,7 @@ const MobileNativeEditorPane = ({const nextTitle = useDraft && draft ? draft.title : memo.title ?? "";const nextTagsText = useDraft && draft ? draft.tagsText : memo.tags.join(", ");const nextContent = useDraft && draft ? draft.contentJson : memo.contentJson;+ editSessionRef.current = editSessionResponse?.editSession ?? null;hydratingRef.current = true;editingMemoIdRef.current = memo.id;@@ -1091,6 +1105,7 @@ const RichEditorPane = ({const useMobilePlainTextEditor = isMobileViewport && mobileEditingActive && !readOnly;const memoRef = useRef<MemoDetail | null>(memo);+ const editSessionRef = useRef<MemoEditSession | null>(null);const editorRef = useRef<Editor | null>(null);const mobileTextAreaRef = useRef<MobilePlainTextElement | null>(null);const mobileDraftTimerRef = useRef<number | null>(null);@@ -1572,6 +1587,7 @@ const RichEditorPane = ({if (!memo) {memoRef.current = null;+ editSessionRef.current = null;hydratedMemoIdRef.current = null;editingMemoIdRef.current = null;hasUnsavedChangesRef.current = false;@@ -1599,11 +1615,12 @@ const RichEditorPane = ({}void (async () => {- const [draft, queuedUpdate] = memo.isDeleted- ? [null, null]+ const [draft, queuedUpdate, editSessionResponse] = memo.isDeleted+ ? [null, null, null]: await Promise.all([localDb.drafts.get(memo.id),localDb.syncQueue.get(getMemoUpdateQueueId(memo.id)),+ api.createMemoEditSession(memo.id),]);if (cancelled) {@@ -1634,6 +1651,7 @@ const RichEditorPane = ({}hydratedMemoIdRef.current = memo.id;+ editSessionRef.current = editSessionResponse?.editSession ?? null;window.setTimeout(() => {hydratingRef.current = false;@@ -1718,8 +1736,9 @@ const RichEditorPane = ({mutationFn: async () => {const currentMemo = memoRef.current;const contentJson = getCurrentContentJson();+ const editSession = editSessionRef.current;- if (!currentMemo || !contentJson || hydratedMemoIdRef.current !== currentMemo.id) {+ if (!currentMemo || !contentJson || !editSession || hydratedMemoIdRef.current !== currentMemo.id) {throw new Error("No memo selected");}@@ -1735,6 +1754,8 @@ const RichEditorPane = ({const payload: MemoUpdateSyncPayload = {memoId: currentMemo.id,expectedRevision: currentMemo.revision,+ expectedContentHash: currentMemo.contentHash,+ editSessionId: editSession.id,title,contentJson,tags: parseTagsText(tagsText),@@ -1744,6 +1765,8 @@ const RichEditorPane = ({try {data = await api.updateMemo(currentMemo.id, {expectedRevision: payload.expectedRevision,+ expectedContentHash: payload.expectedContentHash,+ editSessionId: payload.editSessionId,title: payload.title,contentJson: payload.contentJson,tags: payload.tags,@@ -1757,6 +1780,14 @@ const RichEditorPane = ({onMutate: () => setSaveState("saving"),onSuccess: async ({ memo: savedMemo, snapshot }) => {memoRef.current = savedMemo;+ const currentEditSession = editSessionRef.current;+ if (currentEditSession) {+ editSessionRef.current = {+ ...currentEditSession,+ baseRevision: savedMemo.revision,+ baseContentHash: savedMemo.contentHash,+ };+ }if (useMobilePlainTextEditor && isEditorReady(editorRef.current)) {hydratingRef.current = true;diff --git a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx b/apps/web/src/components/MobileStandaloneTiptapEditor.tsxindex e19b1d07..a1d9a9c7 100644--- a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx+++ b/apps/web/src/components/MobileStandaloneTiptapEditor.tsx@@ -3,7 +3,7 @@ import { EditorContent, useEditor } from "@tiptap/react";import StarterKit from "@tiptap/starter-kit";import Image from "@tiptap/extension-image";import Placeholder from "@tiptap/extension-placeholder";-import { docToMarkdown, emptyDoc, type MemoDetail, type Notebook, type TiptapDoc } from "@edgeever/shared";+import { docToMarkdown, emptyDoc, type MemoDetail, type MemoEditSession, type Notebook, type TiptapDoc } from "@edgeever/shared";import {MobileEditorFallback,MobileEditorHeader,@@ -52,6 +52,7 @@ export const MobileStandaloneTiptapEditor = ({const draftKey = getMobileEditorDraftKey(memoId);const [memo, setMemo] = useState<MemoDetail | null>(null);const memoRef = useRef<MemoDetail | null>(null);+ const editSessionRef = useRef<MemoEditSession | null>(null);const [notebooks, setNotebooks] = useState<Notebook[]>([]);const [notebookUpdatePending, setNotebookUpdatePending] = useState(false);const [notebookSheetOpen, setNotebookSheetOpen] = useState(false);@@ -124,6 +125,8 @@ export const MobileStandaloneTiptapEditor = ({void queueMemoUpdate({memoId: currentMemo.id,expectedRevision: currentMemo.revision,+ expectedContentHash: currentMemo.contentHash,+ editSessionId: editSessionRef.current?.id ?? "",title: draft.title,contentJson: draft.contentJson,tags: parseMobileEditorTags(draft.tagsText),@@ -251,15 +254,31 @@ export const MobileStandaloneTiptapEditor = ({]);}, [draftKey]);- const buildSavePayload = useCallback((currentMemo: MemoDetail) => ({- expectedRevision: currentMemo.revision,- title: titleRef.current,- contentJson: contentJsonRef.current,- tags: parseMobileEditorTags(tagsTextRef.current),- }), []);+ const buildSavePayload = useCallback((currentMemo: MemoDetail) => {+ const editSession = editSessionRef.current;+ if (!editSession || editSession.memoId !== currentMemo.id) {+ throw new Error("编辑会话尚未就绪");+ }++ return {+ expectedRevision: currentMemo.revision,+ expectedContentHash: currentMemo.contentHash,+ editSessionId: editSession.id,+ title: titleRef.current,+ contentJson: contentJsonRef.current,+ tags: parseMobileEditorTags(tagsTextRef.current),+ };+ }, []);const applySavedMemo = useCallback(async (savedMemo: MemoDetail, savedSnapshot: string) => {memoRef.current = savedMemo;+ if (editSessionRef.current) {+ editSessionRef.current = {+ ...editSessionRef.current,+ baseRevision: savedMemo.revision,+ baseContentHash: savedMemo.contentHash,+ };+ }setMemo(savedMemo);backgroundSavePendingRef.current = false;lastSavedSnapshotRef.current = savedSnapshot;@@ -608,11 +627,19 @@ export const MobileStandaloneTiptapEditor = ({void (async () => {try {- const data = await requestMobileEditorJson<MobileEditorMemoResponse>(`/api/v1/memos/${encodeURIComponent(memoId)}`);+ const [data, sessionData] = await Promise.all([+ requestMobileEditorJson<MobileEditorMemoResponse>(`/api/v1/memos/${encodeURIComponent(memoId)}`),+ requestMobileEditorJson<{ editSession: MemoEditSession }>(`/api/v1/memos/${encodeURIComponent(memoId)}/edit-sessions`, {+ method: "POST",+ body: JSON.stringify({}),+ }),+ ]);if (cancelled) {return;}+ editSessionRef.current = sessionData.editSession;+const nextTitle = data.memo.title || "";const nextTagsText = Array.isArray(data.memo.tags) ? data.memo.tags.join(", ") : "";const nextContentJson = normalizeMobileEditorDoc(data.memo);diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex a7140a39..abefb7e5 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -3,6 +3,7 @@ import type {ApiToken,CreatedApiToken,MemoDetail,+ MemoEditSession,MemoRevision,MemoSummary,Notebook,@@ -233,6 +234,12 @@ export const api = {return request<MemoResponse>(`/api/v1/memos/${memoId}${suffix}`);},+ createMemoEditSession: (memoId: string) =>+ request<{ editSession: MemoEditSession }>(`/api/v1/memos/${memoId}/edit-sessions`, {+ method: "POST",+ body: JSON.stringify({}),+ }),+listMemoRevisions: (memoId: string) =>request<ListMemoRevisionsResponse>(`/api/v1/memos/${memoId}/revisions`),@@ -258,12 +265,15 @@ export const api = {memoId: string,payload: {expectedRevision?: number;+ expectedContentHash?: string;+ editSessionId?: string;notebookId?: string;title?: string;isPinned?: boolean;contentJson?: TiptapDoc;contentMarkdown?: string;tags?: string[];+ allowDestructiveOverwrite?: boolean;}) =>request<MemoResponse>(`/api/v1/memos/${memoId}`, {diff --git a/apps/web/src/lib/local-db.ts b/apps/web/src/lib/local-db.tsindex a798505e..92da3bea 100644--- a/apps/web/src/lib/local-db.ts+++ b/apps/web/src/lib/local-db.ts@@ -13,6 +13,8 @@ export type LocalDraft = {export type MemoUpdateSyncPayload = {memoId: string;expectedRevision: number;+ expectedContentHash: string;+ editSessionId: string;title: string;contentJson: TiptapDoc;tags: string[];diff --git a/apps/web/src/lib/sync-queue.ts b/apps/web/src/lib/sync-queue.tsindex 9b97f9d1..7fa48c63 100644--- a/apps/web/src/lib/sync-queue.ts+++ b/apps/web/src/lib/sync-queue.ts@@ -128,8 +128,18 @@ const syncQueueItem = async (item: SyncQueueItem): Promise<MemoDetail> => {throw new Error(`Unsupported sync item kind: ${item.kind}`);}+ const { editSession } = await api.createMemoEditSession(item.memoId);+ if (+ editSession.baseRevision !== item.payload.expectedRevision ||+ editSession.baseContentHash !== item.payload.expectedContentHash+ ) {+ throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict");+ }+const data = await api.updateMemo(item.memoId, {expectedRevision: item.payload.expectedRevision,+ expectedContentHash: item.payload.expectedContentHash,+ editSessionId: editSession.id,title: item.payload.title,contentJson: item.payload.contentJson as TiptapDoc,tags: item.payload.tags,diff --git a/docs/openapi.json b/docs/openapi.jsonindex ddded01e..c1e3a368 100644--- a/docs/openapi.json+++ b/docs/openapi.json@@ -641,6 +641,35 @@}}},+ "/api/v1/memos/{id}/edit-sessions": {+ "parameters": [+ {+ "$ref": "#/components/parameters/MemoId"+ }+ ],+ "post": {+ "summary": "Start a bound memo edit session",+ "description": "Binds an edit session to the memo id, current revision, current content hash, and authenticated actor.",+ "responses": {+ "200": {+ "description": "Bound edit session",+ "content": {+ "application/json": {+ "schema": {+ "type": "object",+ "properties": {+ "editSession": {+ "$ref": "#/components/schemas/MemoEditSession"+ }+ },+ "required": ["editSession"]+ }+ }+ }+ }+ }+ }+ },"/api/v1/memos/{id}/restore": {"parameters": [{@@ -1199,6 +1228,11 @@"contentText": {"type": "string"},+ "contentHash": {+ "type": "string",+ "minLength": 64,+ "maxLength": 64+ },"sourceMemoIds": {"type": "array","items": {@@ -1212,7 +1246,7 @@"type": ["string", "null"]}},- "required": ["contentJson", "contentMarkdown", "contentText", "sourceMemoIds", "mergeSourceCount", "mergedIntoMemoId"]+ "required": ["contentJson", "contentMarkdown", "contentText", "contentHash", "sourceMemoIds", "mergeSourceCount", "mergedIntoMemoId"]}]},@@ -1245,6 +1279,14 @@"type": "integer","minimum": 0},+ "expectedContentHash": {+ "type": "string",+ "minLength": 64,+ "maxLength": 64+ },+ "editSessionId": {+ "type": "string"+ },"notebookId": {"type": "string"},@@ -1269,6 +1311,17 @@}}},+ "MemoEditSession": {+ "type": "object",+ "properties": {+ "id": { "type": "string" },+ "memoId": { "type": "string" },+ "baseRevision": { "type": "integer", "minimum": 0 },+ "baseContentHash": { "type": "string", "minLength": 64, "maxLength": 64 },+ "expiresAt": { "type": "string", "format": "date-time" }+ },+ "required": ["id", "memoId", "baseRevision", "baseContentHash", "expiresAt"]+ },"MoveMemosInput": {"type": "object","properties": {diff --git a/migrations/0011_memo_edit_sessions.sql b/migrations/0011_memo_edit_sessions.sqlnew file mode 100644index 00000000..f4f144b5--- /dev/null+++ b/migrations/0011_memo_edit_sessions.sql@@ -0,0 +1,18 @@+CREATE TABLE memo_edit_sessions (+ id TEXT PRIMARY KEY,+ memo_id TEXT NOT NULL,+ actor_type TEXT NOT NULL CHECK (actor_type IN ('user', 'agent')),+ actor_id TEXT,+ base_revision INTEGER NOT NULL,+ base_content_hash TEXT NOT NULL,+ expires_at TEXT NOT NULL,+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ FOREIGN KEY (memo_id) REFERENCES memos(id) ON UPDATE CASCADE ON DELETE CASCADE+);++CREATE INDEX idx_memo_edit_sessions_memo+ ON memo_edit_sessions(memo_id, expires_at);++CREATE INDEX idx_memo_edit_sessions_expiry+ ON memo_edit_sessions(expires_at);diff --git a/packages/client/src/index.ts b/packages/client/src/index.tsindex 296d78f6..4fab87fb 100644--- a/packages/client/src/index.ts+++ b/packages/client/src/index.ts@@ -3,6 +3,7 @@ import type {AuthSession,CreatedApiToken,MemoDetail,+ MemoEditSession,MemoRevision,MemoSummary,Notebook,@@ -257,6 +258,12 @@ export const createEdgeEverClient = (options: EdgeEverClientOptions = {}) => {return request<MemoResponse>(`/api/v1/memos/${memoId}${suffix}`);},+ createMemoEditSession: (memoId: string) =>+ request<{ editSession: MemoEditSession }>(`/api/v1/memos/${memoId}/edit-sessions`, {+ method: "POST",+ body: JSON.stringify({}),+ }),+listMemoRevisions: (memoId: string) => request<ListMemoRevisionsResponse>(`/api/v1/memos/${memoId}/revisions`),restoreMemoRevision: (memoId: string, revisionId: string) =>@@ -277,12 +284,15 @@ export const createEdgeEverClient = (options: EdgeEverClientOptions = {}) => {memoId: string,payload: {expectedRevision?: number;+ expectedContentHash?: string;+ editSessionId?: string;notebookId?: string;title?: string;isPinned?: boolean;contentJson?: TiptapDoc;contentMarkdown?: string;tags?: string[];+ allowDestructiveOverwrite?: boolean;}) =>request<MemoResponse>(`/api/v1/memos/${memoId}`, {diff --git a/packages/shared/src/memo-safety.test.mjs b/packages/shared/src/memo-safety.test.mjsindex b1401d5e..442d074d 100644--- a/packages/shared/src/memo-safety.test.mjs+++ b/packages/shared/src/memo-safety.test.mjs@@ -1,5 +1,5 @@import { describe, expect, test } from "bun:test";-import { isSuspiciousMemoOverwrite } from "./memo-safety.ts";+import { isMemoEditBindingValid, isSuspiciousMemoOverwrite } from "./memo-safety.ts";describe("isSuspiciousMemoOverwrite", () => {test("blocks the production incident shape", () => {@@ -29,3 +29,39 @@ describe("isSuspiciousMemoOverwrite", () => {expect(isSuspiciousMemoOverwrite("旧标题", "短内容", "新标题", "")).toBe(false);});});++describe("isMemoEditBindingValid", () => {+ const current = { memoId: "memo_a", revision: 7, contentHash: "a".repeat(64) };+ const session = {+ id: "edit_1",+ memoId: "memo_a",+ baseRevision: 7,+ baseContentHash: "a".repeat(64),+ };+ const request = {+ editSessionId: "edit_1",+ memoId: "memo_a",+ expectedRevision: 7,+ expectedContentHash: "a".repeat(64),+ };++ test("accepts a fully bound save", () => {+ expect(isMemoEditBindingValid(current, session, request)).toBe(true);+ });++ test("rejects a session from another memo", () => {+ expect(isMemoEditBindingValid(current, { ...session, memoId: "memo_b" }, request)).toBe(false);+ });++ test("rejects a stale revision", () => {+ expect(isMemoEditBindingValid(current, session, { ...request, expectedRevision: 6 })).toBe(false);+ });++ test("rejects a stale content hash", () => {+ expect(isMemoEditBindingValid(current, session, { ...request, expectedContentHash: "b".repeat(64) })).toBe(false);+ });++ test("rejects a different edit-session id", () => {+ expect(isMemoEditBindingValid(current, session, { ...request, editSessionId: "edit_2" })).toBe(false);+ });+});diff --git a/packages/shared/src/memo-safety.ts b/packages/shared/src/memo-safety.tsindex 7beb4c7f..0e70c232 100644--- a/packages/shared/src/memo-safety.ts+++ b/packages/shared/src/memo-safety.ts@@ -10,3 +10,16 @@ export const isSuspiciousMemoOverwrite = (return titleChanged && currentLength >= 200 && nextLength < currentLength * 0.35;};++export const isMemoEditBindingValid = (+ current: { memoId: string; revision: number; contentHash: string },+ session: { id: string; memoId: string; baseRevision: number; baseContentHash: string },+ request: { editSessionId: string; memoId: string; expectedRevision: number; expectedContentHash: string }+) =>+ request.memoId === current.memoId &&+ session.memoId === current.memoId &&+ request.editSessionId === session.id &&+ request.expectedRevision === current.revision &&+ session.baseRevision === current.revision &&+ request.expectedContentHash === current.contentHash &&+ session.baseContentHash === current.contentHash;diff --git a/packages/shared/src/schemas.ts b/packages/shared/src/schemas.tsindex dbbfd834..de599e15 100644--- a/packages/shared/src/schemas.ts+++ b/packages/shared/src/schemas.ts@@ -22,6 +22,8 @@ export const MemoCreateSchema = z.object({export const MemoUpdateSchema = z.object({expectedRevision: z.number().int().min(0).optional(),+ expectedContentHash: z.string().length(64).optional(),+ editSessionId: z.string().trim().min(1).optional(),notebookId: z.string().trim().min(1).optional(),title: z.string().trim().max(160).optional(),isPinned: z.boolean().optional(),diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.tsindex 7df5d07c..99108629 100644--- a/packages/shared/src/types.ts+++ b/packages/shared/src/types.ts@@ -33,11 +33,20 @@ export type MemoDetail = MemoSummary & {contentJson: TiptapDoc;contentMarkdown: string;contentText: string;+ contentHash: string;sourceMemoIds: string[];mergeSourceCount: number;mergedIntoMemoId: string | null;};+export type MemoEditSession = {+ id: string;+ memoId: string;+ baseRevision: number;+ baseContentHash: string;+ expiresAt: string;+};+export type MemoRevision = {id: string;memoId: string;