fix(clawsweeper): address review for automerge-openclaw-openclaw-85348 (1)

clawsweeper[bot] · clawsweeper[bot] · commit 1d1fe41c4edc · 2026-05-25T10:47:39.000Z
diff --git a/packages/memory-host-sdk/src/host/embeddings-worker.ts b/packages/memory-host-sdk/src/host/embeddings-worker.ts
@@ -126,6 +126,8 @@ const WORKER_UNSAFE_EXEC_ARGV_OPTION_PREFIXES = [
   "--inspect-port=",
 ];
 
+const WORKER_CLOSE_GRACE_MS = 250;
+
 function resolveWorkerExecArgv(): string[] {
   const args: string[] = [];
   let skipNext = false;
@@ -183,9 +185,21 @@ class LocalEmbeddingWorkerClient {
     if (!child) {
       return;
     }
+    let timeout: NodeJS.Timeout | undefined;
+    const closeRequest = this.send({ type: "close" }).then(() => "closed" as const);
+    const closeTimeout = new Promise<"timeout">((resolve) => {
+      timeout = setTimeout(() => resolve("timeout"), WORKER_CLOSE_GRACE_MS);
+      timeout.unref?.();
+    });
     try {
-      await this.send({ type: "close" });
+      const result = await Promise.race([closeRequest, closeTimeout]);
+      if (result === "timeout") {
+        closeRequest.catch(() => {});
+      }
     } finally {
+      if (timeout) {
+        clearTimeout(timeout);
+      }
       this.shutdownChild();
     }
   }
diff --git a/packages/memory-host-sdk/src/host/embeddings.test.ts b/packages/memory-host-sdk/src/host/embeddings.test.ts
@@ -378,6 +378,71 @@ process.on("message", (message) => {
     await expect(provider.close?.()).resolves.toBeUndefined();
   });
 
+  it("terminates the worker when close runs behind a pending request", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-local-embedding-worker-"));
+    const workerScript = path.join(tempDir, "worker.cjs");
+    const embedStartedPath = path.join(tempDir, "embed-started");
+    await fs.writeFile(
+      workerScript,
+      `
+const fs = require("node:fs");
+const embedStartedPath = ${JSON.stringify(embedStartedPath)};
+let busy = false;
+
+process.on("message", (message) => {
+  if (busy) {
+    return;
+  }
+  if (message.type === "initialize") {
+    process.send({ id: message.id, ok: true });
+    return;
+  }
+  if (message.type === "embedQuery") {
+    busy = true;
+    fs.writeFileSync(embedStartedPath, "1");
+  }
+});
+`,
+      "utf8",
+    );
+    const provider = await createLocalEmbeddingWorkerProvider(
+      {
+        config: {} as never,
+        provider: "local",
+        model: "",
+        fallback: "none",
+      },
+      { workerScriptPath: workerScript },
+    );
+
+    const embedPromise = provider.embedQuery("stuck");
+    const embedError = embedPromise.then(
+      () => undefined,
+      (err) => err,
+    );
+    await expect
+      .poll(async () => {
+        try {
+          await fs.access(embedStartedPath);
+          return true;
+        } catch {
+          return false;
+        }
+      })
+      .toBe(true);
+
+    const closePromise = provider.close?.() ?? Promise.resolve();
+    const closeResult = await Promise.race([
+      closePromise.then(() => "closed" as const),
+      new Promise<"timeout">((resolve) => setTimeout(() => resolve("timeout"), 1_000)),
+    ]);
+
+    expect(closeResult).toBe("closed");
+    await expect(embedError).resolves.toMatchObject({
+      code: LOCAL_EMBEDDING_WORKER_ERROR_CODES.exited,
+    });
+  });
+
   it("does not pass inline-source or inspector exec args to the file-backed worker", async () => {
     const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-local-embedding-worker-"));
     const workerScript = path.join(tempDir, "worker.cjs");
