fix: wait for daemon registration during SDK close (fixes #818)

1jehuang · Aug 9, 2026 · Aug 6, 2026 · Aug 6, 2026 · Aug 6, 2026 · Aug 6, 2026
commit 93139fe019ded62a738cf5f9711bbcd40ef0aba1
diff --git a/sdk/typescript/src/launch.ts b/sdk/typescript/src/launch.ts
@@ -349,6 +349,29 @@ function readDaemonPidSync(jcodeHome: string, runtimeDir: string): number | unde
   return undefined;
 }
 
+/** Wait briefly for a newly started daemon to publish its registry entry. */
+async function waitForDaemonPid(
+  jcodeHome: string,
+  runtimeDir: string,
+  timeoutMs = 2000,
+): Promise<number | undefined> {
+  const deadline = Date.now() + timeoutMs;
+  do {
+    const pid = readDaemonPidSync(jcodeHome, runtimeDir);
+    if (pid !== undefined) return pid;
+    await new Promise((resolve) => setTimeout(resolve, 50));
+  } while (Date.now() < deadline);
+  return undefined;
+}
+
+export async function waitForDaemonPidForTest(
+  jcodeHome: string,
+  runtimeDir: string,
+  timeoutMs?: number,
+): Promise<number | undefined> {
+  return waitForDaemonPid(jcodeHome, runtimeDir, timeoutMs);
+}
+
 /**
  * Stop an instance's daemon and wait for it to actually be gone.
  *
@@ -363,7 +386,10 @@ async function stopInstanceDaemon(
   jcodeHome: string,
   runtimeDir: string,
 ): Promise<void> {
-  const pid = readDaemonPidSync(jcodeHome, runtimeDir);
+  // The API socket can become connectable just before the daemon writes its
+  // servers.json entry. close() may therefore run during this small startup
+  // window, so do not silently give up after a single registry read.
+  const pid = await waitForDaemonPid(jcodeHome, runtimeDir);
   if (pid === undefined) return;
 
   const signal = (sig: NodeJS.Signals) => {

diff --git a/sdk/typescript/test/launch.test.ts b/sdk/typescript/test/launch.test.ts
@@ -61,6 +61,24 @@ test("cleanup refuses arbitrary directories even when asked directly", async ()
   fs.rmSync(arbitrary, { recursive: true, force: true });
 });
 
+test("daemon shutdown lookup waits for a delayed registry entry", async () => {
+  const home = fs.mkdtempSync(path.join(os.tmpdir(), "jcode-daemon-race-test-"));
+  const runtimeDir = path.join(home, "run");
+  fs.mkdirSync(runtimeDir);
+  const { waitForDaemonPidForTest } = await import("../dist/launch.js");
+
+  const lookup = waitForDaemonPidForTest(home, runtimeDir, 1000);
+  setTimeout(() => {
+    fs.writeFileSync(
+      path.join(home, "servers.json"),
+      JSON.stringify({ instance: { socket: path.join(runtimeDir, "jcode.sock"), pid: 4242 } }),
+    );
+  }, 100);
+
+  assert.equal(await lookup, 4242);
+  fs.rmSync(home, { recursive: true, force: true });
+});
+
 /** Inheriting must share rotating credentials, not copy them. */
 test("rotating credentials are shared so token refresh stays coherent", () => {
   const sandbox = fs.mkdtempSync(path.join(os.tmpdir(), "jcode-inherit-test-"));