Test 05dca72ef3 feat: handle git divergence, conflicts, and manual pull from within Laputa ...

When push is rejected due to remote having newer commits, the bottom bar
now shows "Pull required" (orange). Clicking it pulls then auto-pushes.
Conflicted notes show an inline banner with "Keep mine" / "Keep theirs"
buttons. A new "Pull from Remote" command is available in Cmd+K and the
Vault menu. Clicking the sync badge opens a popup showing branch name,
ahead/behind counts, and a Pull button.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-03-19 09:51:06 +01:00

..

frontmatterOps.ts

fix: live-reload theme CSS vars on editor save and frontmatter changes

2026-03-19 00:57:34 +01:00

mockFrontmatterHelpers.test.ts

test: add unit tests for hooks — useNoteActions, useEntryActions, useTabManagement, useVaultLoader, useKeyboardNavigation, mockFrontmatterHelpers

2026-02-22 12:02:19 +01:00

mockFrontmatterHelpers.ts

refactor: extract useTabManagement hook and mock frontmatter helpers from useNoteActions

2026-02-22 10:11:52 +01:00

useAiActivity.test.ts

fix: MCP UI tools (highlight, open_note) now work in real-time

2026-03-04 10:05:43 +01:00

useAiActivity.ts

fix: MCP UI tools (highlight, open_note) now work in real-time

2026-03-04 10:05:43 +01:00

useAiAgent.test.ts

fix: embed conversation history in AI agent chat messages

2026-03-09 10:21:49 +01:00

useAiAgent.ts

fix: embed conversation history in AI agent chat messages

2026-03-09 10:21:49 +01:00

useAIChat.test.ts

fix: embed conversation history in AI agent chat messages

2026-03-09 10:21:49 +01:00

useAIChat.ts

fix: embed conversation history in AI agent chat messages

2026-03-09 10:21:49 +01:00

useAppCommands.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useAppKeyboard.test.ts

feat: open note in new window (Cmd+Shift+Click / Cmd+Shift+O)

2026-03-19 08:47:25 +01:00

useAppKeyboard.ts

feat: open note in new window (Cmd+Shift+Click / Cmd+Shift+O)

2026-03-19 08:47:25 +01:00

useAppNavigation.test.ts

