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
chore: restore mobile worktree scope
tianma-ifa6c30a27be69
diff --git a/apps/mobile/src/components/LocalTiptapEditor.tsx b/apps/mobile/src/components/LocalTiptapEditor.tsxindex c0118136..d4e7f6fa 100644--- a/apps/mobile/src/components/LocalTiptapEditor.tsx+++ b/apps/mobile/src/components/LocalTiptapEditor.tsx@@ -675,14 +675,11 @@ function LocalTiptapEditorImpl(props: LocalTiptapEditorProps) {const next = resolveImageSources(parsed, props.baseUrl);// Do not focus while replacing content. Callers decide when the editor should// take focus and place the caret via focusEnd().- // This command synchronizes native-owned state (draft restore/template/new- // composer reset). Callers already own persistence for that state, so an- // emitted update would create a delayed stale write during screen teardown.- editor.commands.setContent(next, { emitUpdate: false });+ editor.commands.setContent(next, { emitUpdate: !isViewer });} catch {// Ignore malformed payloads from the native bridge.}- }, [editor, props.baseUrl]);+ }, [editor, isViewer, props.baseUrl]);const search = useCallback((query: DOMValue, requestedIndex: DOMValue) => {const normalizedQuery = typeof query === "string" ? query : "";diff --git a/apps/mobile/src/lib/mobile-draft-write-barrier.test.ts b/apps/mobile/src/lib/mobile-draft-write-barrier.test.tsdeleted file mode 100644index 5948e71b..00000000--- a/apps/mobile/src/lib/mobile-draft-write-barrier.test.ts+++ /dev/null@@ -1,66 +0,0 @@-import { expect, test } from "bun:test";-import { createMobileDraftWriteBarrier } from "./mobile-draft-write-barrier";--test("drains an active draft write before submit cleanup continues", async () => {- const events: string[] = [];- let finishWrite: (() => void) | null = null;- const barrier = createMobileDraftWriteBarrier();-- const write = barrier.enqueue(async () => {- events.push("write:start");- await new Promise<void>((resolve) => {- finishWrite = resolve;- });- events.push("write:end");- });- await Promise.resolve();-- const drained = barrier.blockAndDrain().then(() => {- events.push("drained");- });- expect(events).toEqual(["write:start"]);-- finishWrite?.();- await Promise.all([write, drained]);- expect(events).toEqual(["write:start", "write:end", "drained"]);-});--test("drops queued and future draft writes after submit begins", async () => {- const events: string[] = [];- let finishFirstWrite: (() => void) | null = null;- const barrier = createMobileDraftWriteBarrier();-- const first = barrier.enqueue(async () => {- events.push("first");- await new Promise<void>((resolve) => {- finishFirstWrite = resolve;- });- });- await Promise.resolve();- const stale = barrier.enqueue(async () => {- events.push("stale");- });- const drained = barrier.blockAndDrain();- const late = barrier.enqueue(async () => {- events.push("late");- });-- finishFirstWrite?.();- expect(await first).toBe(true);- expect(await stale).toBe(false);- await drained;- expect(await late).toBe(false);- expect(events).toEqual(["first"]);-});--test("accepts draft writes again when a submit fails", async () => {- const barrier = createMobileDraftWriteBarrier();- await barrier.blockAndDrain();- barrier.unblock();-- let writes = 0;- expect(await barrier.enqueue(async () => {- writes += 1;- })).toBe(true);- expect(writes).toBe(1);-});diff --git a/apps/mobile/src/lib/mobile-draft-write-barrier.ts b/apps/mobile/src/lib/mobile-draft-write-barrier.tsdeleted file mode 100644index afb95505..00000000--- a/apps/mobile/src/lib/mobile-draft-write-barrier.ts+++ /dev/null@@ -1,35 +0,0 @@-export type MobileDraftWriteBarrier = {- blockAndDrain: () => Promise<void>;- enqueue: (write: () => Promise<void>) => Promise<boolean>;- unblock: () => void;-};--/**- * Serializes draft writes and lets a successful submit stop late writes before- * the persisted draft is cleared. A blocked queued write resolves as `false`.- */-export const createMobileDraftWriteBarrier = (): MobileDraftWriteBarrier => {- let blocked = false;- let tail = Promise.resolve();-- return {- enqueue(write) {- const result = tail.then(async () => {- if (blocked) {- return false;- }- await write();- return true;- });- tail = result.then(() => undefined, () => undefined);- return result;- },- async blockAndDrain() {- blocked = true;- await tail;- },- unblock() {- blocked = false;- },- };-};diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsxindex 5bef37dc..e0f45675 100644--- a/apps/mobile/src/screens/WorkspaceScreen.tsx+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx@@ -123,7 +123,6 @@ import { MobileCreateChoiceModal, MobileTemplatePickerModal } from "../componentimport { resolveMobileThemeStyles, useMobileTheme } from "../lib/mobile-theme";import { useMobileUpdate } from "../lib/mobile-update";import { createMemoSeedHasContent, type MobileCreateMemoSeed } from "../lib/mobile-templates";-import { createMobileDraftWriteBarrier } from "../lib/mobile-draft-write-barrier";import { MobileMermaidDiagram, MobileMermaidProvider } from "../components/MobileMermaid";import { getMobileMarkdownFenceLanguage, trimMobileMarkdownFenceContent } from "../lib/mobile-mermaid";import {@@ -1788,7 +1787,6 @@ const CreateMemoModal = ({const contentJsonRef = useRef<TiptapDoc>(markdownToDoc(""));const contentMarkdownRef = useRef("");const draftVersionRef = useRef(0);- const draftWriteBarrier = useMemo(createMobileDraftWriteBarrier, []);const flushResolverRef = useRef<(() => void) | null>(null);const materializedMemoRef = useRef<MemoDetail | null>(null);const [notebookId, setNotebookId] = useState(fallbackNotebookId);@@ -1804,8 +1802,6 @@ const CreateMemoModal = ({const imageOperationRef = useRef(imageOperation);const sharedImagesHandledRef = useRef(false);const createPendingRef = useRef(false);- const submitStartedRef = useRef(false);- const [submitStarted, setSubmitStarted] = useState(false);const [resourceTarget, setResourceTarget] = useState<MobileResourceTarget | null>(null);const { pickUploadAsset, uploadSourcePicker } = useMobileEditorUploadAsset();const targetNotebookId = notebookId || fallbackNotebookId;@@ -1864,12 +1860,12 @@ const CreateMemoModal = ({// Component is only mounted while create is open — init once on mount.useEffect(() => {let active = true;- setDraftLoaded(false);setEditorReady(false);setTemplatePickerOpen(false);userEditedSinceOpenRef.current = false;draftVersionRef.current = 0;+ // Mount DomWebView immediately — do not wait on AsyncStorage before cold start.if (initialDraft) {const markdown = initialDraft.contentMarkdown;contentMarkdownRef.current = markdown;@@ -1892,14 +1888,14 @@ const CreateMemoModal = ({setContentMarkdown("");setNotebookId(fallbackNotebookId);setDirty(false);+ setDraftLoaded(true);void readMobileNewMemoDraft(dataScope).then((draft) => {- if (!active) {+ if (!active || !draft) {return;}// Don't clobber if the user already started typing.- if (!draft || userEditedSinceOpenRef.current) {- setDraftLoaded(true);+ if (userEditedSinceOpenRef.current) {return;}const restoredNotebookId = notebooksRef.current.some((notebook) => notebook.id === draft.notebookId)@@ -1914,11 +1910,8 @@ const CreateMemoModal = ({setContentMarkdown(markdown);setNotebookId(restoredNotebookId);setDirty(false);- setDraftLoaded(true);- }).catch(() => {- if (active) {- setDraftLoaded(true);- }+ // setContent no longer steals focus — keep the title IME if the user is already typing.+ pushBodyToEditor(doc);});return () => {active = false;@@ -1930,33 +1923,6 @@ const CreateMemoModal = ({initialDraft && "sourceUrl" in initialDraft && typeof initialDraft.sourceUrl === "string" && initialDraft.sourceUrl.length > 0);- const persistCurrentDraft = useCallback(() => {- const materializedMemo = materializedMemoRef.current;- const currentTitle = titleRef.current;- const currentContentMarkdown = contentMarkdownRef.current;- const currentNotebookId = targetNotebookIdRef.current;- const currentTagsText = tagsTextRef.current;- const updatedAt = new Date().toISOString();-- return draftWriteBarrier.enqueue(() => materializedMemo- ? writeMobileMemoDraft({- memoId: materializedMemo.id,- expectedRevision: materializedMemo.revision,- title: currentTitle,- contentMarkdown: currentContentMarkdown,- notebookId: currentNotebookId,- tagsText: currentTagsText,- updatedAt,- })- : writeMobileNewMemoDraft(dataScope, {- title: currentTitle,- contentMarkdown: currentContentMarkdown,- notebookId: currentNotebookId,- tagsText: currentTagsText,- updatedAt,- }));- }, [dataScope, draftWriteBarrier]);-const applyTemplateSeed = useCallback((seed: MobileCreateMemoSeed) => {const markdown = seed.contentMarkdown;const doc = markdownToDoc(markdown);@@ -1995,14 +1961,32 @@ const CreateMemoModal = ({}const draftVersion = draftVersionRef.current;const timeout = setTimeout(() => {- void persistCurrentDraft().then((written) => {- if (written && !submitStartedRef.current && draftVersionRef.current === draftVersion) {+ const materializedMemo = materializedMemoRef.current;+ const writeDraft = materializedMemo+ ? writeMobileMemoDraft({+ memoId: materializedMemo.id,+ expectedRevision: materializedMemo.revision,+ title,+ contentMarkdown: contentMarkdownRef.current,+ notebookId: targetNotebookId,+ tagsText,+ updatedAt: new Date().toISOString(),+ })+ : writeMobileNewMemoDraft(dataScope, {+ title,+ contentMarkdown: contentMarkdownRef.current,+ notebookId: targetNotebookId,+ tagsText,+ updatedAt: new Date().toISOString(),+ });+ void writeDraft.then(() => {+ if (draftVersionRef.current === draftVersion) {setDirty(false);}- }).catch(() => undefined);+ });}, 350);return () => clearTimeout(timeout);- }, [contentMarkdown, dirty, draftLoaded, isWebClipDraft, persistCurrentDraft, tagsText, targetNotebookId, title]);+ }, [contentMarkdown, dataScope, dirty, draftLoaded, isWebClipDraft, tagsText, targetNotebookId, title]);const createMutation = useMutation({mutationFn: async () => {@@ -2069,15 +2053,6 @@ const CreateMemoModal = ({},onSuccess: async (memo) => {const materializedMemoId = materializedMemoRef.current?.id ?? null;- // Wait for any already-running AsyncStorage write before removing the- // draft. Nothing queued after submit began is allowed to recreate it.- await draftWriteBarrier.blockAndDrain();- if (!isWebClipDraft) {- await clearMobileNewMemoDraft(dataScope);- }- if (materializedMemoId) {- await clearMobileMemoDraft(materializedMemoId);- }await Promise.all([queryClient.invalidateQueries({ queryKey: ["mobile", "notebooks"] }),queryClient.invalidateQueries({ queryKey: ["mobile", "memos"] }),@@ -2090,23 +2065,19 @@ const CreateMemoModal = ({materializedMemoRef.current = null;draftVersionRef.current += 1;setDirty(false);- void onQueued();- onCreated(memo);- },- onError: () => {- submitStartedRef.current = false;- draftWriteBarrier.unblock();- setSubmitStarted(false);- draftVersionRef.current += 1;- setDirty(true);if (!isWebClipDraft) {- void persistCurrentDraft().catch(() => undefined);+ await clearMobileNewMemoDraft(dataScope);}+ if (materializedMemoId) {+ await clearMobileMemoDraft(materializedMemoId);+ }+ void onQueued();+ onCreated(memo);},});createPendingRef.current = createMutation.isPending;- const canSubmitCreateMemo = Boolean(targetNotebookId) && !submitStarted && !createMutation.isPending && imageOperation === "idle";- const canUseTemplate = editorReady && imageOperation === "idle" && !submitStarted && !createMutation.isPending;+ const canSubmitCreateMemo = Boolean(targetNotebookId) && !createMutation.isPending && imageOperation === "idle";+ const canUseTemplate = imageOperation === "idle" && !createMutation.isPending;const materializeMemoForImage = async () => {if (materializedMemoRef.current) {@@ -2179,9 +2150,6 @@ const CreateMemoModal = ({}, [editorReady, initialSharedImages]);const markDirty = () => {- if (submitStartedRef.current) {- return;- }userEditedSinceOpenRef.current = true;draftVersionRef.current += 1;setDirty(true);@@ -2189,26 +2157,15 @@ const CreateMemoModal = ({const flushEditor = () => flushMobileEditor(editorRef, flushResolverRef);- const submitCreateMemo = async () => {- if (submitStartedRef.current || createPendingRef.current || imageOperationRef.current !== "idle") {+ const requestClose = async () => {+ if (createPendingRef.current || imageOperationRef.current !== "idle") {return;}- submitStartedRef.current = true;- setSubmitStarted(true);- const draftsDrained = draftWriteBarrier.blockAndDrain();- try {- await flushEditor();- await draftsDrained;- createMutation.mutate();- } catch {- submitStartedRef.current = false;- draftWriteBarrier.unblock();- setSubmitStarted(false);- }+ await flushEditor();+ // Match prior Android create behavior: back commits the note (even if empty draft).+ createMutation.mutate();};- const requestClose = () => submitCreateMemo();-useEffect(() => {const subscription = BackHandler.addEventListener("hardwareBackPress", () => {void requestClose();@@ -2278,17 +2235,17 @@ const CreateMemoModal = ({locale={resolvedLocale}theme={resolvedTheme}/>- ) : null, [aiPromptsJson, baseUrl, cancelSelectionAi, draftLoaded, loadEditorResource, pushBodyToEditor, requestSelectionAi, resolvedLocale, resolvedTheme, scheduleBodyKeyboard, selectResource]);+ ) : null, [aiPromptsJson, baseUrl, cancelSelectionAi, draftLoaded, loadEditorResource, requestSelectionAi, resolvedLocale, resolvedTheme, scheduleBodyKeyboard, selectResource]);return (<SafeAreaView edges={["top", "left", "right", "bottom"]} style={styles.createMemoSafeArea}><View style={styles.createMemoHeader}>- <Pressable accessibilityLabel="返回" accessibilityRole="button" disabled={submitStarted || createMutation.isPending || imageOperation !== "idle"} onPress={() => void requestClose()} style={styles.createMemoBackButton}>- <ChevronLeft color={submitStarted || createMutation.isPending || imageOperation !== "idle" ? "#cbd5e1" : "#0f172a"} size={30} />+ <Pressable accessibilityLabel="返回" accessibilityRole="button" disabled={createMutation.isPending || imageOperation !== "idle"} onPress={() => void requestClose()} style={styles.createMemoBackButton}>+ <ChevronLeft color={createMutation.isPending || imageOperation !== "idle" ? "#cbd5e1" : "#0f172a"} size={30} /></Pressable><View style={styles.createMemoHeaderActions}>- <Text style={[styles.createMemoStatus, (submitStarted || createMutation.isPending) && styles.createMemoStatusActive]}>- {imageOperation === "creating" ? "正在创建" : imageOperation === "uploading" ? "正在上传" : submitStarted || createMutation.isPending || dirty ? "保存中" : editorReady ? "已保存" : "准备中"}+ <Text style={[styles.createMemoStatus, createMutation.isPending && styles.createMemoStatusActive]}>+ {imageOperation === "creating" ? "正在创建" : imageOperation === "uploading" ? "正在上传" : createMutation.isPending || dirty ? "保存中" : editorReady ? "已保存" : "准备中"}</Text><PressableaccessibilityLabel={translate("模板")}@@ -2302,10 +2259,10 @@ const CreateMemoModal = ({<PressableaccessibilityLabel="完成新建笔记"disabled={!canSubmitCreateMemo}- onPress={() => void submitCreateMemo()}+ onPress={() => void flushEditor().then(() => createMutation.mutate())}style={[styles.createMemoDoneButton, !canSubmitCreateMemo && styles.createMemoDoneButtonDisabled]}>- {submitStarted || createMutation.isPending ? <ActivityIndicator color="#64748b" size="small" /> : <Text style={[styles.createMemoDoneText, !canSubmitCreateMemo && styles.createMemoDoneTextDisabled]}>完成</Text>}+ {createMutation.isPending ? <ActivityIndicator color="#64748b" size="small" /> : <Text style={[styles.createMemoDoneText, !canSubmitCreateMemo && styles.createMemoDoneTextDisabled]}>完成</Text>}</Pressable></View></View>