Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Open the Project Navigator when the last window closes (PRD-8950) (#5795)

Andrew Mikofalvy76fb57035ff8
diff --git a/.changeset/last-window-opens-navigator.md b/.changeset/last-window-opens-navigator.md
new file mode 100644
index 000000000..33373725b
--- /dev/null
+++ b/.changeset/last-window-opens-navigator.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge-desktop": patch
+---
+
+On Windows and Linux, closing the last project window now returns to the Project Navigator instead of quitting. To close the app, use File → Exit on Windows or File → Quit on Linux.
diff --git a/.changeset/relaunch-brings-window-forward.md b/.changeset/relaunch-brings-window-forward.md
new file mode 100644
index 000000000..c7e6abb59
--- /dev/null
+++ b/.changeset/relaunch-brings-window-forward.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge-desktop": patch
+---
+
+On Windows and Linux, launching OpenKnowledge while it is already running now brings its window to the front.
diff --git a/knip.config.ts b/knip.config.ts
index 65f0e8807..d3638888e 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -147,11 +147,15 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: ['@types/shell-quote'],
+ ignoreDependencies: [
+ '@types/shell-quote',
+ ],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: ['yjs'],
+ ignoreDependencies: [
+ 'yjs',
+ ],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index a50b00123..4549c74b3 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 6fcdc23f2..4fc2c11f9 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 40b5cdfd6..9f2f6feb6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 93666af70..2a085742b 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 867598d34..878d5196b 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 0970ac12f..4ada3cf26 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index b632185e1..cbe2b705f 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,3 +1,4 @@
+
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index c530ce4ba..89bc9b4d9 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index d3767adc9..a78aeb0e4 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,3 +1,4 @@
+
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index b076f955c..e7cc69c3f 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 7935e35f8..9ddcd0730 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index f4cc8a286..2a597ec3d 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 8fb428b90..01ef76a9f 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,3 +1,4 @@
+
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fc267cbea..fb0ba5a7c 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index bfd7e3109..fa3cfcd86 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 4d3250d3a..8be632ba4 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,3 +1,4 @@
+
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');
diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts
index d41daa519..1580d3549 100644
--- a/packages/desktop/src/main/index.ts
+++ b/packages/desktop/src/main/index.ts
@@ -342,6 +342,7 @@ import {
} from './ipc-handlers.ts';
import { logIpcError, withIpcErrorLogging } from './ipc-log.ts';
import { createDesktopKeepaliveFactory, toKeepaliveLogger } from './keepalive.ts';
+import { decideAllWindowsClosed, decideRelaunchReveal } from './last-window-policy.ts';
import { getBootAmbientCapsFacts, logAmbientCapsPosture } from './linux-ambient-caps.ts';
import {
detectGraphicalAuthCommand,
@@ -560,6 +561,7 @@ import { buildViewMenuStateDeps, EditorViewMenuStateRegistry } from './view-menu
import { applyThemeToWindow, buildNonDarwinChromeOpts } from './window-chrome.ts';
import {
type BrowserWindowLike,
+ bringWindowToFront,
collabUrlFromApiOrigin,
setWindowInstanceLabel,
type UtilityProcessLike,
@@ -996,6 +998,8 @@ function attachSpellcheckMenuToWindow(win: BrowserWindow): void {
});
}
let navigatorWindow: BrowserWindowLike | null = null;
+let lastClosedWasNavigator = false;
+let lastFocusedWindow: BrowserWindow | null = null;
let wm: WindowManager;
let terminalReaper: TerminalReaper | null = null;
let announcedShutdownCause: AppShutdownCause = 'quit';
@@ -1182,6 +1186,7 @@ let rendererRecovery: RendererRecovery | null = null;
let desktopProcessObservability: DesktopProcessObservability | null = null;
let crashSentinelHeartbeat: NodeJS.Timeout | null = null;
let osShutdownNoted = false;
+let sessionEnding = false;
let serverExitRecorder: ServerExitRecorder | null = null;
function getServerExitRecorder(): ServerExitRecorder {
@@ -1500,14 +1505,7 @@ function ensureWindowManager() {
});
return win as unknown as BrowserWindowLike;
},
- /*
- * UPSTREAM(electron/electron#19920): a BrowserWindow.focus() on a
- * backgrounded app reorders within the app without foregrounding it, so
- * bring-to-front needs this app-level activation as well.
- */
- activateApp: () => {
- if (process.platform === 'darwin') app.focus({ steal: true });
- },
+ activateApp: activateAppForBringToFront,
forkUtility: (entry, args, opts) => {
startupWaterfall.mark('serverSpawned');
const child = utilityProcess.fork(entry, args, {
@@ -1652,6 +1650,32 @@ function openNavigator(pendingPayload?: ShareNavigatorPayload) {
});
}
+/*
+ * UPSTREAM(electron/electron#19920): a BrowserWindow.focus() on a
+ * backgrounded app reorders within the app without foregrounding it, so
+ * bring-to-front needs this app-level activation as well.
+ */
+function activateAppForBringToFront(): void {
+ if (process.platform === 'darwin') app.focus({ steal: true });
+}
+
+function revealWindowForRelaunch(): void {
+ const decision = decideRelaunchReveal({
+ lastFocusedWindow,
+ windows: BrowserWindow.getAllWindows(),
+ firstWindowShown,
+ });
+ getLogger('lifecycle').info(
+ { event: 'lifecycle.relaunch-reveal', action: decision.action },
+ 'relaunch without a target',
+ );
+ if (decision.action === 'reveal') {
+ bringWindowToFront(decision.window as unknown as BrowserWindowLike, activateAppForBringToFront);
+ return;
+ }
+ if (decision.action === 'open-navigator') openNavigator();
+}
+
function logAiIntegrationOutcomes(result: ProjectAiIntegrationsResult): number {
const interesting = result.integrations.filter(
(o) =>
@@ -6208,12 +6232,23 @@ function bootPrimaryInstance(): void {
SENTINEL_HEARTBEAT_INTERVAL_MS,
);
crashSentinelHeartbeat.unref();
- powerMonitor.on('shutdown', () => crashDetection?.noteOsShutdown());
+ powerMonitor.on('shutdown', () => {
+ sessionEnding = true;
+ crashDetection?.noteOsShutdown();
+ });
powerMonitor.on('suspend', () => crashDetection?.noteSuspend());
powerMonitor.on('resume', () => crashDetection?.noteResume());
+ app.on('browser-window-focus', (_event, win) => {
+ lastFocusedWindow = win;
+ });
app.on('browser-window-created', (_event, win) => {
desktopProcessObservability?.observeWindow(win);
+ win.prependListener('closed', () => {
+ lastClosedWasNavigator = win === navigatorWindow;
+ if (lastFocusedWindow === win) lastFocusedWindow = null;
+ });
win.on('session-end', (event) => {
+ sessionEnding = true;
if (crashDetection === null || osShutdownNoted) return;
osShutdownNoted = true;
crashDetection.noteOsShutdown(event.reasons);
@@ -6424,6 +6459,7 @@ function bootPrimaryInstance(): void {
return first ? (first as unknown as object) : null;
},
getInitialArgv: () => process.argv,
+ onRelaunchWithoutTarget: revealWindowForRelaunch,
log: {
warn: (obj, msg) => getLogger('url-scheme').warn(obj, msg),
info: (obj, msg) => getLogger('url-scheme').info(obj, msg),
@@ -6984,8 +7020,29 @@ function bootPrimaryInstance(): void {
});
app.on('window-all-closed', () => {
- if (process.platform !== 'darwin') {
+ const action = decideAllWindowsClosed({
+ platform: process.platform,
+ lastClosedWasNavigator,
+ sessionEnding,
+ });
+ getLogger('lifecycle').info(
+ { event: 'lifecycle.all-windows-closed', action, lastClosedWasNavigator, sessionEnding },
+ 'every window closed',
+ );
+ if (action === 'quit') {
app.quit();
+ return;
+ }
+ if (action === 'open-navigator') {
+ try {
+ openNavigator();
+ } catch (err) {
+ getLogger('lifecycle').error(
+ { event: 'lifecycle.all-windows-closed.navigator-failed', err },
+ 'could not open the Project Navigator after the last window closed; quitting',
+ );
+ app.quit();
+ }
}
});
diff --git a/packages/desktop/src/main/last-window-policy.test.ts b/packages/desktop/src/main/last-window-policy.test.ts
new file mode 100644
index 000000000..ae54af22e
--- /dev/null
+++ b/packages/desktop/src/main/last-window-policy.test.ts
@@ -0,0 +1,138 @@
+import { describe, expect, test } from 'vitest';
+import {
+ decideAllWindowsClosed,
+ decideRelaunchReveal,
+ type RelaunchWindowCandidate,
+} from './last-window-policy.ts';
+
+const flagCombinations = [
+ { lastClosedWasNavigator: false, sessionEnding: false },
+ { lastClosedWasNavigator: true, sessionEnding: false },
+ { lastClosedWasNavigator: false, sessionEnding: true },
+ { lastClosedWasNavigator: true, sessionEnding: true },
+];
+
+describe('decideAllWindowsClosed', () => {
+ test.each(flagCombinations)(
+ 'macOS keeps the app running with no windows (Navigator last: $lastClosedWasNavigator, session ending: $sessionEnding)',
+ (flags) => {
+ expect(decideAllWindowsClosed({ platform: 'darwin', ...flags })).toBe('stay');
+ },
+ );
+
+ describe.each<NodeJS.Platform>(['linux', 'win32'])('on %s', (platform) => {
+ test('closing the last project or note window opens the Project Navigator', () => {
+ expect(
+ decideAllWindowsClosed({ platform, lastClosedWasNavigator: false, sessionEnding: false }),
+ ).toBe('open-navigator');
+ });
+
+ test('closing the Navigator when it is the last window quits', () => {
+ expect(
+ decideAllWindowsClosed({ platform, lastClosedWasNavigator: true, sessionEnding: false }),
+ ).toBe('quit');
+ });
+
+ test.each([false, true])(
+ 'quits while the OS session is ending (last closed was the Navigator: %s)',
+ (lastClosedWasNavigator) => {
+ expect(
+ decideAllWindowsClosed({ platform, lastClosedWasNavigator, sessionEnding: true }),
+ ).toBe('quit');
+ },
+ );
+ });
+});
+
+interface FakeWindow extends RelaunchWindowCandidate {
+ name: string;
+}
+
+function fakeWindow(
+ name: string,
+ state: { destroyed?: boolean; visible?: boolean; minimized?: boolean },
+): FakeWindow {
+ return {
+ name,
+ isDestroyed: () => state.destroyed ?? false,
+ isVisible: () => state.visible ?? false,
+ isMinimized: () => state.minimized ?? false,
+ };
+}
+
+describe('decideRelaunchReveal', () => {
+ test('reveals the most recently focused window ahead of other visible windows', () => {
+ const editor = fakeWindow('editor', { visible: true });
+ const note = fakeWindow('note', { visible: true });
+ expect(
+ decideRelaunchReveal({
+ lastFocusedWindow: note,
+ windows: [editor, note],
+ firstWindowShown: true,
+ }),
+ ).toEqual({ action: 'reveal', window: note });
+ });
+
+ test('reveals a minimized most recently focused window', () => {
+ const editor = fakeWindow('editor', { visible: true });
+ const minimized = fakeWindow('minimized', { minimized: true });
+ expect(
+ decideRelaunchReveal({
+ lastFocusedWindow: minimized,
+ windows: [editor, minimized],
+ firstWindowShown: true,
+ }),
+ ).toEqual({ action: 'reveal', window: minimized });
+ });
+
+ test('falls back to the first visible or minimized window when nothing was focused', () => {
+ const loading = fakeWindow('loading', {});
+ const minimized = fakeWindow('minimized', { minimized: true });
+ const editor = fakeWindow('editor', { visible: true });
+ expect(
+ decideRelaunchReveal({
+ lastFocusedWindow: null,
+ windows: [loading, minimized, editor],
+ firstWindowShown: true,
+ }),
+ ).toEqual({ action: 'reveal', window: minimized });
+ });
+
+ test('skips a destroyed or still-hidden focused window in favor of a visible one', () => {
+ const editor = fakeWindow('editor', { visible: true });
+ for (const stale of [
+ fakeWindow('destroyed', { destroyed: true, visible: true }),
+ fakeWindow('hidden', {}),
+ ]) {
+ expect(
+ decideRelaunchReveal({
+ lastFocusedWindow: stale,
+ windows: [editor],
+ firstWindowShown: true,
+ }),
+ ).toEqual({ action: 'reveal', window: editor });
+ }
+ });
+
+ test('does nothing while every window is still hidden behind its show gate', () => {
+ expect(
+ decideRelaunchReveal({
+ lastFocusedWindow: null,
+ windows: [fakeWindow('loading', {})],
+ firstWindowShown: true,
+ }),
+ ).toEqual({ action: 'none' });
+ });
+
+ test('opens the Project Navigator when no window exists after boot', () => {
+ expect(
+ decideRelaunchReveal({ lastFocusedWindow: null, windows: [], firstWindowShown: true }),
+ ).toEqual({ action: 'open-navigator' });
+ });
+
+ test('does nothing when no window exists before the first window has shown', () => {
+ expect(
+ decideRelaunchReveal({ lastFocusedWindow: null, windows: [], firstWindowShown: false }),
+ ).toEqual({ action: 'none' });
+ });
+});
diff --git a/packages/desktop/src/main/last-window-policy.ts b/packages/desktop/src/main/last-window-policy.ts
new file mode 100644
index 000000000..421b6d059
--- /dev/null
+++ b/packages/desktop/src/main/last-window-policy.ts
@@ -0,0 +1,42 @@
+export interface AllWindowsClosedInput {
+ platform: NodeJS.Platform;
+ lastClosedWasNavigator: boolean;
+ sessionEnding: boolean;
+}
+
+export type AllWindowsClosedAction = 'stay' | 'quit' | 'open-navigator';
+
+export function decideAllWindowsClosed(input: AllWindowsClosedInput): AllWindowsClosedAction {
+ if (input.platform === 'darwin') return 'stay';
+ if (input.sessionEnding) return 'quit';
+ if (input.lastClosedWasNavigator) return 'quit';
+ return 'open-navigator';
+}
+
+export interface RelaunchWindowCandidate {
+ isDestroyed(): boolean;
+ isVisible(): boolean;
+ isMinimized(): boolean;
+}
+
+export interface RelaunchRevealInput<W extends RelaunchWindowCandidate> {
+ lastFocusedWindow: W | null;
+ windows: readonly W[];
+ firstWindowShown: boolean;
+}
+
+export type RelaunchRevealDecision<W extends RelaunchWindowCandidate> =
+ | { action: 'reveal'; window: W }
+ | { action: 'open-navigator' }
+ | { action: 'none' };
+
+export function decideRelaunchReveal<W extends RelaunchWindowCandidate>(
+ input: RelaunchRevealInput<W>,
+): RelaunchRevealDecision<W> {
+ const target = [input.lastFocusedWindow, ...input.windows].find(
+ (win): win is W => win !== null && !win.isDestroyed() && (win.isVisible() || win.isMinimized()),
+ );
+ if (target) return { action: 'reveal', window: target };
+ if (input.firstWindowShown && input.windows.length === 0) return { action: 'open-navigator' };
+ return { action: 'none' };
+}
diff --git a/packages/desktop/src/main/url-scheme.argv.test.ts b/packages/desktop/src/main/url-scheme.argv.test.ts
index c6710364e..82e32c2ff 100644
--- a/packages/desktop/src/main/url-scheme.argv.test.ts
+++ b/packages/desktop/src/main/url-scheme.argv.test.ts
@@ -18,6 +18,7 @@ function makeHandler(
const openProject = vi.fn(async (_projectPath: string) => null);
const sendDeepLink = vi.fn();
const infoLog = vi.fn();
+ const onRelaunchWithoutTarget = vi.fn();
const scheduled: Array<() => void> = [];
const control = registerProtocolHandler({
app: {
@@ -33,6 +34,7 @@ function makeHandler(
sendDeepLink,
getAnyReadyWindow: () => null,
getInitialArgv: () => argv,
+ onRelaunchWithoutTarget,
platform: options.platform ?? 'win32',
log: { info: infoLog, warn: vi.fn(), error: vi.fn() },
setTimeout: (cb) => scheduled.push(cb),
@@ -43,6 +45,7 @@ function makeHandler(
openProject,
sendDeepLink,
infoLog,
+ onRelaunchWithoutTarget,
ready: ready.resolve,
secondInstance: (args: readonly string[]) => events.emit('second-instance', {}, args),
runScheduled: () => {
@@ -238,3 +241,41 @@ describe('Windows file-association argv delivery', () => {
},
);
});
+
+describe('relaunch without a target', () => {
+ test.each<NodeJS.Platform>(['win32', 'linux', 'darwin'])(
+ 'asks for an existing window when a second launch on %s names nothing to open',
+ (platform) => {
+ const h = makeHandler(undefined, { platform });
+ h.control.drainQueuedUrls();
+ h.secondInstance(['--original-process-start-time=123', executable, '--inspect=9229']);
+ expect(h.onRelaunchWithoutTarget).toHaveBeenCalledOnce();
+ expect(h.openProject).not.toHaveBeenCalled();
+ expect(h.openEphemeralFile).not.toHaveBeenCalled();
+ },
+ );
+
+ test('routes a second launch that carries a link without asking for a window', () => {
+ const file = documentPath('url-note.md');
+ const h = makeHandler();
+ h.control.drainQueuedUrls();
+ h.secondInstance([executable, `openknowledge://open?file=${encodeURIComponent(file)}`]);
+ expect(h.openEphemeralFile).toHaveBeenCalledExactlyOnceWith(file);
+ expect(h.onRelaunchWithoutTarget).not.toHaveBeenCalled();
+ });
+
+ test('routes a second launch that carries a Windows document without asking for a window', () => {
+ const file = documentPath('notes.md');
+ const h = makeHandler();
+ h.control.drainQueuedUrls();
+ h.secondInstance([executable, file]);
+ expect(h.openEphemeralFile).toHaveBeenCalledExactlyOnceWith(file);
+ expect(h.onRelaunchWithoutTarget).not.toHaveBeenCalled();
+ });
+
+ test('leaves the first launch to boot restore', () => {
+ const h = makeHandler([executable, '--inspect=9229']);
+ h.control.drainQueuedUrls();
+ expect(h.onRelaunchWithoutTarget).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/desktop/src/main/url-scheme.ts b/packages/desktop/src/main/url-scheme.ts
index 464230816..b9b930aaa 100644
--- a/packages/desktop/src/main/url-scheme.ts
+++ b/packages/desktop/src/main/url-scheme.ts
@@ -424,6 +424,7 @@ interface ProtocolHandlerDeps {
getFocusedWindow?(): BrowserWindowHandle | null;
getAnyReadyWindow(): BrowserWindowHandle | null;
getInitialArgv?: () => readonly string[];
+ onRelaunchWithoutTarget?(): void;
setTimeout?: (cb: () => void, ms: number) => unknown;
platform?: NodeJS.Platform;
protocolScheme?: string;
@@ -889,7 +890,7 @@ export function registerProtocolHandler(deps: ProtocolHandlerDeps): ProtocolHand
enqueueOrRoute(webpageURL);
});
- const ingestArgv = (argv: readonly string[]): void => {
+ const ingestArgv = (argv: readonly string[]): number => {
let urlArguments = 0;
let fileArguments = 0;
let unencodableArguments = 0;
@@ -915,10 +916,11 @@ export function registerProtocolHandler(deps: ProtocolHandlerDeps): ProtocolHand
{ argvLength: argv.length, urlArguments, fileArguments, unencodableArguments },
'[receive] action=argv-scan',
);
+ return urlArguments + fileArguments;
};
deps.app.on('second-instance', (_event, argv) => {
- ingestArgv(argv);
+ if (ingestArgv(argv) === 0) deps.onRelaunchWithoutTarget?.();
});
ingestArgv(deps.getInitialArgv?.() ?? []);
diff --git a/packages/desktop/src/main/window-manager.ts b/packages/desktop/src/main/window-manager.ts
index 7ebad7559..b781f9ede 100644
--- a/packages/desktop/src/main/window-manager.ts
+++ b/packages/desktop/src/main/window-manager.ts
@@ -444,6 +444,25 @@ export function signalStopOwnedUtilityForks(
}
}
+export function bringWindowToFront(
+ win: BrowserWindowLike,
+ activateApp: () => void,
+ opts?: { activate?: boolean },
+): void {
+ const activate = opts?.activate ?? true;
+ if (win.isMinimized?.()) win.restore?.();
+ if (activate) {
+ win.show?.();
+ } else if (win.isVisible?.() !== true) {
+ if (win.showInactive !== undefined) win.showInactive();
+ else win.show?.();
+ }
+ const alreadyFrontmost = win.isFocused?.() === true;
+ win.moveTop?.();
+ win.focus();
+ if (activate && !alreadyFrontmost) activateApp();
+}
+
export class WindowManager {
private readonly windowsByPath = new Map<string, ProjectContext>();
@@ -493,18 +512,7 @@ export class WindowManager {
}
private bringToFront(win: BrowserWindowLike, opts?: { activate?: boolean }): void {
- const activate = opts?.activate ?? true;
- if (win.isMinimized?.()) win.restore?.();
- if (activate) {
- win.show?.();
- } else if (win.isVisible?.() !== true) {
- if (win.showInactive !== undefined) win.showInactive();
- else win.show?.();
- }
- const alreadyFrontmost = win.isFocused?.() === true;
- win.moveTop?.();
- win.focus();
- if (activate && !alreadyFrontmost) this.deps.activateApp?.();
+ bringWindowToFront(win, () => this.deps.activateApp?.(), opts);
}
getContextForBrowserWindow(win: BrowserWindowLike): ProjectContext | undefined {
diff --git a/packages/desktop/tests/smoke/_helpers/platform-gate.ts b/packages/desktop/tests/smoke/_helpers/platform-gate.ts
index aa2419d36..8ea74a08d 100644
--- a/packages/desktop/tests/smoke/_helpers/platform-gate.ts
+++ b/packages/desktop/tests/smoke/_helpers/platform-gate.ts
@@ -35,7 +35,7 @@ export const SPEC_PLATFORM_GATES = {
'liveness-watchdog.e2e.ts': ['!PLATFORM_SUPPORTED'],
'mcp-wiring.e2e.ts': ['!PLATFORM_SUPPORTED', 'WINDOWS', "WINDOWS || TARGET.mode === 'packaged'"],
'navigator-close-on-open.e2e.ts': ['!PLATFORM_SUPPORTED'],
- 'navigator-return.e2e.ts': ['!PLATFORM_SUPPORTED'],
+ 'navigator-return.e2e.ts': ['!PLATFORM_SUPPORTED', 'DARWIN'],
'note-window.e2e.ts': ['!PLATFORM_SUPPORTED', '!DARWIN'],
'okf-rule-toggle.e2e.ts': ['!DARWIN'],
'qa-create-new-extended.e2e.ts': ['!PLATFORM_SUPPORTED'],
diff --git a/packages/desktop/tests/smoke/navigator-return.e2e.ts b/packages/desktop/tests/smoke/navigator-return.e2e.ts
index b8fed8172..5a611e675 100644
--- a/packages/desktop/tests/smoke/navigator-return.e2e.ts
+++ b/packages/desktop/tests/smoke/navigator-return.e2e.ts
@@ -14,6 +14,7 @@ import {
import { expect, test } from './_helpers/smoke-test';
const TARGET = resolveDesktopTarget();
+const DARWIN = process.platform === 'darwin';
interface SeededHome {
tmpHome: string;
@@ -209,4 +210,42 @@ test.describe('Project Navigator return-affordance smoke', () => {
.catch(() => null);
expect(stillEditorMode).toBe('editor');
});
+
+ test.describe('on Windows and Linux', () => {
+ test.skip(DARWIN, 'macOS keeps running with no windows; the Dock reopens the Navigator.');
+
+ test('closing the last project window opens the Navigator, and closing the Navigator then quits', async ({
+ captureStderrFor,
+ }) => {
+ const { tmpHome, projectDir } = seedHomeWithLastOpenedProject('last-window');
+ const app = await launchApp(tmpHome);
+ captureStderrFor(app, { home: tmpHome, cleanupDirs: [tmpHome, projectDir] });
+ const appProcess = app.process();
+ const appExited = () => appProcess.exitCode !== null || appProcess.signalCode !== null;
+
+ const editor = await findEditorWindow(app);
+ await expect.poll(() => countEditorWindows(app)).toBe(1);
+ await expect.poll(() => countNavigatorWindows(app)).toBe(0);
+
+ await editor.close();
+
+ const navigatorPage = await findNavigatorWindow(app);
+ await expect
+ .poll(() => countEditorWindows(app), {
+ timeout: 5_000,
+ message: 'editor window did not close',
+ })
+ .toBe(0);
+ expect(appExited()).toBe(false);
+
+ await navigatorPage.close();
+
+ await expect
+ .poll(appExited, {
+ timeout: 30_000,
+ message: 'app kept running after its last window, the Navigator, closed',
+ })
+ .toBe(true);
+ });
+ });
});