Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
feat(open-knowledge): navigator worktree badges + flyout search field (#2360)
Andrew Mikofalvy3c08cd1575c3
diff --git a/packages/app/src/components/NavigatorApp.dom.test.tsx b/packages/app/src/components/NavigatorApp.dom.test.tsxindex b42fc4f34..557694bc2 100644--- a/packages/app/src/components/NavigatorApp.dom.test.tsx+++ b/packages/app/src/components/NavigatorApp.dom.test.tsx@@ -224,7 +224,7 @@ describe('NavigatorApp launcher runtime behavior', () => {expect(list.textContent).toContain('/Users/x/plain-notes');});- test('gives worktree and plain-project recents distinct icon tiles', async () => {+ test('flags worktrees with a badge + branch chip; projects show their path', async () => {const bridge = createBridge();bridge.project.listRecent = mock(() =>Promise.resolve([@@ -247,14 +247,19 @@ describe('NavigatorApp launcher runtime behavior', () => {const [worktreeRow, plainRow] = rows;if (!worktreeRow || !plainRow) throw new Error('expected two recent rows');- expect(worktreeRow.querySelector('svg.lucide-git-branch')).not.toBeNull();- expect(worktreeRow.querySelector('svg.lucide-folder')).toBeNull();+ expect(worktreeRow.querySelector('svg.lucide-folder')).not.toBeNull();expect(worktreeRow.textContent).toContain('dev');- expect(worktreeRow.textContent).toContain('worktree of pnw-fishing');+ expect(worktreeRow.textContent).toContain('worktree');+ expect(worktreeRow.textContent).toContain('of pnw-fishing');+ expect(+ worktreeRow.querySelector(+ '[data-testid="nav-recent-branch-/Users/x/pnw-fishing/.ok/worktrees/dev"]',+ ),+ ).not.toBeNull();expect(plainRow.querySelector('svg.lucide-folder')).not.toBeNull();- expect(plainRow.querySelector('svg.lucide-git-branch')).toBeNull();expect(plainRow.textContent).toContain('Plain Notes');expect(plainRow.textContent).toContain('/Users/x/plain-notes');+ expect(plainRow.textContent).not.toContain('worktree');});});diff --git a/packages/app/src/components/NavigatorApp.tsx b/packages/app/src/components/NavigatorApp.tsxindex f8c7260c5..2eb895648 100644--- a/packages/app/src/components/NavigatorApp.tsx+++ b/packages/app/src/components/NavigatorApp.tsx@@ -376,6 +376,7 @@ function RecentRow({const { t } = useLingui();const { name: projectName } = project;const isWorktree = project.isLinkedWorktree === true;+ const rowBranch = isWorktree ? (project.branch ?? branch) : branch;return (<li className="group flex items-center justify-between rounded-lg hover:bg-accent"><Button@@ -389,53 +390,43 @@ function RecentRow({)}><div className="flex min-w-0 items-center gap-3">- <span- aria-hidden="true"- className={cn(- 'flex size-8 shrink-0 items-center justify-center rounded-lg',- isWorktree- ? 'bg-green-600/10 text-green-600 dark:bg-green-400/10 dark:text-green-400'- : 'bg-muted text-muted-foreground',- )}- >- {isWorktree ? <GitBranch className="size-4" /> : <Folder className="size-4" />}- </span>+ {/* Uniform folder icon for every row — worktree vs project is conveyed+ by the worktree pill + the branch chip, not by the icon. */}+ <Folder aria-hidden="true" className="size-[18px] shrink-0 text-muted-foreground" /><div className="flex min-w-0 flex-col gap-1 truncate">- {isWorktree ? (- <>- <span className="truncate font-medium text-sm text-gray-700 dark:text-foreground">- {project.branch ?? branch ?? project.name}- </span>- <span- className="truncate w-full text-muted-foreground text-xs"- title={project.mainRoot ?? ''}+ <div className="flex min-w-0 items-center gap-2">+ <span className="truncate font-medium text-sm text-gray-700 dark:text-foreground">+ {project.name}+ </span>+ {isWorktree ? (+ <Badge+ variant="secondary"+ className="shrink-0 gap-1 rounded-full border-transparent bg-green-600/10 px-2 py-0 font-medium text-2xs text-green-800 dark:bg-green-400/10 dark:text-green-400">- <Trans>worktree of {basenameOf(project.mainRoot ?? '')}</Trans>- </span>- </>- ) : (- <>- <span className="font-medium text-sm text-gray-700 dark:text-foreground">- {project.name}- </span>- <span className="truncate w-full text-muted-foreground text-xs">- {project.path}- </span>- </>- )}+ <GitBranch aria-hidden="true" className="size-2.5" />+ <Trans>worktree</Trans>+ </Badge>+ ) : null}+ </div>+ <span+ className="truncate w-full text-muted-foreground text-xs"+ title={isWorktree ? (project.mainRoot ?? '') : project.path}+ >+ {isWorktree ? <Trans>of {basenameOf(project.mainRoot ?? '')}</Trans> : project.path}+ </span></div></div>{project.missing ? (<Badge className="text-2xs rounded-sm" variant="warning"><Trans>Missing</Trans></Badge>- ) : branch !== null && !isWorktree ? (+ ) : rowBranch != null ? (<spanclassName="flex max-w-[40%] items-center gap-1 text-muted-foreground text-xs"data-testid={`nav-recent-branch-${project.path}`}><GitBranch aria-hidden="true" className="size-3 shrink-0" />- <span className="truncate">{branch}</span>+ <span className="truncate font-mono">{rowBranch}</span></span>) : null}</Button>diff --git a/packages/app/src/components/NewWorktreeDialog.dom.test.tsx b/packages/app/src/components/NewWorktreeDialog.dom.test.tsxindex 1fc8ecd36..1ddcc6217 100644--- a/packages/app/src/components/NewWorktreeDialog.dom.test.tsx+++ b/packages/app/src/components/NewWorktreeDialog.dom.test.tsx@@ -304,6 +304,7 @@ describe('NewWorktreeDialog', () => {target: { value: 'my-feature' },});+ await new Promise((resolve) => requestAnimationFrame(resolve));fireEvent.click(screen.getByTestId('new-worktree-base-trigger'));fireEvent.click(await screen.findByTestId('new-worktree-base-option-dev'));@@ -591,6 +592,7 @@ describe('NewWorktreeDialog', () => {fireEvent.change(await screen.findByTestId('new-worktree-branch'), {target: { value: 'my-feature' },});+ await new Promise((resolve) => requestAnimationFrame(resolve));fireEvent.click(screen.getByTestId('new-worktree-base-trigger'));fireEvent.click(await screen.findByTestId('new-worktree-base-option-origin/main'));await waitFor(() =>@@ -628,6 +630,7 @@ describe('NewWorktreeDialog', () => {fireEvent.change(await screen.findByTestId('new-worktree-branch'), {target: { value: 'my-feature' },});+ await new Promise((resolve) => requestAnimationFrame(resolve));fireEvent.click(screen.getByTestId('new-worktree-base-trigger'));const behindHint = await screen.findByTestId('new-worktree-base-behind-main');expect(behindHint.textContent).toContain('3 behind origin');diff --git a/packages/app/src/components/RecentProjectsMenu.dom.test.tsx b/packages/app/src/components/RecentProjectsMenu.dom.test.tsxindex 22e61a1ce..a736b034f 100644--- a/packages/app/src/components/RecentProjectsMenu.dom.test.tsx+++ b/packages/app/src/components/RecentProjectsMenu.dom.test.tsx@@ -336,7 +336,7 @@ describe('RecentProjectsMenu — grouped browse (no query)', () => {expect(mainEntry.querySelector('svg')).toBeNull();expect(devEntry.querySelector('svg')).toBeNull();const flyoutSearch = screen.getByTestId('project-switcher-flyout-search-/repo');- expect(flyoutSearch.parentElement?.querySelectorAll('svg').length).toBe(1);+ expect(flyoutSearch.parentElement?.querySelectorAll('svg').length).toBe(2);fireEvent.click(devEntry);await waitFor(() => {diff --git a/packages/app/src/components/RecentProjectsMenu.tsx b/packages/app/src/components/RecentProjectsMenu.tsxindex a06a9cb25..9f60a99b1 100644--- a/packages/app/src/components/RecentProjectsMenu.tsx+++ b/packages/app/src/components/RecentProjectsMenu.tsx@@ -1,6 +1,6 @@import type { WorktreeSelectorEntry, WorktreeSelectorModel } from '@inkeep/open-knowledge-core';import { Plural, Trans, useLingui } from '@lingui/react/macro';-import { Check, ChevronRight, GitBranch, Plus } from 'lucide-react';+import { Check, ChevronRight, GitBranch, Plus, Search } from 'lucide-react';import type * as React from 'react';import { useRef, useState } from 'react';import { toast } from 'sonner';@@ -382,7 +382,13 @@ function WorktreeFlyout({}}data-testid={`project-switcher-flyout-${group.project.path}`}>- <InputGroup className="mb-0.5 h-8 shrink-0 border-0 shadow-none has-[[data-slot=input-group-control]:focus-visible]:ring-0">+ <InputGroup className="mb-1 h-8 shrink-0">+ {/* Search magnifier leads so the row reads as a typeable field; the+ default InputGroup border + focus ring (restored by dropping the+ border-0 / ring-0 overrides) is what signals "you can type here". */}+ <InputGroupAddon align="inline-start">+ <Search aria-hidden="true" />+ </InputGroupAddon><InputGroupInputref={searchRef}aria-label={t`Search worktrees and branches`}@@ -398,10 +404,9 @@ function WorktreeFlyout({}}data-testid={`project-switcher-flyout-search-${group.project.path}`}/>- {/* GitBranch here (not the search magnifier) — the placeholder text- already says "Search worktrees"; this is the one worktree-context- icon for the whole flyout, replacing the per-row icon below. */}- <InputGroupAddon>+ {/* Branch icon trails as the worktree-context cue (kept per design),+ alongside the leading search magnifier. */}+ <InputGroupAddon align="inline-end"><GitBranch aria-hidden="true" /></InputGroupAddon></InputGroup>diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex d786f133b..9b24c2e34 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -977,6 +977,7 @@"PPFQ3o": ["Installed \"", ["0"], "\" into ", ["1"]],"PQCdtv": ["\"", ["docName"], "\" doesn't exist."],"PR9FSv": ["Move to the next visual-editor find result."],+ "PRnH8G": ["of ", ["0"]],"PVUn_c": ["Open folder"],"PZt1uN": ["Search files, commands, projects, and AI handoff actions."],"PdA9NZ": [["ahead"], " ahead"],@@ -2169,7 +2170,6 @@"xc4g25": ["Parse failed"],"xeXS4P": ["Or use a starter pack"],"xeiujy": ["Text"],- "xf-VIX": ["worktree of ", ["0"]],"xhlFsx": ["Inherited — set a value here to replace it."],"xiv-dW": ["No files yet."],"xloBjn": ["Relative Path"],@@ -2230,6 +2230,7 @@"yz7wBu": ["Close"],"yzF66j": ["Link"],"yzGPkm": ["Expand graph"],+ "z-lawV": ["worktree"],"z0a2EA": ["Diagram from Mermaid source — flowchart, sequence, class, state, ER, gantt, pie."],"z1uNN0": ["No emoji found."],"z2JdQ-": ["Config sharing unchanged — see details below."],diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex cdcddddc0..273cd8a22 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -4398,6 +4398,11 @@ msgstr "Numbered list of items."msgid "Object"msgstr "Object"+#. placeholder {0}: basenameOf(project.mainRoot ?? '')+#: src/components/NavigatorApp.tsx+msgid "of {0}"+msgstr "of {0}"+#: src/editor/components/Pdf.tsxmsgid "of {totalPages}"msgstr "of {totalPages}"@@ -7212,10 +7217,9 @@ msgstr "Workspace"msgid "Workspace Command Palette"msgstr "Workspace Command Palette"-#. placeholder {0}: basenameOf(project.mainRoot ?? '')#: src/components/NavigatorApp.tsx-msgid "worktree of {0}"-msgstr "worktree of {0}"+msgid "worktree"+msgstr "worktree"#: src/components/CommandPalette.tsxmsgid "worktree of {worktreeOf}"diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex ada925450..0ab37f855 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -977,6 +977,7 @@"PPFQ3o": ["Ĩńśţàĺĺēď \"", ["0"], "\" ĩńţō ", ["1"]],"PQCdtv": ["\"", ["docName"], "\" ďōēśń'ţ ēxĩśţ."],"PR9FSv": ["Ḿōvē ţō ţĥē ńēxţ vĩśũàĺ-ēďĩţōŕ ƒĩńď ŕēśũĺţ."],+ "PRnH8G": ["ōƒ ", ["0"]],"PVUn_c": ["Ōƥēń ƒōĺďēŕ"],"PZt1uN": ["Śēàŕćĥ ƒĩĺēś, ćōḿḿàńďś, ƥŕōĴēćţś, àńď ÀĨ ĥàńďōƒƒ àćţĩōńś."],"PdA9NZ": [["ahead"], " àĥēàď"],@@ -2169,7 +2170,6 @@"xc4g25": ["Ƥàŕśē ƒàĩĺēď"],"xeXS4P": ["Ōŕ ũśē à śţàŕţēŕ ƥàćķ"],"xeiujy": ["Ţēxţ"],- "xf-VIX": ["ŵōŕķţŕēē ōƒ ", ["0"]],"xhlFsx": ["Ĩńĥēŕĩţēď — śēţ à vàĺũē ĥēŕē ţō ŕēƥĺàćē ĩţ."],"xiv-dW": ["Ńō ƒĩĺēś ŷēţ."],"xloBjn": ["Ŕēĺàţĩvē Ƥàţĥ"],@@ -2230,6 +2230,7 @@"yz7wBu": ["Ćĺōśē"],"yzF66j": ["Ĺĩńķ"],"yzGPkm": ["Ēxƥàńď ĝŕàƥĥ"],+ "z-lawV": ["ŵōŕķţŕēē"],"z0a2EA": ["Ďĩàĝŕàḿ ƒŕōḿ Ḿēŕḿàĩď śōũŕćē — ƒĺōŵćĥàŕţ, śēǫũēńćē, ćĺàśś, śţàţē, ĒŔ, ĝàńţţ, ƥĩē."],"z1uNN0": ["Ńō ēḿōĴĩ ƒōũńď."],"z2JdQ-": ["Ćōńƒĩĝ śĥàŕĩńĝ ũńćĥàńĝēď — śēē ďēţàĩĺś ƀēĺōŵ."],diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex 4b22ab14e..57fa95d4b 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -4393,6 +4393,11 @@ msgstr ""msgid "Object"msgstr ""+#. placeholder {0}: basenameOf(project.mainRoot ?? '')+#: src/components/NavigatorApp.tsx+msgid "of {0}"+msgstr ""+#: src/editor/components/Pdf.tsxmsgid "of {totalPages}"msgstr ""@@ -7207,9 +7212,8 @@ msgstr ""msgid "Workspace Command Palette"msgstr ""-#. placeholder {0}: basenameOf(project.mainRoot ?? '')#: src/components/NavigatorApp.tsx-msgid "worktree of {0}"+msgid "worktree"msgstr ""#: src/components/CommandPalette.tsx