惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Y
Y Combinator Blog
The GitHub Blog
The GitHub Blog
云风的 BLOG
云风的 BLOG
Engineering at Meta
Engineering at Meta
Google DeepMind News
Google DeepMind News
aimingoo的专栏
aimingoo的专栏
Recent Announcements
Recent Announcements
A
About on SuperTechFans
U
Unit 42
MyScale Blog
MyScale Blog
J
Java Code Geeks
博客园_首页
Blog — PlanetScale
Blog — PlanetScale
D
Docker
Microsoft Azure Blog
Microsoft Azure Blog
博客园 - 司徒正美
量子位
月光博客
月光博客
G
Google Developers Blog
V
V2EX
博客园 - 聂微东
宝玉的分享
宝玉的分享
IT之家
IT之家
Vercel News
Vercel News

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(config): write through single-file includes · opencla...
steipete · 2026-04-23 · via Recent Commits to openclaw:main

@@ -1,10 +1,20 @@

1+

import crypto from "node:crypto";

2+

import fs from "node:fs/promises";

3+

import path from "node:path";

4+

import { isDeepStrictEqual } from "node:util";

5+

import { isPathInside } from "../security/scan-paths.js";

6+

import { isRecord } from "../utils.js";

7+

import { maintainConfigBackups } from "./backup-rotation.js";

8+

import { INCLUDE_KEY } from "./includes.js";

9+

import { createInvalidConfigError, formatInvalidConfigDetails } from "./io.invalid-config.js";

110

import {

211

readConfigFileSnapshotForWrite,

312

resolveConfigSnapshotHash,

413

writeConfigFile,

514

type ConfigWriteOptions,

615

} from "./io.js";

716

import type { ConfigFileSnapshot, OpenClawConfig } from "./types.js";

17+

import { validateConfigObjectWithPlugins } from "./validation.js";

818919

export type ConfigMutationBase = "runtime" | "source";

1020

@@ -35,6 +45,97 @@ function assertBaseHashMatches(snapshot: ConfigFileSnapshot, expectedHash?: stri

3545

return currentHash;

3646

}

374748+

function getChangedTopLevelKeys(base: unknown, next: unknown): string[] {

49+

if (!isRecord(base) || !isRecord(next)) {

50+

return isDeepStrictEqual(base, next) ? [] : ["<root>"];

51+

}

52+

const keys = new Set([...Object.keys(base), ...Object.keys(next)]);

53+

return [...keys].filter((key) => !isDeepStrictEqual(base[key], next[key]));

54+

}

55+56+

function getSingleTopLevelIncludeTarget(params: {

57+

snapshot: ConfigFileSnapshot;

58+

key: string;

59+

}): string | null {

60+

if (!isRecord(params.snapshot.parsed)) {

61+

return null;

62+

}

63+

const authoredSection = params.snapshot.parsed[params.key];

64+

if (!isRecord(authoredSection)) {

65+

return null;

66+

}

67+

const keys = Object.keys(authoredSection);

68+

const includeValue = authoredSection[INCLUDE_KEY];

69+

if (keys.length !== 1 || typeof includeValue !== "string") {

70+

return null;

71+

}

72+73+

const rootDir = path.dirname(params.snapshot.path);

74+

const resolved = path.normalize(

75+

path.isAbsolute(includeValue) ? includeValue : path.resolve(rootDir, includeValue),

76+

);

77+

if (!isPathInside(rootDir, resolved)) {

78+

return null;

79+

}

80+

return resolved;

81+

}

82+83+

async function writeJsonFileAtomic(filePath: string, value: unknown): Promise<void> {

84+

const dir = path.dirname(filePath);

85+

const tmp = path.join(

86+

dir,

87+

`${path.basename(filePath)}.${process.pid}.${crypto.randomUUID()}.tmp`,

88+

);

89+

try {

90+

await fs.mkdir(dir, { recursive: true });

91+

await fs.writeFile(tmp, `${JSON.stringify(value, null, 2)}\n`, {

92+

encoding: "utf-8",

93+

mode: 0o600,

94+

});

95+

await fs.access(filePath).then(

96+

async () => await maintainConfigBackups(filePath, fs),

97+

() => undefined,

98+

);

99+

await fs.rename(tmp, filePath);

100+

await fs.chmod(filePath, 0o600).catch(() => {

101+

// best-effort

102+

});

103+

} catch (err) {

104+

await fs.unlink(tmp).catch(() => {

105+

// best-effort

106+

});

107+

throw err;

108+

}

109+

}

110+111+

async function tryWriteSingleTopLevelIncludeMutation(params: {

112+

snapshot: ConfigFileSnapshot;

113+

nextConfig: OpenClawConfig;

114+

}): Promise<boolean> {

115+

const changedKeys = getChangedTopLevelKeys(params.snapshot.sourceConfig, params.nextConfig);

116+

if (changedKeys.length !== 1 || changedKeys[0] === "<root>") {

117+

return false;

118+

}

119+120+

const key = changedKeys[0];

121+

const includePath = getSingleTopLevelIncludeTarget({ snapshot: params.snapshot, key });

122+

if (!includePath || !isRecord(params.nextConfig) || !(key in params.nextConfig)) {

123+

return false;

124+

}

125+

const nextConfigRecord = params.nextConfig as Record<string, unknown>;

126+127+

const validated = validateConfigObjectWithPlugins(params.nextConfig);

128+

if (!validated.ok) {

129+

throw createInvalidConfigError(

130+

params.snapshot.path,

131+

formatInvalidConfigDetails(validated.issues),

132+

);

133+

}

134+135+

await writeJsonFileAtomic(includePath, nextConfigRecord[key]);

136+

return true;

137+

}

138+38139

export async function replaceConfigFile(params: {

39140

nextConfig: OpenClawConfig;

40141

baseHash?: string;

@@ -47,11 +148,17 @@ export async function replaceConfigFile(params: {

47148

: await readConfigFileSnapshotForWrite();

48149

const { snapshot, writeOptions } = prepared;

49150

const previousHash = assertBaseHashMatches(snapshot, params.baseHash);

50-

await writeConfigFile(params.nextConfig, {

51-

baseSnapshot: snapshot,

52-

...writeOptions,

53-

...params.writeOptions,

151+

const wroteInclude = await tryWriteSingleTopLevelIncludeMutation({

152+

snapshot,

153+

nextConfig: params.nextConfig,

54154

});

155+

if (!wroteInclude) {

156+

await writeConfigFile(params.nextConfig, {

157+

baseSnapshot: snapshot,

158+

...writeOptions,

159+

...params.writeOptions,

160+

});

161+

}

55162

return {

56163

path: snapshot.path,

57164

previousHash,

@@ -74,10 +181,16 @@ export async function mutateConfigFile<T = void>(params: {

74181

const baseConfig = params.base === "runtime" ? snapshot.runtimeConfig : snapshot.sourceConfig;

75182

const draft = structuredClone(baseConfig) as OpenClawConfig;

76183

const result = (await params.mutate(draft, { snapshot, previousHash })) as T | undefined;

77-

await writeConfigFile(draft, {

78-

...writeOptions,

79-

...params.writeOptions,

184+

const wroteInclude = await tryWriteSingleTopLevelIncludeMutation({

185+

snapshot,

186+

nextConfig: draft,

80187

});

188+

if (!wroteInclude) {

189+

await writeConfigFile(draft, {

190+

...writeOptions,

191+

...params.writeOptions,

192+

});

193+

}

81194

return {

82195

path: snapshot.path,

83196

previousHash,