fix: Found one low-severity diagnostics flag contract issue introduced (#74561)

Co-authored-by: openclaw-clawsweeper[bot] <280122609+openclaw-clawsweeper[bot]@users.noreply.github.com>
This commit is contained in:
clawsweeper[bot]
2026-04-29 14:06:48 -07:00
committed by GitHub
parent 0e5d3cb0e5
commit 6fb729a451
3 changed files with 48 additions and 13 deletions

View File

@@ -18,17 +18,29 @@ describe("resolveDiagnosticFlags", () => {
expect(resolveDiagnosticFlags(cfg, env)).toEqual(["telegram.http", "cache.*", "foo"]);
});
it("treats false-like env values as no extra flags", () => {
it("treats blank env values as no extra flags", () => {
const cfg = {
diagnostics: { flags: ["telegram.http"] },
} as OpenClawConfig;
for (const raw of ["0", "false", "off", "none", " "]) {
expect(
resolveDiagnosticFlags(cfg, {
OPENCLAW_DIAGNOSTICS: " ",
} as NodeJS.ProcessEnv),
).toEqual(["telegram.http"]);
});
it("treats false-like env values as disable overrides", () => {
const cfg = {
diagnostics: { flags: ["telegram.http"] },
} as OpenClawConfig;
for (const raw of ["0", "false", "off", "none"]) {
expect(
resolveDiagnosticFlags(cfg, {
OPENCLAW_DIAGNOSTICS: raw,
} as NodeJS.ProcessEnv),
).toEqual(["telegram.http"]);
).toEqual([]);
}
});
});

View File

@@ -3,25 +3,33 @@ import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
const DIAGNOSTICS_ENV = "OPENCLAW_DIAGNOSTICS";
function parseEnvFlags(raw?: string): string[] {
type ParsedEnvFlags = {
flags: string[];
disablesAll: boolean;
};
function parseEnvFlags(raw?: string): ParsedEnvFlags {
if (!raw) {
return [];
return { flags: [], disablesAll: false };
}
const trimmed = raw.trim();
const lowered = normalizeLowercaseStringOrEmpty(trimmed);
if (!lowered) {
return [];
return { flags: [], disablesAll: false };
}
if (["0", "false", "off", "none"].includes(lowered)) {
return [];
return { flags: [], disablesAll: true };
}
if (["1", "true", "all", "*"].includes(lowered)) {
return ["*"];
return { flags: ["*"], disablesAll: false };
}
return trimmed
.split(/[,\s]+/)
.map((value) => normalizeLowercaseStringOrEmpty(value))
.filter(Boolean);
return {
flags: trimmed
.split(/[,\s]+/)
.map((value) => normalizeLowercaseStringOrEmpty(value))
.filter(Boolean),
disablesAll: false,
};
}
function uniqueFlags(flags: string[]): string[] {
@@ -44,7 +52,10 @@ export function resolveDiagnosticFlags(
): string[] {
const configFlags = Array.isArray(cfg?.diagnostics?.flags) ? cfg?.diagnostics?.flags : [];
const envFlags = parseEnvFlags(env[DIAGNOSTICS_ENV]);
return uniqueFlags([...configFlags, ...envFlags]);
if (envFlags.disablesAll) {
return [];
}
return uniqueFlags([...configFlags, ...envFlags.flags]);
}
export function matchesDiagnosticFlag(flag: string, enabledFlags: string[]): boolean {

View File

@@ -86,6 +86,18 @@ describe("diagnostics timeline", () => {
).toBe(false);
});
it("lets false-like env diagnostics disable config-enabled timeline output", async () => {
const { env } = await createTimelineEnv();
const configWithTimeline = { diagnostics: { flags: ["timeline"] } } as OpenClawConfig;
expect(
isDiagnosticsTimelineEnabled({
config: configWithTimeline,
env: { ...env, OPENCLAW_DIAGNOSTICS: "0" },
}),
).toBe(false);
});
it("writes JSONL diagnostic events with the stable envelope", async () => {
const { env, path } = await createTimelineEnv();