feat: add persistent document handling and protect note drafts
Add HTTP PaddleOCR-VL settings and shared document previews for chat and knowledge imports. Preserve attachment originals and parsed assets across drafts, messages and queues; support explicit image OCR, selecting document images into a conversation draft, and restoring queued input for editing. Protect unsaved note bodies and titles during navigation and asynchronous updates. Match canvas analysis to source revisions, invalidate affected comments, preserve annotations during pagination, and provide a resizable record index with saved width preferences. Existing OCR settings retain local behavior. Historical attachments without saved originals are not reconstructed. Advanced OCR options depend on the configured service; image sending depends on the effective model and Runtime. Validation: full typecheck and lint passed; 477 focused tests passed across 12 files; staged whitespace checks passed. The full repository suite was not rerun for this commit. Release note: Keep note drafts safe while switching workspaces, resize the record index, and revisit saved document attachments with OCR previews and selected images in chat.
This commit is contained in:
mesalogo
@@ -0,0 +1,24 @@
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { ChatMessageRow } from '../../src/renderer/src/ChatTimeline'
|
||||
import '../../src/renderer/src/i18n'
|
||||
import '../../src/renderer/src/styles.css'
|
||||
|
||||
const noop = (): void => undefined
|
||||
const done = async (): Promise<void> => undefined
|
||||
const name = 'b4307bf0-b49d-4242-a8ec-cb64d487-long-original-filename.pdf'
|
||||
|
||||
Object.defineProperty(window, 'goodbuddy', { value: {
|
||||
documentParsing: { getSnapshot: async () => ({ settings: { ocrProvider: 'paddleocr-vl' } }) }
|
||||
} })
|
||||
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
<div style={{ width: '100%', maxWidth: 820, padding: 16, margin: 'auto' }}>
|
||||
<ChatMessageRow artifactById={new Map()} canRetry={false} conversationId="conversation"
|
||||
greeting={false} locale="zh-CN" onArticleRef={noop} onCopyMessage={async () => true}
|
||||
onDownloadImage={noop} onOpenCitationContext={done} onOpenCitationSource={done}
|
||||
onOpenImage={noop} onRespondApproval={done} onRespondQuestion={done} onRetry={noop}
|
||||
message={{ id: 'message', role: 'user', content: '', state: 'complete', createdAt: 0,
|
||||
attachments: [{ id: 'asset', resourceId: 'asset', resultId: 'result', name,
|
||||
kind: 'text', size: 1024, preview: 'Saved document', completeness: 'complete' }] }} />
|
||||
</div>
|
||||
)
|
||||
@@ -0,0 +1,75 @@
|
||||
import Quill from 'quill'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { mountCanvasNote } from '../../src/renderer/src/magic-canvas/canvas-note.mjs'
|
||||
import { MagicCanvasThumbnail } from '../../src/renderer/src/MagicCanvasThumbnail'
|
||||
import { fromCoreContent } from '../../src/renderer/src/magic-canvas/model'
|
||||
import '../../src/renderer/src/i18n'
|
||||
import 'quill/dist/quill.snow.css'
|
||||
import '../../src/renderer/src/styles.css'
|
||||
import '../../src/renderer/src/magic-canvas.css'
|
||||
|
||||
async function canvasRegression() {
|
||||
const errors: string[] = []
|
||||
const host = document.createElement('div')
|
||||
host.className = 'magic-canvas-editor'
|
||||
document.body.append(host)
|
||||
let editor = mountCanvasNote(host, { version: 2, pages: [{
|
||||
id: 'first', width: 794, height: 1123,
|
||||
background: { type: 'template', template: 'blank' },
|
||||
objects: [{ type: 'Path', canvasKind: 'pen', path: [['M', 20, 20], ['L', 150, 80]],
|
||||
stroke: '#ff0000', strokeWidth: 4, fill: null }]
|
||||
}], flow: { version: 1, ops: [{ insert: 'Flow line\n'.repeat(50) }] } }, { onError: (error) => errors.push(error) })
|
||||
const initial = await editor.flush()
|
||||
const ink = async () => {
|
||||
await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))
|
||||
const canvas = host.querySelector<HTMLCanvasElement>('.lower-canvas')!
|
||||
const pixels = canvas.getContext('2d')!.getImageData(0, 0, canvas.width, canvas.height).data
|
||||
let count = 0
|
||||
for (let i = 3; i < pixels.length; i += 4) if (pixels[i]) count++
|
||||
return count
|
||||
}
|
||||
const visibleInkBefore = await ink()
|
||||
host.querySelector<HTMLButtonElement>('[data-tool="flow-text"]')!.click()
|
||||
host.querySelector<HTMLButtonElement>('.canvas-note-next-page')!.click()
|
||||
await editor.flush()
|
||||
const beforeShrink = host.querySelector('.canvas-note-page-counter')!.textContent
|
||||
const quill = Quill.find(host.querySelector('.canvas-flow-quill')!) as Quill
|
||||
quill.setText('Short flow\n', 'user')
|
||||
const saved = JSON.parse(JSON.stringify(await editor.flush()))
|
||||
const afterShrink = host.querySelector('.canvas-note-page-counter')!.textContent
|
||||
const visibleInkAfter = await ink()
|
||||
const flowTransform = host.querySelector<HTMLElement>('.canvas-flow-surface')!.style.transform
|
||||
await editor.destroy()
|
||||
editor = mountCanvasNote(host, saved, { onError: (error) => errors.push(error) })
|
||||
const reopened = await editor.flush()
|
||||
const reopenedInk = await ink()
|
||||
const styles = (surface: Element) => {
|
||||
const style = getComputedStyle(surface)
|
||||
return { fontSize: style.fontSize, lineHeight: style.lineHeight, columnFill: style.columnFill, padding: style.padding }
|
||||
}
|
||||
const editorStyles = styles(host.querySelector('.canvas-flow-surface')!)
|
||||
const [expectedThumbnail] = await editor.capturePages({ firstPageOnly: true, thumbnailWidth: 240 })
|
||||
await editor.destroy()
|
||||
const thumbnailHost = document.createElement('div')
|
||||
document.body.append(thumbnailHost)
|
||||
let thumbnailStyles: ReturnType<typeof styles> | undefined
|
||||
const observer = new MutationObserver(() => {
|
||||
const surface = document.querySelector('.magic-note-thumbnail-renderer .canvas-flow-surface')
|
||||
if (surface) thumbnailStyles = styles(surface)
|
||||
})
|
||||
observer.observe(document.body, { childList: true, subtree: true })
|
||||
const root = createRoot(thumbnailHost)
|
||||
root.render(<MagicCanvasThumbnail content={fromCoreContent(saved, [])} />)
|
||||
for (let i = 0; i < 400 && !thumbnailHost.querySelector('img'); i++) await new Promise(resolve => setTimeout(resolve, 25))
|
||||
const thumbnailMatchesEditor = thumbnailHost.querySelector('img')?.src === expectedThumbnail.dataUrl
|
||||
root.unmount()
|
||||
observer.disconnect()
|
||||
thumbnailHost.remove()
|
||||
host.remove()
|
||||
return { errors, initialPages: initial.pages.length, initialObjects: initial.pages[0].objects,
|
||||
beforeShrink, afterShrink, savedPages: saved.pages.length, savedObjects: saved.pages[0].objects,
|
||||
reopenedObjects: reopened.pages[0].objects, visibleInkBefore, visibleInkAfter, reopenedInk, flowTransform,
|
||||
editorStyles, thumbnailStyles, thumbnailMatchesEditor }
|
||||
}
|
||||
|
||||
Object.assign(window, { canvasRegression })
|
||||
@@ -0,0 +1,39 @@
|
||||
import { app, BrowserWindow } from 'electron'
|
||||
import { writeFileSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { registerIpcHandlers } from '../../src/main/ipc'
|
||||
import { AssistantDatabase } from '../../src/main/assistant/assistant-database'
|
||||
|
||||
const directory = process.env.GB_NOTES_PROBE_DIRECTORY!
|
||||
const url = process.env.GB_NOTES_PROBE_URL!
|
||||
const preload = join(directory, 'preload.cjs')
|
||||
app.setPath('userData', join(directory, 'profile'))
|
||||
app.whenReady().then(async () => {
|
||||
const win = new BrowserWindow({ show: false, width: 1400, height: 1000, webPreferences: {
|
||||
sandbox: true, contextIsolation: true, nodeIntegration: false, backgroundThrottling: false, preload
|
||||
} })
|
||||
const database = new AssistantDatabase(join(directory, 'assistant.sqlite'))
|
||||
database.initialize(directory)
|
||||
const runtimeSettings = { workspacePath: directory, supportsImageInput: true,
|
||||
defaultModelProfileId: 'vision', modelProfiles: [{ id: 'vision', supportsImageInput: true }] }
|
||||
const dispose = registerIpcHandlers(win, { capability: 'text' } as never, 'CommandOrControl+Shift+Space',
|
||||
{ getResolvedSettings: async () => runtimeSettings, getPublicSettings: async () => runtimeSettings } as never,
|
||||
{} as never, { clear() {}, cancelImport() {} } as never, {} as never, database,
|
||||
{ clear() {} } as never, {} as never, async () => {}, undefined, undefined, undefined, undefined,
|
||||
{ get: async () => ({ magicNoteCommentMode: 'after-save-auto', magicNoteCommentFormat: 'structured' }), onChanged: () => () => {} } as never)
|
||||
win.webContents.on('console-message', event => console.log(event.message))
|
||||
try {
|
||||
await win.loadURL(url)
|
||||
for (let i = 0; i < 400; i++) {
|
||||
if (await win.webContents.executeJavaScript('typeof window.notesAnalysisRegression === "function"')) break
|
||||
await new Promise(resolve => setTimeout(resolve, 50))
|
||||
}
|
||||
const result = await win.webContents.executeJavaScript('window.notesAnalysisRegression().catch(error => ({ error: error.stack, body: document.body.innerText }))')
|
||||
writeFileSync(join(directory, 'result.json'), JSON.stringify(result))
|
||||
} finally {
|
||||
await dispose()
|
||||
database.close()
|
||||
win.destroy()
|
||||
}
|
||||
app.exit(0)
|
||||
}).catch(error => { console.error(error); app.exit(1) })
|
||||
@@ -0,0 +1,75 @@
|
||||
import Quill from 'quill'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { MagicNotesWorkspace } from '../../src/renderer/src/MagicNotesWorkspace'
|
||||
import type { MagicNoteCanvasContent } from '../../src/shared/magic-notes-contracts'
|
||||
import i18n from '../../src/renderer/src/i18n'
|
||||
import '../../src/renderer/src/styles.css'
|
||||
import '../../src/renderer/src/magic-canvas.css'
|
||||
|
||||
async function notesAnalysisRegression() {
|
||||
await i18n.changeLanguage('en-US')
|
||||
const api = window.goodbuddy.magicNotes
|
||||
const note = await api.create({ title: 'IPC canvas analysis' })
|
||||
const content: MagicNoteCanvasContent = { version: 2, kind: 'paged-canvas', assets: [],
|
||||
pages: [{ id: 'page-1', width: 794, height: 1123, background: { type: 'template', template: 'blank' }, objects: [] }],
|
||||
flow: { version: 1, ops: [{ insert: 'Review task' }, { insert: '\n', attributes: { list: 'unchecked' } }] } }
|
||||
const seeded = await api.createEntry({ noteId: note.id, content })
|
||||
const entryId = seeded.createdEntryId
|
||||
const host = document.createElement('div')
|
||||
document.body.append(host)
|
||||
const errors: string[] = []
|
||||
const root = createRoot(host)
|
||||
root.render(<MagicNotesWorkspace onNotify={notification => { if (notification.tone === 'error') errors.push(notification.message) }} />)
|
||||
const wait = async (predicate: () => unknown | Promise<unknown>) => {
|
||||
for (let i = 0; i < 400; i++) {
|
||||
if (await predicate()) return
|
||||
if (errors.length) throw new Error(errors.join('\n'))
|
||||
await new Promise(resolve => setTimeout(resolve, 25))
|
||||
}
|
||||
throw new Error(`Timed out: ${predicate}`)
|
||||
}
|
||||
const button = (label: string, parent: ParentNode = host) => [...parent.querySelectorAll<HTMLButtonElement>('button')].find(node => node.textContent?.trim() === label)!
|
||||
const click = async (label: string, parent: ParentNode = host) => {
|
||||
await wait(() => button(label, parent) && !button(label, parent).disabled)
|
||||
button(label, parent).click()
|
||||
}
|
||||
const entry = async () => (await api.get(note.id)).entries.find(item => item.id === entryId)!
|
||||
await wait(() => host.querySelector('[id^="magic-note-select-"]'))
|
||||
host.querySelector<HTMLButtonElement>('[id^="magic-note-select-"]')!.click()
|
||||
await click('Analyze with AI')
|
||||
await wait(async () => (await entry()).comments[0]?.inputMode === 'canvas-images')
|
||||
const manualRevision = (await entry()).revision
|
||||
await click('Expand canvas editor')
|
||||
const editor = () => host.querySelector<HTMLElement>('.magic-note-entry__editor')!
|
||||
await wait(() => editor()?.querySelector<HTMLButtonElement>('[data-tool="flow-text"]')?.disabled === false)
|
||||
editor().querySelector<HTMLButtonElement>('[data-tool="flow-text"]')!.click()
|
||||
await wait(() => editor().querySelector('.canvas-flow-quill'))
|
||||
const quill = Quill.find(editor().querySelector('.canvas-flow-quill')!) as Quill
|
||||
quill.insertText(0, 'Updated ', 'user')
|
||||
await click('Save changes')
|
||||
await wait(async () => (await entry()).revision >= manualRevision + 2)
|
||||
const editedRevision = (await entry()).revision
|
||||
await click('Cancel')
|
||||
await wait(() => host.querySelector('.magic-note-composer'))
|
||||
await click('Canvas', host.querySelector('.magic-note-composer')!)
|
||||
const composer = () => host.querySelector<HTMLElement>('.magic-note-composer')!
|
||||
await wait(() => composer().querySelector<HTMLButtonElement>('[data-tool="flow-text"]')?.disabled === false)
|
||||
composer().querySelector<HTMLButtonElement>('[data-tool="flow-text"]')!.click()
|
||||
await wait(() => composer().querySelector('.canvas-flow-quill'))
|
||||
;(Quill.find(composer().querySelector('.canvas-flow-quill')!) as Quill).setText('Created canvas\n', 'user')
|
||||
await click('Save entry', composer())
|
||||
await wait(async () => (await api.get(note.id)).entries.some(item => item.id !== entryId && item.comments[0]?.inputMode === 'canvas-images'))
|
||||
await click('Back to overview')
|
||||
await click('Switch to to-dos')
|
||||
await wait(() => host.querySelector<HTMLButtonElement>('.magic-todo-list-item__content'))
|
||||
host.querySelector<HTMLButtonElement>('.magic-todo-list-item__content')!.click()
|
||||
await click('Analyze with AI')
|
||||
await wait(async () => (await api.listTodos()).todos[0]?.comments[0]?.inputMode === 'canvas-images')
|
||||
const todo = (await api.listTodos()).todos[0]!
|
||||
const result = { errors, manualRevision, editedRevision, createdAnalyzed: true, todoAnalyzed: todo.comments[0]?.inputMode }
|
||||
root.unmount()
|
||||
host.remove()
|
||||
return result
|
||||
}
|
||||
|
||||
Object.assign(window, { notesAnalysisRegression })
|
||||
@@ -0,0 +1,26 @@
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { MagicNotesWorkspace } from '../../src/renderer/src/MagicNotesWorkspace'
|
||||
import type { DesktopApi } from '../../src/shared/contracts'
|
||||
import i18n from '../../src/renderer/src/i18n'
|
||||
import '../../src/renderer/src/styles.css'
|
||||
import '../../src/renderer/src/magic-canvas.css'
|
||||
|
||||
await i18n.changeLanguage('en-US')
|
||||
const note = {
|
||||
id: 'layout-note', title: 'Layout note', preview: 'Record preview', entryCount: 1,
|
||||
pinned: false, revision: 1, createdAt: '2026-09-19T00:00:00Z', updatedAt: '2026-09-19T00:00:00Z',
|
||||
entries: [{ id: 'layout-entry', noteId: 'layout-note', revision: 1,
|
||||
createdAt: '2026-09-19T00:00:00Z', updatedAt: '2026-09-19T00:00:00Z',
|
||||
content: { version: 1, ops: [{ insert: 'Record preview\n' }] }, plainText: 'Record preview', comments: [] }]
|
||||
}
|
||||
window.goodbuddy = {
|
||||
magicNotes: {
|
||||
list: async () => ({ notes: [note] }), get: async () => note, listTodos: async () => ({ todos: [] }),
|
||||
onChanged: () => () => {}, onAnalysisEvent: () => () => {}
|
||||
},
|
||||
updates: { getSettings: async () => ({ magicNoteCommentMode: 'after-save-manual', magicNoteCommentFormat: 'combined' }) }
|
||||
} as unknown as DesktopApi
|
||||
const host = document.createElement('div')
|
||||
host.style.height = '100vh'
|
||||
document.body.append(host)
|
||||
createRoot(host).render(<MagicNotesWorkspace onNotify={() => {}} />)
|
||||
@@ -0,0 +1,96 @@
|
||||
import Quill from 'quill'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { MagicNotesWorkspace } from '../../src/renderer/src/MagicNotesWorkspace'
|
||||
import type { DesktopApi } from '../../src/shared/contracts'
|
||||
import type { MagicNoteDetail } from '../../src/shared/magic-notes-contracts'
|
||||
import { magicNoteAnalyzeSchema } from '../../src/shared/magic-notes-contracts'
|
||||
import i18n from '../../src/renderer/src/i18n'
|
||||
import 'quill/dist/quill.snow.css'
|
||||
import '../../src/renderer/src/styles.css'
|
||||
import '../../src/renderer/src/magic-canvas.css'
|
||||
|
||||
async function notesNavigationRegression() {
|
||||
await i18n.changeLanguage('en-US')
|
||||
const note: MagicNoteDetail = {
|
||||
id: '00000000-0000-4000-8000-000000000601', title: 'Navigation note', preview: '',
|
||||
entryCount: 1, pinned: false, revision: 1, createdAt: '2026-08-01T00:00:00.000Z',
|
||||
updatedAt: '2026-08-01T00:00:00.000Z', entries: [{
|
||||
id: '00000000-0000-4000-8000-000000000602', noteId: '00000000-0000-4000-8000-000000000601',
|
||||
content: { version: 1, ops: [{ insert: 'Saved entry\n' }] }, plainText: 'Saved entry',
|
||||
comments: [], revision: 1, createdAt: '2026-08-01T00:00:00.000Z', updatedAt: '2026-08-01T00:00:00.000Z',
|
||||
}],
|
||||
}
|
||||
let finishAnalysis!: (detail: MagicNoteDetail) => void
|
||||
let requestLeave: ((leave: () => void) => void) | undefined
|
||||
let leaves = 0
|
||||
const errors: string[] = []
|
||||
window.goodbuddy = {
|
||||
magicNotes: {
|
||||
list: async () => ({ notes: [note] }), get: async () => note,
|
||||
listTodos: async () => ({ todos: [] }),
|
||||
analyze: (...[entryId, options]: Parameters<DesktopApi['magicNotes']['analyze']>) => {
|
||||
magicNoteAnalyzeSchema.parse({ entryId, ...options })
|
||||
return new Promise(resolve => { finishAnalysis = resolve })
|
||||
},
|
||||
onChanged: () => () => {}, onAnalysisEvent: () => () => {},
|
||||
},
|
||||
updates: { getSettings: async () => ({ magicNoteCommentMode: 'after-save-manual', magicNoteCommentFormat: 'combined' }) },
|
||||
} as unknown as DesktopApi
|
||||
const host = document.createElement('div')
|
||||
document.body.append(host)
|
||||
const root = createRoot(host)
|
||||
root.render(<MagicNotesWorkspace onBeforeLeave={requester => { requestLeave = requester }} onNotify={message => {
|
||||
if (message.tone === 'error') errors.push(message.message)
|
||||
}} />)
|
||||
const wait = async (predicate: () => unknown) => {
|
||||
for (let i = 0; i < 400; i++) {
|
||||
if (predicate()) return
|
||||
await new Promise(resolve => setTimeout(resolve, 25))
|
||||
}
|
||||
throw new Error('Timed out waiting for notes UI')
|
||||
}
|
||||
const button = (text: string) => [...host.querySelectorAll<HTMLButtonElement>('button')].find(item => item.textContent?.trim() === text)!
|
||||
const frame = () => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))
|
||||
await wait(() => host.querySelector('[id^="magic-note-select-"]'))
|
||||
host.querySelector<HTMLButtonElement>('[id^="magic-note-select-"]')!.click()
|
||||
await wait(() => button('Analyze with AI'))
|
||||
button('Analyze with AI').click()
|
||||
await wait(() => finishAnalysis)
|
||||
const title = host.querySelector<HTMLInputElement>('.magic-note-detail-header input')!
|
||||
Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!.call(title, 'Title during AI')
|
||||
title.dispatchEvent(new Event('input', { bubbles: true }))
|
||||
await frame()
|
||||
finishAnalysis({ ...note, revision: 2 })
|
||||
await frame()
|
||||
const titlePreserved = title.value === 'Title during AI'
|
||||
requestLeave!(() => { leaves++ })
|
||||
await wait(() => host.querySelector('[role="alertdialog"]'))
|
||||
button('Continue editing').click()
|
||||
await frame()
|
||||
const continuedTitle = title.value
|
||||
// Restore the title without saving, then exercise the actual canvas flush path.
|
||||
title.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
|
||||
await frame()
|
||||
button('Canvas').click()
|
||||
await wait(() => host.querySelector<HTMLButtonElement>('[data-tool="flow-text"]')?.disabled === false)
|
||||
host.querySelector<HTMLButtonElement>('[data-tool="flow-text"]')!.click()
|
||||
await wait(() => host.querySelector('.canvas-flow-quill'))
|
||||
await frame()
|
||||
const quill = Quill.find(host.querySelector('.canvas-flow-quill')!) as Quill
|
||||
quill.setText('Pending canvas flow\n', 'user')
|
||||
requestLeave!(() => { leaves++ })
|
||||
await wait(() => host.querySelector('[role="alertdialog"]'))
|
||||
const canvasGuarded = leaves === 0
|
||||
button('Continue editing').click()
|
||||
await frame()
|
||||
const canvasPreserved = quill.getText().includes('Pending canvas flow')
|
||||
requestLeave!(() => { leaves++ })
|
||||
await wait(() => host.querySelector('[role="alertdialog"]'))
|
||||
button('Discard and switch').click()
|
||||
await frame()
|
||||
root.unmount()
|
||||
host.remove()
|
||||
return { errors, titlePreserved, continuedTitle, canvasGuarded, canvasPreserved, leaves }
|
||||
}
|
||||
|
||||
Object.assign(window, { notesNavigationRegression })
|
||||
Reference in New Issue
Block a user