From 48ad3bbbe6e5db4e4793c64d2125bc2344837be4 Mon Sep 17 00:00:00 2001
From: Azade <azade@hey.com>
Date: Sat, 10 Jan 2026 15:54:03 +0000
Subject: [PATCH] fix: use resolveStateDir() for node-pairing and voicewake
 storage

Both node-pairing.ts and voicewake.ts were using a local defaultBaseDir()
that hardcoded ~/.clawdbot, ignoring CLAWDBOT_STATE_DIR.

This caused nodes/paired.json and settings/voicewake.json to be stored
in ~/.clawdbot instead of the configured state directory.

Fixes the bug where paired nodes config was stored in a different
location than the rest of the gateway state.
---
 src/infra/node-pairing.ts | 8 ++------
 src/infra/voicewake.ts    | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/infra/node-pairing.ts b/src/infra/node-pairing.ts
index e98a2b556..4c762b023 100644
--- a/src/infra/node-pairing.ts
+++ b/src/infra/node-pairing.ts
@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
+import { resolveStateDir } from "../config/paths.js";
 
 export type NodePairingPendingRequest = {
   requestId: string;
@@ -48,12 +48,8 @@ type NodePairingStateFile = {
 
 const PENDING_TTL_MS = 5 * 60 * 1000;
 
-function defaultBaseDir() {
-  return path.join(os.homedir(), ".clawdbot");
-}
-
 function resolvePaths(baseDir?: string) {
-  const root = baseDir ?? defaultBaseDir();
+  const root = baseDir ?? resolveStateDir();
   const dir = path.join(root, "nodes");
   return {
     dir,
diff --git a/src/infra/voicewake.ts b/src/infra/voicewake.ts
index 379c634b0..6ffb3c53f 100644
--- a/src/infra/voicewake.ts
+++ b/src/infra/voicewake.ts
@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
+import { resolveStateDir } from "../config/paths.js";
 
 export type VoiceWakeConfig = {
   triggers: string[];
@@ -10,12 +10,8 @@ export type VoiceWakeConfig = {
 
 const DEFAULT_TRIGGERS = ["clawd", "claude", "computer"];
 
-function defaultBaseDir() {
-  return path.join(os.homedir(), ".clawdbot");
-}
-
 function resolvePath(baseDir?: string) {
-  const root = baseDir ?? defaultBaseDir();
+  const root = baseDir ?? resolveStateDir();
   return path.join(root, "settings", "voicewake.json");
 }