Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

feat: align macOS File menu with the in-app project switcher (#2247)

Nick Gomez5e854d78a0fe
diff --git a/.changeset/file-menu-project-switcher-parity.md b/.changeset/file-menu-project-switcher-parity.md
new file mode 100644
index 000000000..54d6a3e3d
--- /dev/null
+++ b/.changeset/file-menu-project-switcher-parity.md
@@ -0,0 +1,6 @@
+---
+"@inkeep/open-knowledge-desktop": patch
+"@inkeep/open-knowledge-app": patch
+---
+
+Align the macOS File menu with the in-app project switcher. The File menu's project actions now sit together directly under "New from template…" and read in the same order as the bottom-left switcher: Recent project, New project, Switch project, Open folder. "Create new project…" is renamed "New project…" and the recents submenu is renamed "Recent project" to match the switcher's labels. The switcher's own action order is updated to the same sequence (New project, Switch project, Open folder) so both surfaces are consistent. Wiring, accelerators, and behavior are unchanged.
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 46d2f44ff..bb3c12357 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -365,7 +365,7 @@ function AppBody() {
inert), so the Cmd-, route handler isn't mounted. */}
{!singleFile && <SettingsShortcutHandler />}
{SHOW_INSTALL_SKILL && <InstallInClaudeDesktopTrigger />}
- {/* File → Create New Project… opens CreateProjectDialog here.
+ {/* File → New project… opens CreateProjectDialog here.
Desktop-only — the `new-project` menu action never fires in
the web host, so the dialog stays unmounted there. */}
{desktopBridge ? <CreateProjectMenuTrigger bridge={desktopBridge} /> : null}
diff --git a/packages/app/src/components/ProjectSwitcher.dom.test.tsx b/packages/app/src/components/ProjectSwitcher.dom.test.tsx
index 3bc35e64f..cc556891b 100644
--- a/packages/app/src/components/ProjectSwitcher.dom.test.tsx
+++ b/packages/app/src/components/ProjectSwitcher.dom.test.tsx
@@ -125,17 +125,17 @@ describe('ProjectSwitcher dropdown behavior', () => {
await openMenu();
const menuText = screen.getByTestId('project-switcher-menu').textContent ?? '';
- const openFolderIndex = menuText.indexOf('Open folder');
- const switchProjectIndex = menuText.indexOf('Switch project');
const newProjectIndex = menuText.indexOf('New project');
- expect(openFolderIndex).toBeGreaterThan(-1);
- expect(switchProjectIndex).toBeGreaterThan(openFolderIndex);
- expect(newProjectIndex).toBeGreaterThan(switchProjectIndex);
+ const switchProjectIndex = menuText.indexOf('Switch project');
+ const openFolderIndex = menuText.indexOf('Open folder');
+ expect(newProjectIndex).toBeGreaterThan(-1);
+ expect(switchProjectIndex).toBeGreaterThan(newProjectIndex);
+ expect(openFolderIndex).toBeGreaterThan(switchProjectIndex);
for (const testId of [
- 'project-switcher-open-folder',
- 'project-switcher-switch-project',
'project-switcher-new-project',
+ 'project-switcher-switch-project',
+ 'project-switcher-open-folder',
]) {
expect(screen.getByTestId(testId).querySelector('svg[aria-hidden="true"]')).not.toBeNull();
}
diff --git a/packages/app/src/components/ProjectSwitcher.tsx b/packages/app/src/components/ProjectSwitcher.tsx
index 43ad1a8a0..be3d9d586 100644
--- a/packages/app/src/components/ProjectSwitcher.tsx
+++ b/packages/app/src/components/ProjectSwitcher.tsx
@@ -212,9 +212,9 @@ export function ProjectSwitcher({ bridge }: ProjectSwitcherProps) {
</>
)}
<DropdownMenuSeparator />
- <DropdownMenuItem onSelect={onOpenFolder} data-testid="project-switcher-open-folder">
- <FolderOpen aria-hidden="true" className="text-muted-foreground" />
- <Trans>Open folder</Trans>
+ <DropdownMenuItem onSelect={onCreateProject} data-testid="project-switcher-new-project">
+ <Plus aria-hidden="true" className="text-muted-foreground" />
+ <Trans>New project</Trans>
</DropdownMenuItem>
<DropdownMenuItem
onSelect={onSwitchProject}
@@ -223,9 +223,9 @@ export function ProjectSwitcher({ bridge }: ProjectSwitcherProps) {
<LayoutGrid aria-hidden="true" className="text-muted-foreground" />
<Trans>Switch project</Trans>
</DropdownMenuItem>
- <DropdownMenuItem onSelect={onCreateProject} data-testid="project-switcher-new-project">
- <Plus aria-hidden="true" className="text-muted-foreground" />
- <Trans>New project</Trans>
+ <DropdownMenuItem onSelect={onOpenFolder} data-testid="project-switcher-open-folder">
+ <FolderOpen aria-hidden="true" className="text-muted-foreground" />
+ <Trans>Open folder</Trans>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
diff --git a/packages/core/src/constants/menu-labels.ts b/packages/core/src/constants/menu-labels.ts
index 08edcc776..827a42e55 100644
--- a/packages/core/src/constants/menu-labels.ts
+++ b/packages/core/src/constants/menu-labels.ts
@@ -2,6 +2,8 @@ export const MENU_LABELS = {
newFile: 'New file',
newFolder: 'New folder',
newFromTemplate: 'New from template',
+ newProject: 'New project',
+ openFolder: 'Open folder',
duplicate: 'Duplicate',
rename: 'Rename',
revealInFinder: 'Reveal in Finder',
diff --git a/packages/desktop/src/main/menu.ts b/packages/desktop/src/main/menu.ts
index 889c27c50..aba2c285b 100644
--- a/packages/desktop/src/main/menu.ts
+++ b/packages/desktop/src/main/menu.ts
@@ -138,6 +138,31 @@ export function buildMenuTemplate(deps: MenuDeps): MenuItemConstructorOptions[]
click: () => deps.onNewFromTemplate?.(),
},
{ type: 'separator' },
+ {
+ label: 'Recent project',
+ submenu: recentSubmenu,
+ },
+ {
+ label: `${MENU_LABELS.newProject}\u2026`,
+ enabled: deps.onNewProject !== undefined,
+ click: () => deps.onNewProject?.(),
+ },
+ {
+ label: SWITCH_PROJECT_LABEL_WITH_ELLIPSIS,
+ accelerator: 'CmdOrCtrl+Shift+P',
+ click: () => deps.openNavigator(),
+ },
+ {
+ label: `${MENU_LABELS.openFolder}\u2026`,
+ accelerator: 'CmdOrCtrl+O',
+ click: async () => {
+ const picked = await promptForExistingFolder(deps.dialog);
+ if (picked) {
+ await deps.openProject(picked, 'pick-existing');
+ }
+ },
+ },
+ { type: 'separator' },
{
label: MENU_LABELS.duplicate,
accelerator: 'CmdOrCtrl+D',
@@ -192,32 +217,6 @@ export function buildMenuTemplate(deps: MenuDeps): MenuItemConstructorOptions[]
],
},
{ type: 'separator' },
- {
- label: 'Create new project…',
- enabled: deps.onNewProject !== undefined,
- click: () => deps.onNewProject?.(),
- },
- {
- label: SWITCH_PROJECT_LABEL_WITH_ELLIPSIS,
- accelerator: 'CmdOrCtrl+Shift+P',
- click: () => deps.openNavigator(),
- },
- {
- label: 'Open folder\u2026',
- accelerator: 'CmdOrCtrl+O',
- click: async () => {
- const picked = await promptForExistingFolder(deps.dialog);
- if (picked) {
- await deps.openProject(picked, 'pick-existing');
- }
- },
- },
- { type: 'separator' },
- {
- label: 'Open recent',
- submenu: recentSubmenu,
- },
- { type: 'separator' },
...(deps.reconfigureMcpWiring
? ([
{
diff --git a/packages/desktop/tests/main/menu.test.ts b/packages/desktop/tests/main/menu.test.ts
index 12b7c70ce..67c4f09ae 100644
--- a/packages/desktop/tests/main/menu.test.ts
+++ b/packages/desktop/tests/main/menu.test.ts
@@ -51,7 +51,7 @@ describe('buildMenuTemplate', () => {
test('empty recents → "No recent projects" disabled placeholder', () => {
const deps = makeDeps();
const template = buildMenuTemplate(deps);
- const openRecent = findByLabel(template, 'Open recent');
+ const openRecent = findByLabel(template, 'Recent project');
expect(openRecent).toBeDefined();
const sub = openRecent?.submenu as MenuItemConstructorOptions[] | undefined;
expect(Array.isArray(sub)).toBe(true);
@@ -67,7 +67,7 @@ describe('buildMenuTemplate', () => {
];
const deps = makeDeps({ getRecentProjects: () => recents });
const template = buildMenuTemplate(deps);
- const openRecent = findByLabel(template, 'Open recent');
+ const openRecent = findByLabel(template, 'Recent project');
const sub = openRecent?.submenu as MenuItemConstructorOptions[] | undefined;
expect(sub?.length).toBe(4);
expect(sub?.[0]?.label).toBe('alpha');
@@ -84,7 +84,7 @@ describe('buildMenuTemplate', () => {
}));
const deps = makeDeps({ getRecentProjects: () => recents });
const template = buildMenuTemplate(deps);
- const openRecent = findByLabel(template, 'Open recent');
+ const openRecent = findByLabel(template, 'Recent project');
const sub = openRecent?.submenu as MenuItemConstructorOptions[] | undefined;
expect(sub?.length).toBe(12);
expect(sub?.[0]?.label).toBe('project-0');
@@ -100,7 +100,7 @@ describe('buildMenuTemplate', () => {
openProject,
});
const template = buildMenuTemplate(deps);
- const openRecent = findByLabel(template, 'Open recent');
+ const openRecent = findByLabel(template, 'Recent project');
const sub = openRecent?.submenu as MenuItemConstructorOptions[] | undefined;
const row = sub?.[0];
(row?.click as (() => void) | undefined)?.();
@@ -543,55 +543,67 @@ describe('buildMenuTemplate — File menu state-aware items (US-020 / FR16 + FR1
});
});
-describe('buildMenuTemplate — Create new project… menu item', () => {
+describe('buildMenuTemplate — New project… menu item', () => {
test('renders enabled when onNewProject dep is provided', () => {
const template = buildMenuTemplate(makeDeps({ onNewProject: mock(() => {}) }));
- const item = findByLabel(template, 'Create new project…');
+ const item = findByLabel(template, 'New project…');
expect(item).toBeDefined();
expect(item?.enabled).toBe(true);
});
test('DISABLED when onNewProject dep is omitted (unit-test default = unwired)', () => {
const template = buildMenuTemplate(makeDeps());
- expect(findByLabel(template, 'Create new project…')?.enabled).toBe(false);
+ expect(findByLabel(template, 'New project…')?.enabled).toBe(false);
});
test('enabled regardless of activeTarget scope (project-scope-independent)', () => {
const template = buildMenuTemplate(
makeDeps({ activeTarget: { kind: null }, onNewProject: mock(() => {}) }),
);
- expect(findByLabel(template, 'Create new project…')?.enabled).toBe(true);
+ expect(findByLabel(template, 'New project…')?.enabled).toBe(true);
});
test('click dispatches deps.onNewProject()', () => {
const onNewProject = mock(() => {});
const template = buildMenuTemplate(makeDeps({ onNewProject }));
- const item = findByLabel(template, 'Create new project…');
+ const item = findByLabel(template, 'New project…');
(item?.click as (() => void) | undefined)?.();
expect(onNewProject).toHaveBeenCalledTimes(1);
});
test('click is a safe no-op when onNewProject dep is omitted', () => {
const template = buildMenuTemplate(makeDeps());
- const item = findByLabel(template, 'Create new project…');
+ const item = findByLabel(template, 'New project…');
expect(() => (item?.click as (() => void) | undefined)?.()).not.toThrow();
});
- test('heads the project cluster — appears before Switch project… in the File submenu', () => {
+ test('project section mirrors the ProjectSwitcher order and sits right after New from template…', () => {
const template = buildMenuTemplate(makeDeps({ onNewProject: mock(() => {}) }));
const fileMenu = template.find((t) => t.label === 'File');
const sub = fileMenu?.submenu as MenuItemConstructorOptions[] | undefined;
if (!sub) throw new Error('File submenu missing');
- const createIdx = sub.findIndex((i) => i.label === 'Create new project…');
- const switchIdx = sub.findIndex((i) => i.label === 'Switch project…');
- expect(createIdx).toBeGreaterThanOrEqual(0);
- expect(switchIdx).toBeGreaterThan(createIdx);
+ const idx = (label: string) => sub.findIndex((i) => i.label === label);
+ const newFromTemplateIdx = idx('New from template…');
+ const recentIdx = idx('Recent project');
+ const newProjectIdx = idx('New project…');
+ const switchIdx = idx('Switch project…');
+ const openFolderIdx = idx('Open folder…');
+ const duplicateIdx = idx('Duplicate');
+ expect(newFromTemplateIdx).toBeGreaterThanOrEqual(0);
+ expect(recentIdx).toBeGreaterThan(newFromTemplateIdx);
+ expect(newProjectIdx).toBeGreaterThan(recentIdx);
+ expect(switchIdx).toBeGreaterThan(newProjectIdx);
+ expect(openFolderIdx).toBeGreaterThan(switchIdx);
+ expect(duplicateIdx).toBeGreaterThan(openFolderIdx);
+ expect(newProjectIdx - recentIdx).toBe(1);
+ expect(switchIdx - newProjectIdx).toBe(1);
+ expect(openFolderIdx - switchIdx).toBe(1);
});
test('does NOT reintroduce the ambiguous "New Project…" label (regression guard)', () => {
const template = buildMenuTemplate(makeDeps({ onNewProject: mock(() => {}) }));
expect(findByLabel(template, 'New Project…')).toBeUndefined();
- expect(findByLabel(template, 'Create new project…')).toBeDefined();
+ expect(findByLabel(template, 'New project…')).toBeDefined();
});
});