fix(qqbot): use state resolver for credential backups

steipete · steipete · commit 2e97f72a3dcd · 2026-06-02T03:41:50.000-07:00
diff --git a/extensions/qqbot/src/engine/utils/data-paths.test.ts b/extensions/qqbot/src/engine/utils/data-paths.test.ts
@@ -6,6 +6,12 @@ import { getCredentialBackupFile, getLegacyCredentialBackupFile } from "./data-p
 
 const createdStateDirs: string[] = [];
 
+function createTempDir(prefix: string): string {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), prefix));
+  createdStateDirs.push(dir);
+  return dir;
+}
+
 describe("qqbot credential backup paths", () => {
   afterEach(() => {
     vi.unstubAllEnvs();
@@ -15,8 +21,7 @@ describe("qqbot credential backup paths", () => {
   });
 
   it("scopes credential backups to the active OPENCLAW_STATE_DIR", () => {
-    const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "qqbot-state-"));
-    createdStateDirs.push(stateDir);
+    const stateDir = createTempDir("qqbot-state-");
     vi.stubEnv("OPENCLAW_STATE_DIR", stateDir);
 
     expect(getCredentialBackupFile("default")).toBe(
@@ -28,9 +33,8 @@ describe("qqbot credential backup paths", () => {
   });
 
   it("keeps same account IDs isolated across different state directories", () => {
-    const stateDirA = fs.mkdtempSync(path.join(os.tmpdir(), "qqbot-state-a-"));
-    const stateDirB = fs.mkdtempSync(path.join(os.tmpdir(), "qqbot-state-b-"));
-    createdStateDirs.push(stateDirA, stateDirB);
+    const stateDirA = createTempDir("qqbot-state-a-");
+    const stateDirB = createTempDir("qqbot-state-b-");
 
     vi.stubEnv("OPENCLAW_STATE_DIR", stateDirA);
     const gatewayAPath = getCredentialBackupFile("default");
@@ -46,4 +50,25 @@ describe("qqbot credential backup paths", () => {
     );
     expect(gatewayBPath).not.toBe(gatewayAPath);
   });
+
+  it("uses OPENCLAW_HOME for default credential backup state", () => {
+    const homeDir = createTempDir("qqbot-openclaw-home-");
+    vi.stubEnv("OPENCLAW_STATE_DIR", "");
+    vi.stubEnv("OPENCLAW_HOME", homeDir);
+
+    expect(getCredentialBackupFile("default")).toBe(
+      path.join(homeDir, ".openclaw", "qqbot", "data", "credential-backup-default.json"),
+    );
+  });
+
+  it("expands tilde state-dir overrides through the canonical state resolver", () => {
+    const homeDir = createTempDir("qqbot-home-");
+    vi.stubEnv("HOME", homeDir);
+    vi.stubEnv("OPENCLAW_HOME", "");
+    vi.stubEnv("OPENCLAW_STATE_DIR", "~/gateway-a");
+
+    expect(getCredentialBackupFile("default")).toBe(
+      path.join(homeDir, "gateway-a", "qqbot", "data", "credential-backup-default.json"),
+    );
+  });
 });
diff --git a/extensions/qqbot/src/engine/utils/data-paths.ts b/extensions/qqbot/src/engine/utils/data-paths.ts
@@ -11,7 +11,7 @@
  */
 
 import path from "node:path";
-import { getQQBotDataPath, normalizePath } from "./platform.js";
+import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";
 
 /**
  * Normalise an identifier so it is safe to embed in a filename.
@@ -22,12 +22,7 @@ function safeName(id: string): string {
 }
 
 function getCredentialBackupRoot(): string {
-  const stateDir =
-    process.env.OPENCLAW_STATE_DIR?.trim() || process.env.CLAWDBOT_STATE_DIR?.trim();
-  if (stateDir) {
-    return path.join(normalizePath(stateDir), "qqbot", "data");
-  }
-  return getQQBotDataPath("data");
+  return path.join(resolveStateDir(process.env), "qqbot", "data");
 }
 
 // ---- credential backup ----
diff --git a/extensions/qqbot/src/engine/utils/platform-storage-laziness.test.ts b/extensions/qqbot/src/engine/utils/platform-storage-laziness.test.ts
@@ -6,6 +6,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 const createdHomes: string[] = [];
 
 async function useMockHome(homeDir: string): Promise<void> {
+  vi.stubEnv("HOME", homeDir);
   vi.resetModules();
   vi.doMock("node:os", async (importOriginal) => {
     const actual = await importOriginal<typeof import("node:os")>();
@@ -26,6 +27,7 @@ function makeHome(): string {
 describe("qqbot storage laziness", () => {
   afterEach(() => {
     vi.doUnmock("node:os");
+    vi.unstubAllEnvs();
     vi.resetModules();
     for (const home of createdHomes.splice(0)) {
       fs.rmSync(home, { recursive: true, force: true });
