feat: add file-backed canvas notes

Magic Notes previously supported rich-text records without a paged drawing or
PDF annotation workflow. Add the integrated PeopleLib Fabric and Quill editor
with flowing text, pen/highlighter, object transforms, images, paper templates,
PDF backgrounds with native text extraction, and raster PDF export. Saves are
manual; undo/redo remains scoped to an annotation page or Quill mode.

Analyze drafts, saved canvases and canvas-source todos with page images and
text when the default model supports images, or an explicitly labelled
text-only fallback. Keep successful saves when automatic analysis fails and
prevent MCP plain-text replacement of canvas records.

Move entry bodies and binary assets into local note files with schema 38
migration and verified readback. SQLite retains metadata, indexes, revisions,
todos and comments. Backups must coordinate SQLite and the adjacent notes
directory while writes are paused or the app is closed; no one-click backup
action is included.

Show a continuous record stream with independent collapsible record index and
AI pane, real first-page thumbnails, and scroll-only record navigation. Open a
blank text/canvas composer by default and reset it after creation. Protect
unsaved drafts and establish normalized editor baselines after saving so clean
records do not prompt again when leaving.

Validation: latest recorded focused run passed 149 tests across five files;
typecheck, lint and git diff --check passed. The prior user-reported full run
passed 4,713 tests before later corrections and UI changes; it is not a full
validation of this final snapshot. Tests were not rerun for this commit, as
requested; independent systematic review follows the commit.

Release note: Create paged notes with handwriting, flowing text and PDF
annotations, browse records through thumbnails, and request AI comments with
an explicit text-only fallback. Existing notes migrate to local file storage;
backups now need both the database and notes directory.

src/main/assistant/assistant-database.test.ts

@@ -21,6 +21,47 @@ import type { ImageOperation } from '../../shared/image-generation-contracts'
 
 const temporaryDirectories: string[] = []
 
