Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Fix provider recycle integration readiness (#6465)

Nick Gomez043cb562fe1d
diff --git a/packages/app/tests/integration/disk-ack-missed-frame.test.ts b/packages/app/tests/integration/disk-ack-missed-frame.test.ts
index e8ff4c081..6de06f794 100644
--- a/packages/app/tests/integration/disk-ack-missed-frame.test.ts
+++ b/packages/app/tests/integration/disk-ack-missed-frame.test.ts
@@ -10,6 +10,7 @@ import {
createRestartableServer,
pollDiskContentStable,
pollUntil,
+ refreshServerInfoAndAwaitMismatch,
} from './test-harness';
const MARKER = 'T15-MISSED-FRAME-MARKER-9b2e';
@@ -83,7 +84,8 @@ describe('T15: Missed disk-ack frame recovery via /api/server-info', () => {
server = await server.killAndRestartOnSamePort({ downtimeMs: 300 });
cleanups.unshift(() => server.shutdown());
- await pollUntil(() => pool.getActive()?.provider !== firstProvider, 10_000, 50);
+ await refreshServerInfoAndAwaitMismatch(pool, `http://127.0.0.1:${server.port}`);
+ expect(pool.getActive()?.provider).not.toBe(firstProvider);
await pollUntil(() => pool.getActive()?.provider.isSynced === true, 10_000, 50);
await wait(500);
diff --git a/packages/app/tests/integration/provider-pool-reconnect.test.ts b/packages/app/tests/integration/provider-pool-reconnect.test.ts
index 248de28bc..14baf0a5b 100644
--- a/packages/app/tests/integration/provider-pool-reconnect.test.ts
+++ b/packages/app/tests/integration/provider-pool-reconnect.test.ts
@@ -12,6 +12,7 @@ import {
pollDiskContentStable,
pollUntil,
type RestartableServer,
+ refreshServerInfoAndAwaitMismatch,
seedPoolServerInstanceId,
} from './test-harness';
@@ -194,10 +195,9 @@ describe('ProviderPool reconnects', () => {
server = await server.killAndRestartOnSamePort({ downtimeMs: 4500 });
cleanups.unshift(() => server.shutdown());
- await pollUntil(() => pool.getActive()?.provider !== firstProvider, 10_000, 50);
- await pollUntil(() => pool.getActive()?.provider.isSynced === true, 10_000, 50);
-
+ await refreshServerInfoAndAwaitMismatch(pool, `http://127.0.0.1:${server.port}`);
expect(pool.getActive()?.provider).not.toBe(firstProvider);
+ await pollUntil(() => pool.getActive()?.provider.isSynced === true, 10_000, 50);
const afterRestart = await pollDiskContentStable(
join(server.contentDir, 'test-doc.md'),
diff --git a/packages/app/tests/integration/restart-with-embed-doc.test.ts b/packages/app/tests/integration/restart-with-embed-doc.test.ts
index 225c59b5d..ebcd1aca9 100644
--- a/packages/app/tests/integration/restart-with-embed-doc.test.ts
+++ b/packages/app/tests/integration/restart-with-embed-doc.test.ts
@@ -9,6 +9,7 @@ import {
createRestartableServer,
createTestClient,
pollUntil,
+ refreshServerInfoAndAwaitMismatch,
schema,
seedPoolServerInstanceId,
} from './test-harness';
@@ -76,7 +77,8 @@ describe('restart-with-embed-doc: server restart preserves single PM image with
server = await server.killAndRestartOnSamePort({ downtimeMs: 400 });
cleanups.unshift(() => server.shutdown());
- await pollUntil(() => pool.getActive()?.provider !== previousProvider, 15_000, 50);
+ await refreshServerInfoAndAwaitMismatch(pool, `http://127.0.0.1:${server.port}`);
+ expect(pool.getActive()?.provider).not.toBe(previousProvider);
try {
await pollUntil(
() => {
diff --git a/packages/app/tests/integration/test-harness.ts b/packages/app/tests/integration/test-harness.ts
index 006e42c5c..356ab2d14 100644
--- a/packages/app/tests/integration/test-harness.ts
+++ b/packages/app/tests/integration/test-harness.ts
@@ -60,6 +60,7 @@ import {
import type { ProviderPool } from '../../src/editor/provider-pool';
import { dispatchCC1Stateless, SYSTEM_DOC_NAME } from '../../src/lib/cc1';
import { createSyncedReconnectGate, refreshServerInfo } from '../../src/lib/server-info-refresh';
+import { getServerInstanceId } from '../../src/lib/server-instance-store';
import { getFreePort } from '../free-port.test-helper.ts';
import {
removeAllDuringTeardown,
@@ -641,6 +642,31 @@ export async function pollUntil(
);
}
+export async function refreshServerInfoAndAwaitMismatch(
+ pool: ProviderPool,
+ baseUrl: string,
+): Promise<void> {
+ const res = await fetch(`${baseUrl}/api/server-info`);
+ if (!res.ok) {
+ throw new Error(`refreshServerInfoAndAwaitMismatch: /api/server-info returned ${res.status}`);
+ }
+ const { serverInstanceId } = ServerInfoSuccessSchema.parse(await res.json());
+ await refreshServerInfo(pool, baseUrl);
+ const adopted = getServerInstanceId();
+ if (adopted !== serverInstanceId) {
+ throw new Error(
+ `refreshServerInfoAndAwaitMismatch: refreshServerInfo did not adopt server instance ${serverInstanceId} from ${baseUrl}/api/server-info (store holds ${adopted})`,
+ );
+ }
+ const poolInstanceId = await pool.whenServerInstanceKnown();
+ if (poolInstanceId !== serverInstanceId) {
+ throw new Error(
+ `refreshServerInfoAndAwaitMismatch: pool holds server instance ${poolInstanceId} after refreshServerInfo, expected ${serverInstanceId}`,
+ );
+ }
+ await pool.awaitMismatchSettled();
+}
+
export async function awaitFileWatcherIndexed(
server: TestServer,
docPath: string,