From 6fcce3c27937e6b4bfadf9cb615844535b8272cc Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Sat, 30 May 2026 19:12:04 +0900
Subject: [PATCH] fix(openclaw): batch 18 (3 files)

---
 src/openclaw/dispatcher.ts           | 4 +---
 src/openclaw/index.ts                | 4 +---
 src/openclaw/reply-listener-paths.ts | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/openclaw/dispatcher.ts b/src/openclaw/dispatcher.ts
index 97643958f..0a58d53fe 100644
--- a/src/openclaw/dispatcher.ts
+++ b/src/openclaw/dispatcher.ts
@@ -22,9 +22,7 @@ export function shellEscapeArg(value: string): string {
 
 export function resolveCommandTimeoutMs(
   gatewayTimeout?: number,
-  envTimeoutRaw =
-    process.env.OMO_OPENCLAW_COMMAND_TIMEOUT_MS
-    ?? process.env.OMX_OPENCLAW_COMMAND_TIMEOUT_MS,
+  envTimeoutRaw = process.env.OMO_OPENCLAW_COMMAND_TIMEOUT_MS,
 ): number {
   const parseFinite = (value: unknown): number | undefined => {
     if (typeof value !== "number" || !Number.isFinite(value)) return undefined
diff --git a/src/openclaw/index.ts b/src/openclaw/index.ts
index cf352ab21..6d936700f 100644
--- a/src/openclaw/index.ts
+++ b/src/openclaw/index.ts
@@ -9,9 +9,7 @@ import { getCurrentTmuxSession, captureTmuxPane } from "./tmux"
 import { startReplyListener, stopReplyListener } from "./reply-listener"
 import type { OpenClawConfig, OpenClawContext, OpenClawPayload, WakeResult } from "./types"
 
-const DEBUG =
-  process.env.OMO_OPENCLAW_DEBUG === "1"
-  || process.env.OMX_OPENCLAW_DEBUG === "1"
+const DEBUG = process.env.OMO_OPENCLAW_DEBUG === "1"
 
 function buildWhitelistedContext(context: OpenClawContext): OpenClawContext {
   const result: OpenClawContext = {}
diff --git a/src/openclaw/reply-listener-paths.ts b/src/openclaw/reply-listener-paths.ts
index fc83b4fa7..83b9d9181 100644
--- a/src/openclaw/reply-listener-paths.ts
+++ b/src/openclaw/reply-listener-paths.ts
@@ -9,7 +9,7 @@ function resolveReplyListenerHomeDir(): string {
 }
 
 export function getReplyListenerStateDir(): string {
-  return join(resolveReplyListenerHomeDir(), ".omx", "state")
+  return join(resolveReplyListenerHomeDir(), ".omo", "openclaw", "state")
 }
 
 export function getReplyListenerPidFilePath(): string {