+it('roundtrips canvas assets and keeps todos stable across geometry edits and completion', async () => {
+  const database = await createDatabase()
+  try {
+    const content = {
+      version: 2 as const, kind: 'paged-canvas' as const,
+      pages: [{ id: 'page', width: 794, height: 1123,
+        background: { type: 'template' as const, template: 'grid' as const },
+        objects: [{ type: 'IText', text: 'Canvas annotation', left: 1 }] }],
+      flow: { version: 1 as const, ops: [{ insert: 'Canvas task' }, { insert: '\n', attributes: { list: 'unchecked' } }] },
+      assets: [{ id: 'file', name: 'file.txt', mimeType: 'text/plain', dataUrl: 'data:text/plain;base64,aGVsbG8=' }]
+    }
+    const note = database.createMagicNote({ title: 'Canvas', content })
+    const entry = note.entries[0]!
+    const todo = database.listMagicTodos()[0]!
+    database.saveMagicNoteAnalysis({ entryId: entry.id, expectedRevision: entry.revision, comments: [{ id: randomUUID(), kind: 'summary', content: 'Old analysis', inputMode: 'canvas-images' }] })
+    const analyzed = database.getMagicNoteEntry(entry.id)
+    const moved = { ...content, pages: [{ ...content.pages[0]!, objects: [{ type: 'IText', text: 'Canvas annotation', left: 500 }] }] }
+    database.updateMagicNoteEntry({ entryId: entry.id, content: moved, plainText: 'stale text', expectedRevision: analyzed.revision })
+    expect(database.getMagicNoteEntry(entry.id)).toMatchObject({ content: moved, plainText: 'Canvas task\nCanvas annotation', comments: [] })
+    expect(database.listMagicTodos()[0]).toMatchObject({ id: todo.id, sourceIndex: 0, revision: todo.revision })
+    database.updateMagicTodo({ todoId: todo.id, completed: true, expectedRevision: todo.revision })
+    const saved = database.getMagicNoteEntry(entry.id)
+    expect(saved.content).toMatchObject({ pages: moved.pages, assets: content.assets, flow: { ops: [{ insert: 'Canvas task' }, { insert: '\n', attributes: { list: 'checked' } }] } })
+    expect(() => database.updateMagicNoteEntry({ entryId: entry.id, content, plainText: '', expectedRevision: entry.revision })).toThrow('已被更新')
+    database.close()
+    database.initialize('C:\\Workspace')
+    expect(database.getMagicNoteEntry(entry.id)).toEqual(saved)
+    expect(database.searchMagicNotes('Canvas annotation', 10)).toHaveLength(1)
+    database.saveMagicNoteAnalysis({ entryId: entry.id, expectedRevision: saved.revision, comments: [{ id: randomUUID(), kind: 'summary', content: 'Text analysis', inputMode: 'text-fallback' }] })
+    const textAnalyzed = database.getMagicNoteEntry(entry.id)
+    const repositioned = { ...moved, pages: [{ ...moved.pages[0]!, objects: [{ type: 'IText', text: 'Canvas annotation', left: 200 }] }] }
+    database.updateMagicNoteEntry({ entryId: entry.id, content: repositioned, plainText: '', expectedRevision: textAnalyzed.revision })
+    const textPreserved = database.getMagicNoteEntry(entry.id)
+    expect(textPreserved.comments).toEqual(textAnalyzed.comments)
+    expect(textPreserved.analyzedAt).toEqual(textAnalyzed.analyzedAt)
+    const revised = { ...repositioned, pages: [{ ...repositioned.pages[0]!, objects: [{ type: 'IText', text: 'Changed annotation', left: 200 }] }] }
+    database.updateMagicNoteEntry({ entryId: entry.id, content: revised, plainText: '', expectedRevision: textPreserved.revision })
+    expect(database.getMagicNoteEntry(entry.id).comments).toEqual([])
+  } finally { database.close() }
+})
+
 it('persists conversation pins without changing timestamps or allowing autosaves to overwrite them', async () => {
   const database = await createDatabase()
   const header = { id: randomUUID(), title: 'Pinned conversation', updatedAt: 1000 }
@@ -100,7 +141,7 @@ it('migrates schema 35 conversations to unpinned while retaining existing data a
   }
   const inspected = new DatabaseSync(path)
   try {
-    expect(inspected.prepare('PRAGMA user_version').get()).toEqual({ user_version: 36 })
+    expect(inspected.prepare('PRAGMA user_version').get()).toEqual({ user_version: ASSISTANT_DATABASE_SCHEMA_VERSION })
     expect(inspected.prepare('PRAGMA integrity_check').get()).toEqual({ integrity_check: 'ok' })
     expect(inspected.prepare('SELECT created_at, updated_at FROM conversations WHERE id = ?').get(header.id)).toEqual({
       created_at: new Date(1000).toISOString(), updated_at: new Date(1000).toISOString()
@@ -1648,9 +1689,11 @@ describe('AssistantDatabase', () => {
       },
       plainText: '迁移待办'
     })
+    const legacyContent = initial.getMagicNote(note.id).entries[0]!.content
     initial.close()
 
     const legacy = new DatabaseSync(databasePath)
+    legacy.prepare('UPDATE magic_note_entries SET content_json = ? WHERE note_id = ?').run(JSON.stringify(legacyContent), note.id)
     legacy.exec(`
       DELETE FROM magic_todos;
       ALTER TABLE conversations DROP COLUMN pinned;
@@ -6773,9 +6816,8 @@ describe('AssistantDatabase', () => {
       completed: true,
       revision: todo.revision + 1
     })
-    expect(
-      database.getMagicNote(note.id).entries[0]!.content.ops
-    ).toEqual([
+    const updatedContent = database.getMagicNote(note.id).entries[0]!.content
+    expect(updatedContent.version === 1 && updatedContent.ops).toEqual([
       { insert: '核对发布材料' },
       { insert: '\n', attributes: { list: 'checked' } }
     ])

src/main/assistant/assistant-database.ts

@@ -1,6 +1,9 @@
 import { randomUUID } from 'node:crypto'
 import { knowledgeReferenceKey } from '../../shared/knowledge-reference'
 import { DatabaseSync } from 'node:sqlite'
+import { statSync } from 'node:fs'
+import { MagicNoteStorage } from '../magic-notes/magic-note-storage'
+import type { AssistantStorageProgress } from '../../shared/assistant-storage-contracts'
 import {
   builtInDefaultProjectSeedDescription,
   builtInDefaultProjectSeedName,
@@ -79,8 +82,10 @@ import {
   MAGIC_NOTE_MAX_NOTE_EMBED_BYTES,
   type MagicNoteComment,
   type MagicNoteDetail,
+  type MagicNoteEntryCreateResult,
   type MagicNoteEntry,
   type MagicNoteRichContent,
+  type MagicNoteContent,
   type MagicNoteSearchResult,
   type MagicNoteSummary,
   type MagicTodoItem,
@@ -99,7 +104,8 @@ import {
   magicNoteImageBytes,
   magicNotePlainText,
   magicNotePreview,
-  setMagicNoteChecklistCompletion
+  setMagicNoteChecklistCompletion,
+  validateMagicNoteContent
 } from '../magic-notes/rich-content'
 import { computeNextHeartbeatRun } from './heartbeat-recurrence'
 import {
@@ -107,7 +113,7 @@ import {
   SUBAGENT_PROGRESS_STORAGE_SCHEMA_VERSION
 } from './subagent-progress-storage'
 
-export const ASSISTANT_DATABASE_SCHEMA_VERSION = 36
+export const ASSISTANT_DATABASE_SCHEMA_VERSION = 38
 
 export type RemoteTaskEventInput = {
   taskId: string
@@ -643,11 +649,11 @@ function toTask(row: TaskRow): AssistantTask {
   }
 }
 
-function toMagicNoteEntry(row: MagicNoteEntryRow): MagicNoteEntry {
+function toMagicNoteEntry(row: MagicNoteEntryRow, content: MagicNoteContent): MagicNoteEntry {
   return {
     id: row.id,
     noteId: row.note_id,
-    content: JSON.parse(row.content_json) as MagicNoteRichContent,
+    content,
     plainText: row.plain_text,
     comments: JSON.parse(row.comments_json) as MagicNoteComment[],
     analyzedAt: row.analyzed_at ?? undefined,
@@ -1774,6 +1780,9 @@ function deleteProjectRecords(
 
 export class AssistantDatabase {
   private database?: DatabaseSync
+  private readonly noteStorage: MagicNoteStorage
+  private readonly dirtyMagicNotes = new Set<string>()
+  private readonly pendingMagicNoteCleanup = new Set<string | undefined>()
   private subagentProgress?: SubagentProgressStorage
   private channelEventWrites = 0
   private channelOutboxWrites = 0
@@ -1784,12 +1793,132 @@ export class AssistantDatabase {
       onMagicNotesChanged?: () => void
       onMagicTodosChanged?: () => void
     } = {}
-  ) {}
+  ) {
+    this.noteStorage = new MagicNoteStorage(databasePath)
+  }
 
   private notifyMagicTodosChanged(): void {
     this.options.onMagicTodosChanged?.()
   }
 
+  // Called by the existing startup worker before the business connection opens.
+  upgradeMagicNoteStorage(
+    onProgress: (progress: AssistantStorageProgress) => void,
+    isCancelled: () => boolean
+  ): void {
+    const database = new DatabaseSync(this.databasePath, { timeout: 5_000 })
+    try {
+      database.exec('PRAGMA journal_mode = WAL; PRAGMA foreign_keys = ON;')
+      this.migrate(database)
+      this.database = database
+      this.repairMagicNoteStorage(onProgress, isCancelled)
+      if (isCancelled()) throw new DOMException('Upgrade cancelled', 'AbortError')
+      const free = database.prepare('PRAGMA freelist_count').get() as { freelist_count: number }
+      if (free.freelist_count > 0) {
+        onProgress({ stage: 'compacting', processed: 0, total: 0, bytesBefore: statSync(this.databasePath).size })
+        database.exec('PRAGMA wal_checkpoint(TRUNCATE); VACUUM;')
+      }
+      database.exec('PRAGMA wal_checkpoint(TRUNCATE)')
+    } finally {
+      this.database = undefined
+      database.close()
+    }
+  }
+
+  private hydrateMagicNoteEntry(row: MagicNoteEntryRow): MagicNoteEntry {
+    return toMagicNoteEntry(row, this.noteStorage.read(row.note_id, row.id).content)
+  }
+
+  private writeMagicNoteBody(noteId: string, id: string, content: MagicNoteContent, revision: number, updatedAt: string): string {
+    this.dirtyMagicNotes.add(noteId)
+    this.noteStorage.write({ noteId, id, content, revision, updatedAt })
+    return JSON.stringify({ storage: 'file', version: content.version, revision })
+  }
+
+  private reconcileMagicNoteFiles(noteId?: string): void {
+    const database = this.database!
+    // SQL and authoritative bodies are already committed. Cleanup must never
+    // turn an accepted save/delete/reset into a retryable UI write failure.
+    if (noteId) this.dirtyMagicNotes.delete(noteId)
+    this.pendingMagicNoteCleanup.add(noteId)
+    try {
+      if (noteId === undefined) {
+        const notes = database.prepare('SELECT id FROM magic_notes').all() as Array<{ id: string }>
+        if (notes.length) this.noteStorage.reconcileNotes(new Set(notes.map((note) => note.id)))
+        else this.noteStorage.clear()
+      } else if (database.prepare('SELECT id FROM magic_notes WHERE id = ?').get(noteId)) {
+        const entries = database.prepare('SELECT id FROM magic_note_entries WHERE note_id = ? ORDER BY created_at, rowid').all(noteId) as Array<{ id: string }>
+        this.noteStorage.reconcile(noteId, entries.map((entry) => entry.id))
+      } else {
+        this.noteStorage.deleteNote(noteId)
+      }
+      this.pendingMagicNoteCleanup.delete(noteId)
+    } catch (error) {
+      console.warn('Magic note file cleanup deferred', { noteId, error })
+    }
+  }
+
+  private repairMagicNoteStorage(
+    onProgress?: (progress: AssistantStorageProgress) => void,
+    isCancelled: () => boolean = () => false,
+    noteIds?: ReadonlySet<string>
+  ): void {
+    const database = this.database!
+    const notes = noteIds
+      ? [...noteIds].flatMap((id) => {
+        const row = database.prepare('SELECT id FROM magic_notes WHERE id = ?').get(id) as { id: string } | undefined
+        if (!row) this.reconcileMagicNoteFiles(id)
+        return row ? [row] : []
+      })
+      : database.prepare('SELECT id FROM magic_notes').all() as Array<{ id: string }>
+    const total = (database.prepare('SELECT COUNT(*) AS count FROM magic_note_entries').get() as { count: number }).count
+    const bytesBefore = this.databasePath === ':memory:' ? 0 : statSync(this.databasePath).size
+    let processed = 0
+    let migrated = false
+    for (const note of notes) {
+      const entries = database.prepare('SELECT id FROM magic_note_entries WHERE note_id = ? ORDER BY created_at, rowid').all(note.id) as Array<{ id: string }>
+      for (const { id } of entries) {
+        if (isCancelled()) throw new DOMException('Upgrade cancelled', 'AbortError')
+        database.exec('BEGIN IMMEDIATE')
+        try {
+          // One payload at a time: a canvas may contain a large PDF.
+          const row = database.prepare('SELECT * FROM magic_note_entries WHERE id = ?').get(id) as MagicNoteEntryRow
+          const pointer = JSON.parse(row.content_json) as { storage?: string; revision?: number }
+          if (pointer.storage !== 'file') {
+            const content = JSON.parse(row.content_json) as MagicNoteContent
+            this.noteStorage.write({ noteId: note.id, id, content, revision: row.revision, updatedAt: row.updated_at })
+            if (JSON.stringify(this.noteStorage.read(note.id, id).content) !== JSON.stringify(content)) {
+              throw new Error(`Note migration verification failed: ${id}`)
+            }
+            database.prepare('UPDATE magic_note_entries SET content_json = ?, plain_text = ?, image_bytes = ? WHERE id = ?').run(
+              JSON.stringify({ storage: 'file', version: content.version, revision: row.revision }),
+              magicNotePlainText(content), magicNoteEmbeddedBytes(content), id
+            )
+            migrated = true
+          } else if (this.noteStorage.revision(note.id, id) !== pointer.revision) {
+            const saved = this.noteStorage.read(note.id, id)
+            database.prepare(`UPDATE magic_note_entries SET content_json = ?, plain_text = ?, image_bytes = ?,
+              revision = MAX(revision, ?), updated_at = ?, comments_json = '[]', analyzed_at = NULL WHERE id = ?`).run(
+              JSON.stringify({ storage: 'file', version: saved.content.version, revision: saved.revision }),
+              magicNotePlainText(saved.content), magicNoteEmbeddedBytes(saved.content), saved.revision, saved.updatedAt, id
+            )
+            database.prepare('UPDATE magic_notes SET revision = revision + 1, updated_at = ? WHERE id = ?').run(saved.updatedAt, note.id)
+            this.syncMagicNoteTodos(database, note.id, id, saved.content, saved.updatedAt)
+          }
+          database.exec('COMMIT')
+        } catch (error) {
+          database.exec('ROLLBACK')
+          throw error
+        }
+        processed++
+        if (migrated) onProgress?.({ stage: 'converting', processed, total, bytesBefore })
+      }
+      this.reconcileMagicNoteFiles(note.id)
+    }
+    if (!noteIds) this.reconcileMagicNoteFiles()
+    this.dirtyMagicNotes.clear()
+  }
+
   initialize(defaultRootPath: string): void {
     if (this.database) {
       return
@@ -1806,6 +1935,7 @@ export class AssistantDatabase {
       `)
       this.migrate(database)
       this.database = database
+      this.repairMagicNoteStorage()
       this.subagentProgress = new SubagentProgressStorage(database)
       this.channelEventWrites = (
         database
@@ -2035,6 +2165,7 @@ export class AssistantDatabase {
       }
     } catch (error) {
       database.close()
+      this.database = undefined
       throw error
     }
   }
@@ -2043,6 +2174,7 @@ export class AssistantDatabase {
     this.database?.close()
     this.database = undefined
     this.subagentProgress = undefined
+    if (this.databasePath === ':memory:') this.noteStorage.clear()
   }
 
   clearAssistantData(): void {
@@ -2084,6 +2216,9 @@ export class AssistantDatabase {
       database.exec('ROLLBACK')
       throw error
     }
+    this.dirtyMagicNotes.clear()
+    this.pendingMagicNoteCleanup.clear()
+    this.reconcileMagicNoteFiles()
     this.options.onMagicNotesChanged?.()
   }
 
@@ -3687,7 +3822,7 @@ export class AssistantDatabase {
       .all(noteId) as MagicNoteEntryRow[]
     return {
       ...toMagicNoteSummary(row),
-      entries: entryRows.map(toMagicNoteEntry)
+      entries: entryRows.map((entry) => this.hydrateMagicNoteEntry(entry))
     }
   }
 
@@ -3715,15 +3850,21 @@ export class AssistantDatabase {
 
   createMagicNote(input: {
     title: string
-    content?: MagicNoteRichContent
+    content?: MagicNoteContent
   }): MagicNoteDetail {
     const id = randomUUID()
     const now = new Date().toISOString()
     const database = this.requireDatabase()
+    if (input.content) {
+      input = { ...input, content: validateMagicNoteContent(input.content) }
+    }
     const embeddedBytes = input.content
       ? magicNoteEmbeddedBytes(input.content)
       : 0
-    if (embeddedBytes > MAGIC_NOTE_MAX_NOTE_EMBED_BYTES) {
+    if (
+      input.content?.version !== 2 &&
+      embeddedBytes > MAGIC_NOTE_MAX_NOTE_EMBED_BYTES
+    ) {
       throw new Error('一篇笔记中的图片、视频和附件总大小不能超过 64 MB')
     }
     database.exec('BEGIN IMMEDIATE')
@@ -3737,6 +3878,7 @@ export class AssistantDatabase {
         .run(id, null, input.title, input.content ? 1 : 0, now, now)
       if (input.content) {
         const entryId = randomUUID()
+        const pointer = this.writeMagicNoteBody(id, entryId, input.content, 0, now)
         database
           .prepare(
             `INSERT INTO magic_note_entries
@@ -3748,7 +3890,7 @@ export class AssistantDatabase {
           .run(
             entryId,
             id,
-            JSON.stringify(input.content),
+            pointer,
             magicNotePlainText(input.content),
             now,
             now,
@@ -3767,6 +3909,7 @@ export class AssistantDatabase {
       database.exec('ROLLBACK')
       throw error
     }
+    this.reconcileMagicNoteFiles(id)
     const detail = this.getMagicNote(id)
     this.options.onMagicNotesChanged?.()
     if (input.content) {
@@ -3813,17 +3956,20 @@ export class AssistantDatabase {
     if (result.changes !== 1) {
       throw new Error('笔记不存在')
     }
+    this.reconcileMagicNoteFiles(noteId)
     this.options.onMagicNotesChanged?.()
     this.notifyMagicTodosChanged()
   }
 
   createMagicNoteEntry(input: {
     noteId: string
-    content: MagicNoteRichContent
+    content: MagicNoteContent
     plainText: string
-  }): MagicNoteDetail {
+  }): MagicNoteEntryCreateResult {
     const database = this.requireDatabase()
     const entryId = randomUUID()
+    const content = validateMagicNoteContent(input.content)
+    input = { ...input, content, plainText: magicNotePlainText(content) }
     const now = new Date().toISOString()
     database.exec('BEGIN IMMEDIATE')
     try {
@@ -3838,6 +3984,7 @@ export class AssistantDatabase {
       if (noteResult.changes !== 1) {
         throw new Error('笔记不存在')
       }
+      const pointer = this.writeMagicNoteBody(input.noteId, entryId, input.content, 0, now)
       database
         .prepare(
           `INSERT INTO magic_note_entries
@@ -3849,7 +3996,7 @@ export class AssistantDatabase {
         .run(
           entryId,
           input.noteId,
-          JSON.stringify(input.content),
+          pointer,
           input.plainText,
           now,
           now,
@@ -3867,44 +4014,58 @@ export class AssistantDatabase {
       database.exec('ROLLBACK')
       throw error
     }
+    this.reconcileMagicNoteFiles(input.noteId)
     const detail = this.getMagicNote(input.noteId)
     this.options.onMagicNotesChanged?.()
     this.notifyMagicTodosChanged()
-    return detail
+    return { ...detail, createdEntryId: entryId }
   }
 
   updateMagicNoteEntry(input: {
     entryId: string
-    content: MagicNoteRichContent
+    content: MagicNoteContent
     plainText: string
     expectedRevision: number
   }): MagicNoteDetail {
     const database = this.requireDatabase()
     const existing = database
-      .prepare('SELECT note_id FROM magic_note_entries WHERE id = ?')
-      .get(input.entryId) as { note_id: string } | undefined
+      .prepare('SELECT * FROM magic_note_entries WHERE id = ?')
+      .get(input.entryId) as MagicNoteEntryRow | undefined
     if (!existing) {
       throw new Error('记录不存在')
     }
+    const content = validateMagicNoteContent(input.content)
+    input = { ...input, content, plainText: magicNotePlainText(content) }
+    const previous = this.hydrateMagicNoteEntry(existing)
+    const preserveComments = content.version === 2 && previous.content.version === 2 && (
+      JSON.stringify(content) === JSON.stringify(previous.content) ||
+      (input.plainText === previous.plainText &&
+        previous.comments.every((comment) => comment.inputMode === 'text-fallback' || comment.inputMode === 'text'))
+    )
     const now = new Date().toISOString()
     database.exec('BEGIN IMMEDIATE')
     try {
+      const current = database.prepare('SELECT revision FROM magic_note_entries WHERE id = ?').get(input.entryId) as { revision: number } | undefined
+      if (current?.revision !== input.expectedRevision) throw new Error('记录已被更新，请刷新后重试')
       this.assertMagicNoteEmbedBudget(
         existing.note_id,
         input.content,
         input.entryId
       )
+      const pointer = this.writeMagicNoteBody(existing.note_id, input.entryId, input.content, input.expectedRevision + 1, now)
       const result = database
         .prepare(
           `UPDATE magic_note_entries
-           SET content_json = ?, plain_text = ?, comments_json = '[]',
-               analyzed_at = NULL, revision = revision + 1, updated_at = ?,
+           SET content_json = ?, plain_text = ?, comments_json = ?,
+                analyzed_at = ?, revision = revision + 1, updated_at = ?,
                image_bytes = ?
            WHERE id = ? AND revision = ?`
         )
         .run(
-          JSON.stringify(input.content),
+          pointer,
           input.plainText,
+          preserveComments ? existing.comments_json : '[]',
+          preserveComments ? existing.analyzed_at : null,
           now,
           magicNoteEmbeddedBytes(input.content),
           input.entryId,
@@ -3932,6 +4093,7 @@ export class AssistantDatabase {
       database.exec('ROLLBACK')
       throw error
     }
+    this.reconcileMagicNoteFiles(existing.note_id)
     const detail = this.getMagicNote(existing.note_id)
     this.options.onMagicNotesChanged?.()
     this.notifyMagicTodosChanged()
@@ -3964,6 +4126,7 @@ export class AssistantDatabase {
       database.exec('ROLLBACK')
       throw error
     }
+    this.reconcileMagicNoteFiles(existing.note_id)
     const detail = this.getMagicNote(existing.note_id)
     this.options.onMagicNotesChanged?.()
     this.notifyMagicTodosChanged()
@@ -3977,7 +4140,7 @@ export class AssistantDatabase {
     if (!row) {
       throw new Error('记录不存在')
     }
-    return toMagicNoteEntry(row)
+    return this.hydrateMagicNoteEntry(row)
   }
 
   saveMagicNoteAnalysis(input: {
@@ -4138,10 +4301,11 @@ export class AssistantDatabase {
       }
 
       const content = setMagicNoteChecklistCompletion(
-        JSON.parse(existing.content_json) as MagicNoteRichContent,
+        this.noteStorage.read(existing.note_id, existing.entry_id).content,
         existing.source_index,
         input.completed
       )
+      const pointer = this.writeMagicNoteBody(existing.note_id, existing.entry_id, content, existing.entry_revision + 1, now)
       const result = database
         .prepare(
           `UPDATE magic_note_entries
@@ -4150,7 +4314,7 @@ export class AssistantDatabase {
            WHERE id = ? AND revision = ?`
         )
         .run(
-          JSON.stringify(content),
+          pointer,
           magicNotePlainText(content),
           now,
           existing.entry_id,
@@ -8343,7 +8507,7 @@ export class AssistantDatabase {
     database: DatabaseSync,
     noteId: string,
     entryId: string,
-    content: MagicNoteRichContent,
+    content: MagicNoteContent,
     now: string
   ): void {
     const note = database
@@ -8505,14 +8669,15 @@ export class AssistantDatabase {
 
   private assertMagicNoteEmbedBudget(
     noteId: string,
-    content: MagicNoteRichContent,
+    content: MagicNoteContent,
     excludedEntryId?: string
   ): void {
+    if (content.version === 2) return
     const existing = this.requireDatabase()
       .prepare(
         `SELECT COALESCE(SUM(image_bytes), 0) AS image_bytes
          FROM magic_note_entries
-         WHERE note_id = ? AND id <> ?`
+         WHERE note_id = ? AND id <> ? AND json_extract(content_json, '$.version') = 1`
       )
       .get(noteId, excludedEntryId ?? '') as { image_bytes: number }
     if (
@@ -9045,7 +9210,7 @@ export class AssistantDatabase {
             database,
             entry.note_id,
             entry.id,
-            JSON.parse(entry.content_json) as MagicNoteRichContent,
+            JSON.parse(entry.content_json) as MagicNoteContent,
             entry.updated_at
           )
         }
@@ -9107,7 +9272,7 @@ export class AssistantDatabase {
         for (const entry of entries) {
           updateImageBytes.run(
             magicNoteImageBytes(
-              JSON.parse(entry.content_json) as MagicNoteRichContent
+              JSON.parse(entry.content_json) as MagicNoteContent
             ),
             entry.id
           )
@@ -10265,12 +10430,25 @@ export class AssistantDatabase {
         throw error
       }
     }
+    if (version.user_version < 37) {
+      // v2 canvas JSON must not be opened by clients that assume Quill v1.
+      database.exec('BEGIN IMMEDIATE; PRAGMA user_version = 37; COMMIT;')
+    }
+    if (version.user_version < 38) {
+      database.exec('BEGIN IMMEDIATE; PRAGMA user_version = 38; COMMIT;')
+    }
   }
 
   private requireDatabase(): DatabaseSync {
     if (!this.database) {
       throw new Error('助手数据库尚未初始化')
     }
+    if (this.dirtyMagicNotes.size && !this.database.isTransaction) {
+      this.repairMagicNoteStorage(undefined, undefined, this.dirtyMagicNotes)
+    }
+    if (!this.database.isTransaction) {
+      for (const noteId of [...this.pendingMagicNoteCleanup]) this.reconcileMagicNoteFiles(noteId)
+    }
     return this.database
   }
 }

src/main/assistant/assistant-storage-upgrade.ts

@@ -2,6 +2,7 @@ import { statSync } from 'node:fs'
 import { DatabaseSync } from 'node:sqlite'
 import type { ConversationMessageBlock } from '../../shared/assistant-contracts'
 import type { AssistantStorageProgress } from '../../shared/assistant-storage-contracts'
+import { AssistantDatabase } from './assistant-database'
 import {
   compactSubagentPayload,
   restoreSubagentPayload,
@@ -12,6 +13,15 @@ export function upgradeAssistantStorage(
   databasePath: string,
   onProgress: (progress: AssistantStorageProgress) => void,
   isCancelled: () => boolean = () => false
+): void {
+  upgradeSubagentStorage(databasePath, onProgress, isCancelled)
+  new AssistantDatabase(databasePath).upgradeMagicNoteStorage(onProgress, isCancelled)
+}
+
+function upgradeSubagentStorage(
+  databasePath: string,
+  onProgress: (progress: AssistantStorageProgress) => void,
+  isCancelled: () => boolean = () => false
 ): void {
   const database = new DatabaseSync(databasePath, { timeout: 5_000 })
   const checkCancelled = (): void => {