refactor: extract useAppNavigation hook from App.tsx — reduce god component churn (#194)

2026-03-12 07:24:46 +01:00

useAppNavigation.ts

refactor: extract useAppNavigation hook from App.tsx — reduce god component churn (#194)

2026-03-12 07:24:46 +01:00

useAutoSync.test.ts

feat: reindex vault command, indexing status bar, sync-triggered reindex

2026-03-07 01:14:12 +01:00

useAutoSync.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useBuildNumber.test.ts

feat: show dynamic build number in status bar (bNNN format) (#163)

2026-03-02 01:50:41 +01:00

useBuildNumber.ts

feat: show dynamic build number in status bar (bNNN format) (#163)

2026-03-02 01:50:41 +01:00

useBulkActions.test.ts

test: extract useBulkActions hook and add unit tests (#192)

2026-03-12 03:19:32 +01:00

useBulkActions.ts

test: extract useBulkActions hook and add unit tests (#192)

2026-03-12 03:19:32 +01:00

useClosedTabHistory.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useClosedTabHistory.ts

feat: add Playwright smoke tests, data-tab-path attr, store full VaultEntry in closed tab history

2026-03-12 00:54:48 +01:00

useCodeMirror.test.ts

fix: sync raw editor + suppress toast overwrite on trash/archive actions

2026-03-18 13:32:07 +01:00

useCodeMirror.ts

fix: live-reload theme CSS vars on editor save and frontmatter changes

2026-03-19 00:57:34 +01:00

useCommandRegistry.test.ts

feat: add emoji icon picker for notes stored in frontmatter

2026-03-17 22:42:55 +01:00

useCommandRegistry.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useCommitFlow.test.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useCommitFlow.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useConflictResolver.test.ts

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

useConflictResolver.ts

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

useDeleteActions.test.ts

refactor: extract useDeleteActions hook from App.tsx — reduce churn surface (#193)

2026-03-12 06:28:19 +01:00

useDeleteActions.ts

refactor: extract useDeleteActions hook from App.tsx — reduce churn surface (#193)

2026-03-12 06:28:19 +01:00

useDialogs.ts

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

useDiffMode.test.ts

refactor: decompose Editor.tsx, NoteList.tsx, Sidebar.tsx — CodeScene hotspots (#126)

2026-02-27 15:27:25 +01:00

useDiffMode.ts

refactor: decompose Editor.tsx, NoteList.tsx, Sidebar.tsx — CodeScene hotspots (#126)

2026-02-27 15:27:25 +01:00

useDragRegion.ts

feat: remove native titlebar, implement custom drag regions

2026-02-25 21:43:16 +01:00

useEditorFocus.test.ts

fix: defer H1 selection to second rAF so content swap completes first

2026-03-02 21:27:26 +01:00

useEditorFocus.ts

fix: defer H1 selection to second rAF so content swap completes first

2026-03-02 21:27:26 +01:00

useEditorSave.test.ts

feat: auto-save notes with 500ms debounce after last keystroke

2026-03-19 05:34:48 +01:00

useEditorSave.ts

feat: auto-save notes with 500ms debounce after last keystroke

2026-03-19 05:34:48 +01:00

useEditorSaveWithLinks.test.ts

test: add useEditorSaveWithLinks tests, remove dead useDropdownKeyboard (#191)

2026-03-12 03:01:39 +01:00

useEditorSaveWithLinks.ts

fix: update note list snippet on save so all notes show preview

2026-03-11 22:38:25 +01:00

useEditorTabSwap.test.ts

fix: sync raw editor (CodeMirror) content to BlockNote on mode switch

2026-03-11 22:14:20 +01:00

useEditorTabSwap.ts

fix: decouple H1 from title sync + non-blocking TitleField rename

2026-03-18 15:42:48 +01:00

useEntryActions.test.ts

fix: remove trashed/archived fields from frontmatter on restore instead of setting false

2026-03-18 14:29:06 +01:00

useEntryActions.ts

fix: remove trashed/archived fields from frontmatter on restore instead of setting false

2026-03-18 14:29:06 +01:00

useFlatVaultMigration.ts

fix: correct reloadVault type in useFlatVaultMigration

2026-03-16 05:06:24 +01:00

useGitHistory.ts

refactor: extract hooks from App.tsx to improve code health (#62)

2026-02-25 13:31:19 +01:00

useImageDrop.test.ts

refactor: flatten vault structure — simplify migration API and flatten demo vault

2026-03-15 23:40:47 +01:00

useImageDrop.ts

refactor: flatten vault structure — simplify migration API and flatten demo vault

2026-03-15 23:40:47 +01:00

useIndexing.test.ts

feat: reindex vault command, indexing status bar, sync-triggered reindex

2026-03-07 01:14:12 +01:00

useIndexing.ts

feat: reindex vault command, indexing status bar, sync-triggered reindex

2026-03-07 01:14:12 +01:00

useKeyboardNavigation.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useKeyboardNavigation.ts

test: add Playwright smoke test for exact-match search ranking

2026-03-08 23:53:00 +01:00

useLayoutPanels.ts

refactor: extract useLayoutPanels hook from App.tsx — reduce god component churn (#195) (#196)

2026-03-13 07:11:31 +01:00

useMcpBridge.ts

fix: resolve TypeScript build errors from any→unknown migration

2026-02-22 14:10:42 +01:00

useMcpStatus.test.ts

feat: make MCP restore command always available in Cmd+K

2026-03-07 11:33:18 +01:00

useMcpStatus.ts

feat: make MCP restore command always available in Cmd+K

2026-03-07 11:33:18 +01:00

useMenuEvents.test.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useMenuEvents.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useMultiSelect.ts

fix: multiselect range includes anchor note and prevents text selection (#127)

2026-02-27 16:53:18 +01:00

useNavigationGestures.ts

refactor: extract useEditorSaveWithLinks and useNavigationGestures from App.tsx (#186)

2026-03-03 07:10:34 +01:00

useNavigationHistory.test.ts

fix: back/forward nav arrows reopen replaced tabs instead of skipping them (#172)

2026-03-02 11:00:41 +01:00

useNavigationHistory.ts

feat: back/forward navigation between opened notes (#75)

2026-02-25 18:39:12 +00:00

useNoteActions.test.ts

fix: sync title on reopen of already-open tabs (desync detection)

2026-03-18 02:37:29 +01:00

useNoteActions.ts

fix: live-reload theme CSS vars on editor save and frontmatter changes

2026-03-19 00:57:34 +01:00

useNoteCreation.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useNoteCreation.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useNoteListKeyboard.test.ts

feat: persist note list sort preference in type file frontmatter

2026-03-03 12:18:40 +01:00

useNoteListKeyboard.ts

feat: optimize note open and trash/archive latency

2026-03-09 13:28:46 +01:00

useNoteRename.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useNoteRename.ts

refactor: split useNoteActions into useNoteCreation + useNoteRename — CodeScene 7.92→9.38

2026-03-16 18:31:33 +01:00

useNoteSearch.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useNoteSearch.ts

feat: add emoji icon picker for notes stored in frontmatter

2026-03-17 22:42:55 +01:00

useOnboarding.test.ts

fix: remove persistLastVault assertions from onboarding test

2026-03-03 00:59:09 +01:00

useOnboarding.ts

fix: remove persistLastVault assertions from onboarding test

2026-03-03 00:59:09 +01:00

usePropertyPanelState.ts

fix: hide system properties (trashed, archived, icon) from Properties panel

2026-03-19 03:28:29 +01:00

useRawMode.test.ts

feat: persist editor mode (raw/preview) across note switches

2026-03-17 11:41:35 +01:00

useRawMode.ts

feat: persist editor mode (raw/preview) across note switches

2026-03-17 11:41:35 +01:00

useSaveNote.test.ts

fix: replace broken auto-save with explicit Cmd+S save

2026-02-23 19:53:36 +01:00

useSaveNote.ts

fix: auto-save unsaved notes before trash/archive

2026-03-08 16:52:08 +01:00

useSettings.test.ts

feat: auto-pull vault changes from Git (background sync + conflict handling) (#79)

2026-02-26 00:55:16 +00:00

useSettings.ts

feat: auto-pull vault changes from Git (background sync + conflict handling) (#79)

2026-02-26 00:55:16 +00:00

useTabManagement.test.ts

refactor: remove owner/cadence from Frontmatter, source created_at from filesystem

2026-03-18 01:56:33 +01:00

useTabManagement.ts

fix: sync title on reopen of already-open tabs (desync detection)

2026-03-18 02:37:29 +01:00

useTheme.ts

feat: comprehensive theme.json config with live hot-reload for editor styling

2026-02-16 08:04:06 +01:00

useThemeManager.test.ts

test: verify bullet-size and bullet-color live-reload via editor buffer

2026-03-19 04:36:08 +01:00

useThemeManager.ts

fix: force WebKit reflow for pseudo-elements on theme CSS var changes

2026-03-16 01:24:31 +01:00

useUnifiedSearch.ts

feat: move vault UI config from localStorage to vault files

2026-03-05 15:26:21 +01:00

useUpdater.test.ts

feat: add 'Check for Updates' command to command palette

2026-03-02 23:53:37 +01:00

useUpdater.ts

feat: add 'Check for Updates' command to command palette

2026-03-02 23:53:37 +01:00

useVaultConfig.ts

feat: move vault UI config from localStorage to vault files

2026-03-05 15:26:21 +01:00

useVaultLoader.test.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useVaultLoader.ts

feat: handle git divergence, conflicts, and manual pull from within Laputa

2026-03-19 09:51:06 +01:00

useVaultSwitcher.test.ts

feat: vault management — remove vault from list and restore Getting Started

2026-03-03 02:36:33 +01:00

useVaultSwitcher.ts

fix: resolve demo vault path relative to project root — fix smoke test failures

2026-03-17 13:14:56 +01:00

useViewMode.test.ts

feat: persist editor mode (raw/preview) across note switches

2026-03-17 11:41:35 +01:00

useViewMode.ts

feat: move vault UI config from localStorage to vault files

2026-03-05 15:26:21 +01:00

useZoom.test.ts

feat: persist editor mode (raw/preview) across note switches

2026-03-17 11:41:35 +01:00

useZoom.ts

fix: CodeMirror cursor placement at non-100% zoom levels

2026-03-08 14:54:50 +01:00