From 24b295041773fc84963188fca5effe684fcc56d3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 15 May 2026 08:28:42 +0100
Subject: [PATCH] test: close sqlite state handles in gateway suites

---
 src/gateway/test-helpers.server.ts | 4 ++++
 test/setup-openclaw-runtime.ts     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/gateway/test-helpers.server.ts b/src/gateway/test-helpers.server.ts
index 8d0e74c0082..3bb9b7e60d9 100644
--- a/src/gateway/test-helpers.server.ts
+++ b/src/gateway/test-helpers.server.ts
@@ -35,6 +35,7 @@ import {
 } from "../routing/session-key.js";
 import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
 import { normalizeOptionalString } from "../shared/string-coerce.js";
+import { closeOpenClawAgentDatabasesForTest } from "../state/openclaw-agent-db.js";
 import { closeOpenClawStateDatabaseForTest } from "../state/openclaw-state-db.js";
 import { resetTaskRegistryForTests } from "../tasks/runtime-internal.js";
 import { resetTaskFlowRegistryForTests } from "../tasks/task-flow-runtime-internal.js";
@@ -241,6 +242,7 @@ async function resetGatewayTestState(options: { uniqueConfigRoot: boolean }) {
   delete process.env.OPENCLAW_GATEWAY_TOKEN;
   resetTaskRegistryForTests({ persist: false });
   resetTaskFlowRegistryForTests({ persist: false });
+  closeOpenClawAgentDatabasesForTest();
   closeOpenClawStateDatabaseForTest();
   const stateDir = process.env.OPENCLAW_STATE_DIR;
   if (stateDir) {
@@ -352,6 +354,8 @@ async function cleanupGatewayTestHome(options: { restoreEnv: boolean }) {
   resetLogger();
   resetTaskRegistryForTests({ persist: false });
   resetTaskFlowRegistryForTests({ persist: false });
+  closeOpenClawAgentDatabasesForTest();
+  closeOpenClawStateDatabaseForTest();
   if (options.restoreEnv) {
     gatewayEnvSnapshot?.restore();
     gatewayEnvSnapshot = undefined;
diff --git a/test/setup-openclaw-runtime.ts b/test/setup-openclaw-runtime.ts
index 8fc0114f509..f9c809d8af8 100644
--- a/test/setup-openclaw-runtime.ts
+++ b/test/setup-openclaw-runtime.ts
@@ -8,6 +8,7 @@ import type { OpenClawConfig } from "../src/config/config.js";
 import type { OutboundSendDeps } from "../src/infra/outbound/deliver.js";
 import type { PluginRegistry } from "../src/plugins/registry.js";
 import { closeOpenClawAgentDatabasesForTest } from "../src/state/openclaw-agent-db.js";
+import { closeOpenClawStateDatabaseForTest } from "../src/state/openclaw-state-db.js";
 import { installSharedTestSetup } from "./setup.shared.js";
 
 installSharedTestSetup();
@@ -363,6 +364,7 @@ afterEach(async () => {
   const { resetContextWindowCacheForTest, resetModelCatalogReadyCacheForTest } =
     await loadWorkerCleanupHelpers();
   closeOpenClawAgentDatabasesForTest();
+  closeOpenClawStateDatabaseForTest();
   resetContextWindowCacheForTest();
   resetModelCatalogReadyCacheForTest();
   await installDefaultPluginRegistry();
@@ -370,4 +372,5 @@ afterEach(async () => {
 
 afterAll(async () => {
   closeOpenClawAgentDatabasesForTest();
+  closeOpenClawStateDatabaseForTest();
 });