Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

PRD-10175 Hold the watchdog worker until main releases its session (#8006)

Andrew Mikofalvy9c474f5d8a89
diff --git a/.changeset/desktop-watchdog-quit-after-freeze.md b/.changeset/desktop-watchdog-quit-after-freeze.md
new file mode 100644
index 000000000..492d24ffa
--- /dev/null
+++ b/.changeset/desktop-watchdog-quit-after-freeze.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge-desktop": patch
+---
+
+The desktop app no longer risks crashing when it quits or restarts its freeze detector right after the window froze.
diff --git a/packages/desktop/src/main/main-thread-watchdog.test.ts b/packages/desktop/src/main/main-thread-watchdog.test.ts
index 9f1c4e8a6..8c9b65db7 100644
--- a/packages/desktop/src/main/main-thread-watchdog.test.ts
+++ b/packages/desktop/src/main/main-thread-watchdog.test.ts
@@ -765,7 +765,7 @@ describe('stallLogFields', () => {
});
describe('the worker witness', () => {
- test('a stop that arrives while the stall session is connected waits for its disconnect, and the next start waits for the exit', async () => {
+ test('a stop that arrives while the stall session is connected waits until main has released the session, and the next start waits for the exit', async () => {
const dir = makeDir();
const lifecycleProbeForTests = createLifecycleProbeForTests();
const probe = new Int32Array(lifecycleProbeForTests);
@@ -799,8 +799,10 @@ describe('the worker witness', () => {
const disconnected = markOf('sessionDisconnected');
const stopCompleted = markOf('stopCompleted');
const exited = markOf('workerExited');
+ const released = markOf('sessionReleased');
expect(stopPosted).toBeGreaterThan(connected);
- expect(disconnected).toBeGreaterThan(stopPosted);
+ expect(released).toBeGreaterThan(stopPosted);
+ expect(disconnected).toBeGreaterThan(released);
expect(stopCompleted).toBeGreaterThan(disconnected);
expect(exited).toBeGreaterThan(stopCompleted);
expect(
@@ -996,15 +998,21 @@ describe('the worker witness', () => {
session.post('Debugger.resume', () => {
session.post('Debugger.disable', () => {
session.disconnect();
- clearInterval(keepAlive);
+ parentPort.postMessage('disconnected');
});
});
}, 2_000);
});
+ parentPort.on('message', (message) => {
+ if (message !== 'exit') return;
+ clearInterval(keepAlive);
+ parentPort.close();
+ });
session.post('Debugger.enable', () => parentPort.postMessage('armed'));
`,
{ eval: true },
);
+ const exited = new Promise((resolve) => developerDebugger.once('exit', resolve));
await new Promise((resolve) => {
developerDebugger.on('message', (message) => {
if (message === 'armed') {
@@ -1014,12 +1022,16 @@ describe('the worker witness', () => {
debugger; // oxlint-disable-line no-debugger -- Pause the test-owned main thread.
return;
}
+ if (message === 'disconnected') {
+ developerDebugger.postMessage('exit');
+ return;
+ }
resolve(message);
});
});
longestMainGapMs = Math.max(longestMainGapMs, Date.now() - lastMainTickAt);
clearInterval(mainTicks);
- await developerDebugger.terminate();
+ await exited;
const read = await pollFor(() => {
const stall = watchdog.readPreviousStall();
return stall.kind === 'record' && stall.value.outcome !== 'pending' ? stall.value : null;
diff --git a/packages/desktop/src/main/main-thread-watchdog.ts b/packages/desktop/src/main/main-thread-watchdog.ts
index 253b46010..fab28a5aa 100644
--- a/packages/desktop/src/main/main-thread-watchdog.ts
+++ b/packages/desktop/src/main/main-thread-watchdog.ts
@@ -191,6 +191,7 @@ export const LIFECYCLE_PROBE_SLOTS = {
sessionDisconnected: 4,
stopCompleted: 5,
workerExited: 6,
+ sessionReleased: 7,
} as const;
type LifecycleProbeMark = Exclude<keyof typeof LIFECYCLE_PROBE_SLOTS, 'sequence'>;
@@ -239,6 +240,7 @@ let stallEpisodeCaptured = false;
let activeSession = null;
let sessionDisconnecting = false;
let disconnectWaiters = [];
+let whenSessionReleased = null;
let stopRequested = false;
let tickTimer = null;
@@ -265,18 +267,17 @@ function disconnectSession(done) {
disconnectWaiters = [];
for (const waiter of waiters) waiter();
};
- try {
- current.post('Debugger.disable', () => {
- try {
- current.disconnect();
- } catch {}
- finish();
- });
- } catch {
+ const disconnectThenAwaitRelease = () => {
try {
current.disconnect();
} catch {}
- finish();
+ whenSessionReleased = finish;
+ parentPort.postMessage({ type: 'session-closed' });
+ };
+ try {
+ current.post('Debugger.disable', disconnectThenAwaitRelease);
+ } catch {
+ disconnectThenAwaitRelease();
}
}
@@ -294,6 +295,12 @@ function stopWorker() {
}
parentPort.on('message', (message) => {
+ if (message === 'session-released') {
+ const released = whenSessionReleased;
+ whenSessionReleased = null;
+ if (released !== null) released();
+ return;
+ }
if (message === 'stop') {
stopWorker();
return;
@@ -414,6 +421,7 @@ function requestStallSnapshot(record) {
fail(enableErr);
return;
}
+ if (activeSession !== session) return;
pauseRequested = true;
session.post('Debugger.pause', (pauseErr) => {
if (pauseErr) fail(pauseErr);
@@ -808,6 +816,11 @@ export function createMainThreadWatchdog(opts: {
snapshot?: unknown;
writeError?: unknown;
};
+ if (type === 'session-closed') {
+ markLifecycle('sessionReleased');
+ worker.postMessage('session-released');
+ return;
+ }
if (type === 'stall-snapshot') {
logStallSnapshot(opts.logger, snapshot, writeError);
return;