PR #75210: fix(infra): honor OPENCLAW_STATE_DIR for exec-approvals.json (#75204)

• Repository: openclaw/openclaw
• Author: lonexreb
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/75210

Description (problem / solution / changelog)

Summary

• Problem: with OPENCLAW_STATE_DIR=~/openclaw, exec-approvals.json (and its IPC socket) still landed in ~/.openclaw/. openclaw doctor then warned 'Multiple state directories detected' because two roots existed for one install. Reported in #75204.
• Root cause: resolveExecApprovalsPath() and resolveExecApprovalsSocketPath() in src/infra/exec-approvals.ts hard-coded ~/.openclaw/... and called expandHomePrefix(), which doesn't honor OPENCLAW_STATE_DIR. Other infra paths (device-auth-store.ts, restart-sentinel.ts, push-web.ts, allow-from-store-file.ts) already route through resolveStateDir().
• What changed: the two resolver functions now path.join(resolveStateDir(), ...) so OPENCLAW_STATE_DIR is consistently honored alongside the rest of openclaw's persistent state layout.

Linked Issue

• Closes #75204
• This PR fixes a bug or regression

Test Plan

• pnpm tsgo:core — clean
• pnpm exec oxfmt --check --threads=1 src/infra/exec-approvals.ts — clean

Changed files

• src/infra/exec-approvals.ts (modified, +7/-4)

PR #75222: fix(exec-approvals): honor OPENCLAW_STATE_DIR for exec-approvals.json and .sock

• Repository: openclaw/openclaw
• Author: hclsys
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/75222

Description (problem / solution / changelog)

Summary

exec-approvals.json and exec-approvals.sock were hardcoded to ~/.openclaw regardless of OPENCLAW_STATE_DIR, creating a split-state condition when the env var is set. Users with OPENCLAW_STATE_DIR=~/openclaw saw the active state dir used for sessions and config, but exec-approvals.json still written to ~/.openclaw — triggering openclaw doctor warnings about multiple state directories.

Root cause: DEFAULT_FILE = "~/.openclaw/exec-approvals.json" and DEFAULT_SOCKET = "~/.openclaw/exec-approvals.sock" were expanded with expandHomePrefix rather than resolveStateDir(). Other infra files (device-identity.ts, voicewake.ts, push-web.ts) already correctly use resolveStateDir().

Fix:

• Replace hardcoded constants with path.join(resolveStateDir(), filename) in resolveExecApprovalsPath() and resolveExecApprovalsSocketPath()
• Remove now-unused DEFAULT_FILE / DEFAULT_SOCKET constants
• Update exec-approvals-effective.ts DEFAULT_HOST_PATH to use resolveExecApprovalsPath() instead

Test:

• New regression test: OPENCLAW_STATE_DIR=/custom/state → both paths resolve under /custom/state
• Updated 10 policy test expectations to derive hostSource from resolveExecApprovalsPath() rather than the literal ~/.openclaw string (so tests work on any machine/config)
• 49/49 tests pass

Fixes #75204.

Changed files

• src/infra/exec-approvals-effective.ts (modified, +2/-2)
• src/infra/exec-approvals-policy.test.ts (modified, +13/-10)
• src/infra/exec-approvals.test.ts (modified, +21/-0)
• src/infra/exec-approvals.ts (modified, +5/-4)

PR #75292: fix(exec-approvals): honor OPENCLAW_STATE_DIR for the on-disk file and socket

• Repository: openclaw/openclaw
• Author: Vitalini
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/75292

Description (problem / solution / changelog)

Closes #75204.

Problem

resolveExecApprovalsPath() and resolveExecApprovalsSocketPath() in src/infra/exec-approvals.ts hardcoded ~/.openclaw/exec-approvals.json and ~/.openclaw/exec-approvals.sock and expanded them through expandHomePrefix(). That call only resolves the ~ prefix; it does not consult OPENCLAW_STATE_DIR.

Operators who set OPENCLAW_STATE_DIR=~/openclaw (or any non-default state dir) end up with two state directories on disk:

• The configured ~/openclaw/ holding everything else (sessions, credentials, plugin state, …)
• A stray ~/.openclaw/ containing only exec-approvals.json

openclaw doctor then warns:

Multiple state directories detected. This can split session history.
  - ~/.openclaw
  - ~/openclaw

…while the responsible writer keeps recreating the split on every approval write. The full reproduction is in the linked issue.

Fix

Route both resolver helpers through resolveStateDir(env) from src/config/paths.ts, the same utility every other persisted artifact already uses (sessions, pairing store, push-web subscriptions, state migrations, plugin runtime caches, etc.).

-const DEFAULT_SOCKET = "~/.openclaw/exec-approvals.sock";
-const DEFAULT_FILE = "~/.openclaw/exec-approvals.json";
+const EXEC_APPROVALS_FILENAME = "exec-approvals.json";
+const EXEC_APPROVALS_SOCKET_FILENAME = "exec-approvals.sock";

-export function resolveExecApprovalsPath(): string {
-  return expandHomePrefix(DEFAULT_FILE);
+export function resolveExecApprovalsPath(env: NodeJS.ProcessEnv = process.env): string {
+  return path.join(resolveStateDir(env), EXEC_APPROVALS_FILENAME);
 }

(same shape for the socket helper)

When OPENCLAW_STATE_DIR is unset, resolveStateDir preserves the legacy fallback chain (existing ~/.openclaw, then ~/.clawdbot, then the default new ~/.openclaw), so existing installs see no behavior change.

The two resolver functions now accept an optional env parameter (defaulting to process.env), which keeps every existing call site working unchanged — there are 13 internal callers across exec-approvals.ts, plus the test surfaces in invoke-system-run.test.ts and exec-approvals-store.test.ts. None of them needed to change.

Backward compatibility

The legacy-detection delta is intentional alignment with the rest of the codebase. In practice, every install path creates ~/.openclaw before exec-approvals are ever written, so this doesn't change the on-disk location in normal operation.

Test plan

• New regression test exec-approvals-store.test.ts — "honors OPENCLAW_STATE_DIR for the file and socket paths (regression for #75204)". Sets OPENCLAW_STATE_DIR to a separate dir from OPENCLAW_HOME and asserts both file and socket paths resolve under the configured state dir.
• Existing test still passes — "expands home-prefixed default file and socket paths" sets only OPENCLAW_HOME. With the override absent, resolveStateDir returns <home>/.openclaw, matching the existing assertion.
• Existing afterEach now also cleans up OPENCLAW_STATE_DIR between tests so the new case can't leak into siblings.

Why this is the smallest fix that resolves the issue

The bug is two hardcoded constants. The state-dir resolver already exists, is well-tested, and handles every edge case (env override, home-relative expansion, legacy directory detection, Nix mode, the OPENCLAW_HOME interaction). The fix is to call it. Every alternative — adding a per-helper env-var lookup, exposing a new wrapper, extending expandHomePrefix — would be more code for the same outcome and would diverge from the codebase's standard pattern.

Changed files

• src/infra/exec-approvals-store.test.ts (modified, +24/-0)
• src/infra/exec-approvals.ts (modified, +13/-6)