Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Arm idle shutdown after server startup completes (#7519)

Nick Gomezfb43b5b4758b
diff --git a/.changeset/boot-idle-startup-order.md b/.changeset/boot-idle-startup-order.md
new file mode 100644
index 000000000..2a5816afe
--- /dev/null
+++ b/.changeset/boot-idle-startup-order.md
@@ -0,0 +1,6 @@
+---
+"@inkeep/open-knowledge": patch
+"@inkeep/open-knowledge-server": patch
+---
+
+Servers now finish starting before idle shutdown can stop them.
diff --git a/packages/server/src/boot.test.ts b/packages/server/src/boot.test.ts
index 0b8d6ca87..a0d52ff52 100644
--- a/packages/server/src/boot.test.ts
+++ b/packages/server/src/boot.test.ts
@@ -40,14 +40,23 @@ function seedOkScaffold(projectDir: string): void {
const execFileAsync = promisify(execFile);
const TEST_CONFIG = ConfigSchema.parse({});
+const bootHome = vi.hoisted(() => ({ path: undefined as string | undefined }));
+
+vi.mock('node:os', async (importOriginal) => {
+ const os = await importOriginal<typeof import('node:os')>();
+ return { ...os, homedir: () => bootHome.path ?? os.homedir() };
+});
+
let tmpDir: string;
beforeEach(async () => {
tmpDir = await mkdtemp(resolve(tmpdir(), 'ok-boot-test-'));
+ bootHome.path = mkdtempSync(resolve(tmpDir, 'home-'));
});
afterEach(async () => {
await rm(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+ bootHome.path = undefined;
});
describe('bootServer — MissingOkConfigError pre-listen check', () => {
@@ -300,6 +309,60 @@ describe('bootServer — idle-shutdown runs full destroy', () => {
await booted.destroy();
}
});
+
+ test('keeps the listener available when global skill migration is slow', async () => {
+ const projectDir = mkdtempSync(resolve(tmpDir, 'idle-global-skills-'));
+ await execFileAsync('git', ['init', '--initial-branch=main', projectDir]);
+ configureTestGitRepository(projectDir);
+ seedOkScaffold(projectDir);
+
+ if (bootHome.path === undefined) throw new Error('boot home was not initialized');
+ const home = bootHome.path;
+ const storeSkill = resolve(home, '.ok', 'skills', 'valid-name');
+ const globalSkills = resolve(home, '.claude', 'skills');
+ mkdirSync(storeSkill, { recursive: true });
+ mkdirSync(globalSkills, { recursive: true });
+ writeFileSync(
+ resolve(storeSkill, 'SKILL.md'),
+ '---\nname: valid-name\ndescription: A valid store skill.\n---\n# Valid\n',
+ 'utf-8',
+ );
+ for (let index = 0; index < 300; index += 1) {
+ const skillDir = resolve(globalSkills, `global-${index}`);
+ mkdirSync(skillDir, { recursive: true });
+ writeFileSync(
+ resolve(skillDir, 'SKILL.md'),
+ `---\nname: global-${index}\ndescription: A global skill.\n---\n# Global\n`,
+ 'utf-8',
+ );
+ }
+ bootHome.path = home;
+
+ let idleAttachedAfterMigration = false;
+ const booted = await bootServer({
+ host: '127.0.0.1',
+ config: TEST_CONFIG,
+ contentDir: projectDir,
+ port: 0,
+ quiet: true,
+ gitEnabled: false,
+ idleShutdownMs: 50,
+ idleShutdownHandler: (destroyServer) => {
+ idleAttachedAfterMigration = existsSync(resolve(globalSkills, 'valid-name', 'SKILL.md'));
+ return async () => {
+ await destroyServer();
+ };
+ },
+ });
+
+ try {
+ expect(existsSync(resolve(globalSkills, 'valid-name', 'SKILL.md'))).toBe(true);
+ expect(idleAttachedAfterMigration).toBe(true);
+ expect(booted.httpServer.listening).toBe(true);
+ } finally {
+ await booted.destroy();
+ }
+ });
});
describe('bootServer — reactShellDistDir + server.lock ui advertisement', () => {
diff --git a/packages/server/src/boot.ts b/packages/server/src/boot.ts
index b207bbe4a..b558da8d1 100644
--- a/packages/server/src/boot.ts
+++ b/packages/server/src/boot.ts
@@ -572,23 +572,6 @@ async function bootServerInner(
collabClientCounter = attachCollabClientCounter(httpServer);
let idleHandle: IdleShutdownHandle | null = null;
- if (opts.idleShutdownMs !== null) {
- const idleMs = opts.idleShutdownMs ?? DEFAULT_IDLE_THRESHOLD_MS;
- const idleHandler =
- opts.idleShutdownHandler ??
- ((destroyFn) => async () => {
- await destroyFn();
- });
- idleHandle = attachIdleShutdown({
- httpServer,
- counter: collabClientCounter,
- thresholdMs: idleMs,
- log,
- onShutdown: idleHandler(async () => {
- await destroy('idle-shutdown');
- }),
- });
- }
const listenAddresses = [...new Set(effectiveBindAddresses)];
const primaryAddress = listenAddresses[0];
@@ -862,6 +845,24 @@ async function bootServerInner(
);
}
+ if (opts.idleShutdownMs !== null) {
+ const idleMs = opts.idleShutdownMs ?? DEFAULT_IDLE_THRESHOLD_MS;
+ const idleHandler =
+ opts.idleShutdownHandler ??
+ ((destroyFn) => async () => {
+ await destroyFn();
+ });
+ idleHandle = attachIdleShutdown({
+ httpServer,
+ counter: collabClientCounter,
+ thresholdMs: idleMs,
+ log,
+ onShutdown: idleHandler(async () => {
+ await destroy('idle-shutdown');
+ }),
+ });
+ }
+
return {
httpServer,
destroy,