romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: honor state dir override in config resolution

Browse Source
This commit is contained in:
Peter Steinberger 2026-01-28 01:08:26 +00:00
parent 4647309c4c
commit f6d0d4dbc2
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/config/paths.test.ts
View File

@ -5,6 +5,7 @@ import { describe, expect, it, vi } from "vitest";
import { import {
resolveDefaultConfigCandidates, resolveDefaultConfigCandidates,
resolveConfigPath,
resolveOAuthDir, resolveOAuthDir,
resolveOAuthPath, resolveOAuthPath,
resolveStateDir, resolveStateDir,
@ -106,4 +107,21 @@ describe("state + config path candidates", () => {
vi.resetModules(); vi.resetModules();
} }
}); });
it("respects state dir overrides when config is missing", async () => {
const root = await fs.mkdtemp(path.join(os.tmpdir(), "moltbot-config-override-"));
try {
const legacyDir = path.join(root, ".clawdbot");
await fs.mkdir(legacyDir, { recursive: true });
const legacyConfig = path.join(legacyDir, "moltbot.json");
await fs.writeFile(legacyConfig, "{}", "utf-8");
const overrideDir = path.join(root, "override");
const env = { MOLTBOT_STATE_DIR: overrideDir } as NodeJS.ProcessEnv;
const resolved = resolveConfigPath(env, overrideDir, () => root);
expect(resolved).toBe(path.join(overrideDir, "moltbot.json"));
} finally {
await fs.rm(root, { recursive: true, force: true });
}
});
}); });

2
src/config/paths.ts
View File

@ -113,6 +113,7 @@ export function resolveConfigPath(
): string { ): string {
const override = env.MOLTBOT_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim(); const override = env.MOLTBOT_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim();
if (override) return resolveUserPath(override); if (override) return resolveUserPath(override);
const stateOverride = env.MOLTBOT_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim();
const candidates = [ const candidates = [
path.join(stateDir, CONFIG_FILENAME), path.join(stateDir, CONFIG_FILENAME),
path.join(stateDir, LEGACY_CONFIG_FILENAME), path.join(stateDir, LEGACY_CONFIG_FILENAME),
@ -125,6 +126,7 @@ export function resolveConfigPath(
} }
}); });
if (existing) return existing; if (existing) return existing;
if (stateOverride) return path.join(stateDir, CONFIG_FILENAME);
const defaultStateDir = resolveStateDir(env, homedir); const defaultStateDir = resolveStateDir(env, homedir);
if (path.resolve(stateDir) === path.resolve(defaultStateDir)) { if (path.resolve(stateDir) === path.resolve(defaultStateDir)) {
return resolveConfigPathCandidate(env, homedir); return resolveConfigPathCandidate(env, homedir);