v2.27.0: jump straight to a tab, plus five fixes

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/desktop",
   "productName": "ZenNotes",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "ZenNotes desktop shell",
   "private": true,
   "main": "./out/main/index.js",

apps/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/server",
   "private": true,
-  "version": "2.26.0",
+  "version": "2.27.0",
   "scripts": {
     "dev": "node ../../tooling/scripts/run-go-server-dev.mjs",
     "prepare-web": "node ../../tooling/scripts/prepare-server-web-dist.mjs",

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/web",
   "private": true,
-  "version": "2.26.0",
+  "version": "2.27.0",
   "type": "module",
   "description": "ZenNotes web client for self-hosted and hosted deployments",
   "homepage": "https://zennotes.org",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zennotes-monorepo",
   "private": true,
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "ZenNotes monorepo for desktop, web, and self-hosted server builds",
   "packageManager": "npm@10.9.2",
   "engines": {

packages/app-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/app-core",
   "private": true,
-  "version": "2.26.0",
+  "version": "2.27.0",
   "type": "module",
   "exports": {
     "./main": "./src/main.tsx"

packages/app-core/src/App.tsx

@@ -24,7 +24,14 @@ import { ServerDirectoryPickerHost } from './components/ServerDirectoryPickerHos
 import { ToastHost } from './components/ui'
 import { ExcalidrawEmbedMenuHost } from './components/ExcalidrawEmbedMenuHost'
 import { resolveQuickNoteTitle } from './lib/quick-note-title'
-import { isMacPlatform, matchesShortcut, matchesSequenceToken } from './lib/keymaps'
+import {
+  eventMatchesUserOverride,
+  isMacPlatform,
+  matchesShortcut,
+  matchesSequenceToken,
+  TAB_SELECT_KEYMAP_IDS
+} from './lib/keymaps'
+import { selectActiveBuffer } from './lib/buffer-navigation'
 import { focusPaneOrEdgePanel } from './lib/pane-nav'
 import {
   activatePanelRow,
@@ -696,6 +703,36 @@ function App(): JSX.Element {
         state.setWordWrap(!state.wordWrap)
         return
       }
+      // Alt+1..9 (⌃1..9 on macOS): jump straight to tab N (#497). Position
+      // counts across panes in the same order gt cycles through. Bails while
+      // a modal, palette, menu, or Settings (with its keymap recorder) is
+      // open, per the house rule for global key handlers: switching the tab
+      // under an overlay strands the user on a different note than they left.
+      const tabSelectBlocked =
+        state.settingsOpen ||
+        state.searchOpen ||
+        state.vaultTextSearchOpen ||
+        state.commandPaletteOpen ||
+        state.bufferPaletteOpen ||
+        state.templatePaletteOpen ||
+        state.embedDrawingPaletteOpen ||
+        state.outlinePaletteOpen ||
+        document.querySelector('[data-ctx-menu]') ||
+        document.querySelector('[data-prompt-modal]') ||
+        document.querySelector('[data-confirm-modal]')
+      if (!tabSelectBlocked) {
+        for (let i = 0; i < TAB_SELECT_KEYMAP_IDS.length; i += 1) {
+          const id = TAB_SELECT_KEYMAP_IDS[i]
+          if (!matchesShortcut(e, overrides, id)) continue
+          // These defaults were inserted mid-handler: when the combination is
+          // one the user explicitly rebound to another action (checked later
+          // in this chain), the rebind wins over the shipped default.
+          if (!overrides[id] && eventMatchesUserOverride(e, overrides, id)) continue
+          e.preventDefault()
+          selectActiveBuffer(state, i + 1)
+          return
+        }
+      }
       if (matchesShortcut(e, overrides, 'global.exportNotePdf')) {
         e.preventDefault()
         void state.exportActiveNotePdf()

packages/app-core/src/components/Editor.tsx

@@ -46,7 +46,7 @@ import {
   type KeymapId,
   type KeymapOverrides
 } from '../lib/keymaps'
-import { navigateActiveBuffer } from '../lib/buffer-navigation'
+import { navigateActiveBuffer, selectActiveBuffer } from '../lib/buffer-navigation'
 import { applyVimInsertEscape } from '../lib/vim-insert-escape'
 import { listContinuationPrefix } from '../lib/list-continuation'
 import { focusEditorNormalMode } from '../lib/editor-focus'
@@ -633,12 +633,26 @@ function registerVimCommands(): void {
   Vim.defineAction('focusPaneRight', () => {
     focusPaneOrEdgePanel('l')
   })
-  Vim.defineAction('previousBuffer', () => {
-    navigateActiveBuffer(useStore.getState(), -1)
-  })
-  Vim.defineAction('nextBuffer', () => {
-    navigateActiveBuffer(useStore.getState(), 1)
-  })
+  // {count}gt goes straight to tab {count}, vim's absolute jump; without a
+  // count it keeps cycling. {count}gT is relative, vim-style: count tabs
+  // back. (#497)
+  Vim.defineAction(
+    'previousBuffer',
+    (_cm: unknown, actionArgs?: { repeat?: number; repeatIsExplicit?: boolean }) => {
+      const repeat = actionArgs?.repeatIsExplicit ? actionArgs.repeat ?? 1 : 1
+      navigateActiveBuffer(useStore.getState(), -repeat)
+    }
+  )
+  Vim.defineAction(
+    'nextBuffer',
+    (_cm: unknown, actionArgs?: { repeat?: number; repeatIsExplicit?: boolean }) => {
+      if (actionArgs?.repeatIsExplicit && actionArgs.repeat) {
+        selectActiveBuffer(useStore.getState(), actionArgs.repeat)
+        return
+      }
+      navigateActiveBuffer(useStore.getState(), 1)
+    }
+  )
 
   registerVimNoteCommands()
   registerCommandPaletteEx()
@@ -850,10 +864,15 @@ function registerVimNoteCommands(): void {
   }
   Vim.defineEx('qall', 'qa', closeEveryTab)
   Vim.defineEx('quitall', 'quitall', closeEveryTab)
-  // :xa / :wa are just aliases for qall in this context (nothing to flush
-  // that autosave doesn't already handle).
+  // Quit-and-write variants close everything, like vim's :xa / :wqa. But
+  // :wa is a SAVE, not a quit: it used to alias qall here on the theory
+  // that autosave leaves nothing to flush, and every vim user's muscle
+  // memory (":wa after any change") nuked their tab layout instead (#569).
   Vim.defineEx('xall', 'xa', closeEveryTab)
-  Vim.defineEx('wall', 'wa', closeEveryTab)
+  Vim.defineEx('wqall', 'wqa', closeEveryTab)
+  Vim.defineEx('wall', 'wa', () => {
+    void useStore.getState().flushDirtyNotes()
+  })
 
   Vim.defineEx('help', 'h', () => {
     void useStore.getState().openHelpView()
@@ -964,6 +983,8 @@ const MANUAL_EX_NAMES = new Set([
   'quitall',
   'xall',
   'xa',
+  'wqall',
+  'wqa',
   'wall',
   'wa',
   'help',

packages/app-core/src/components/EditorPane.tsx

@@ -62,6 +62,7 @@ import { hopMarkerBackward, hopMarkerForward } from '../lib/cm-marker-hop'
 import { toggleCheckbox } from '../lib/cm-toggle-checkbox'
 import { completionKeymapForEditor, completionNavKeymap } from '../lib/cm-completion-nav'
 import { vimAwareDefaultKeymap, vimAwareMarkdownKeymap } from '../lib/cm-vim-default-keymap'
+import { isVimAwaitingArgument } from '../lib/vim-nav'
 import { toCodeMirrorKey, vimHalfPageKeymap } from '../lib/vim-half-page-keymap'
 import { scrollOff } from '../lib/cm-scrolloff'
 import { followLinkTarget } from '../lib/follow-link'
@@ -1865,7 +1866,9 @@ export function EditorPane({ pane }: { pane: PaneLeaf }): JSX.Element {
                 const cm = getCM(view)
                 const insertMode = !!cm?.state.vim?.insertMode
                 const sel = view.state.selection.main
-                if (!insertMode && !sel.empty) {
+                // A pending sequence owns the next key: `v f m` jumps to the
+                // next `m`, it does not open the menu (#568).
+                if (!insertMode && !sel.empty && !isVimAwaitingArgument(view)) {
                   event.preventDefault()
                   event.stopPropagation()
                   openEditorContextMenu()

packages/app-core/src/components/VimNav.tsx

@@ -1059,11 +1059,18 @@ export function VimNav(): JSX.Element | null {
         }
       }
 
+      // A pending Vim sequence owns the next character: after `f`/`t`/`r` (or
+      // a count or register prefix), `m` is the operand, not the menu key.
+      // This runs on window capture, so without the guard Vim never even saw
+      // the key and the orphaned motion swallowed the next one (#568). The
+      // native context-menu key is not a character and stays available.
       const wantsEditorTextContextMenu =
         isEditorFocused(state.editorViewRef) &&
         !editorInsertMode &&
         !state.editorViewRef?.state.selection.main.empty &&
-        (matchesSequenceToken(e, overrides, 'nav.contextMenu') || wantsNativeContextMenuKey(e))
+        ((matchesSequenceToken(e, overrides, 'nav.contextMenu') &&
+          !isVimAwaitingArgument(state.editorViewRef)) ||
+          wantsNativeContextMenuKey(e))
       if (wantsEditorTextContextMenu) {
         e.preventDefault()
         e.stopImmediatePropagation()
@@ -1137,7 +1144,10 @@ export function VimNav(): JSX.Element | null {
         const wantsTextContextMenu =
           hasEditorSelection &&
           !isEditorInsertMode(state.editorViewRef, state.vimMode) &&
-          (matchesSequenceToken(e, overrides, 'nav.contextMenu') || wantsNativeContextMenuKey(e))
+          // Same #568 guard as above: a pending f/t/r owns the character.
+          ((matchesSequenceToken(e, overrides, 'nav.contextMenu') &&
+            !isVimAwaitingArgument(state.editorViewRef)) ||
+            wantsNativeContextMenuKey(e))
         if (wantsTextContextMenu) {
           e.preventDefault()
           e.stopImmediatePropagation()

packages/app-core/src/lib/buffer-navigation.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import type { NoteMeta } from '@shared/ipc'
 import type { PaneLayout } from './pane-layout'
-import { getBufferNavigationTarget } from './buffer-navigation'
+import { getBufferNavigationTarget, getBufferSelectTarget } from './buffer-navigation'
 
 function note(path: string, updatedAt: number, folder: NoteMeta['folder'] = 'inbox'): Pick<NoteMeta, 'path' | 'folder' | 'updatedAt'> {
   return { path, folder, updatedAt }
@@ -64,4 +64,52 @@ describe('getBufferNavigationTarget', () => {
       kind: 'create-quick'
     })
   })
+
+  it('walks back multiple tabs for {count}gT, wrapping past the start', () => {
+    const layout = leaf('pane-a', ['one.md', 'two.md', 'three.md'], 'two.md')
+
+    // 4 back from index 1 in a 3-tab ring lands on index 0.
+    expect(getBufferNavigationTarget(layout, 'pane-a', [], -4)).toEqual({
+      kind: 'focus',
+      paneId: 'pane-a',
+      path: 'one.md'
+    })
+  })
+})
+
+describe('getBufferSelectTarget (#497)', () => {
+  it('selects the Nth tab, counted across panes in cycle order', () => {
+    const layout: PaneLayout = {
+      kind: 'split',
+      id: 'root',
+      direction: 'row',
+      sizes: [0.5, 0.5],
+      children: [
+        leaf('pane-a', ['one.md', 'two.md'], 'one.md'),
+        leaf('pane-b', ['three.md'], 'three.md')
+      ]
+    }
+
+    expect(getBufferSelectTarget(layout, 'pane-a', 3)).toEqual({
+      kind: 'focus',
+      paneId: 'pane-b',
+      path: 'three.md'
+    })
+  })
+
+  it('clamps a too-large index to the last tab, like a big {count}gt in vim', () => {
+    const layout = leaf('pane-a', ['one.md', 'two.md'], 'one.md')
+
+    expect(getBufferSelectTarget(layout, 'pane-a', 9)).toEqual({
+      kind: 'focus',
+      paneId: 'pane-a',
+      path: 'two.md'
+    })
+  })
+
+  it('targets open tabs only, never the recent-notes fallback', () => {
+    const layout = leaf('pane-a', [], null)
+
+    expect(getBufferSelectTarget(layout, 'pane-a', 1)).toEqual({ kind: 'none' })
+  })
 })