@@ -25,6 +25,12 @@ const configState = vi.hoisted(() => ({
2525cfg: {} as Record<string, unknown>,
2626snapshot: { exists: false } as Record<string, unknown>,
2727}));
28+const recoverConfigFromLastKnownGood = vi.fn<(params?: unknown) => Promise<boolean>>(
29+async (_params?: unknown) => false,
30+);
31+const writeRestartSentinel = vi.fn<(payload?: unknown) => Promise<string>>(
32+async (_payload?: unknown) => "/tmp/restart-sentinel.json",
33+);
2834const controlUiState = vi.hoisted(() => ({
2935root: "/tmp/openclaw-control-ui" as string | null,
3036}));
@@ -33,10 +39,11 @@ const { runtimeErrors, defaultRuntime, resetRuntimeCapture } = createCliRuntimeC
33393440vi.mock("../../config/config.js", () => ({
3541getConfigPath: () => "/tmp/openclaw-test-missing-config.json",
36-loadConfig: () => configState.cfg,
42+readBestEffortConfig: async () => configState.cfg,
3743readConfigFileSnapshot: async () => configState.snapshot,
44+recoverConfigFromLastKnownGood: (params: unknown) => recoverConfigFromLastKnownGood(params),
3845resolveStateDir: () => "/tmp",
39-resolveGatewayPort: () => 18789,
46+resolveGatewayPort: (cfg?: { gateway?: { port?: number } }) => cfg?.gateway?.port ?? 18789,
4047}));
41484249vi.mock("../../gateway/auth.js", () => ({
@@ -90,6 +97,10 @@ vi.mock("../../infra/ports.js", () => ({
9097inspectPortUsage: async () => ({ status: "free" }),
9198}));
9299100+vi.mock("../../infra/restart-sentinel.js", () => ({
101+writeRestartSentinel: (payload: unknown) => writeRestartSentinel(payload),
102+}));
103+93104vi.mock("../../logging/console.js", () => ({
94105setConsoleSubsystemFilter: (filters: string[]) => setConsoleSubsystemFilter(filters),
95106setConsoleTimestampPrefix: () => undefined,
@@ -100,7 +111,9 @@ vi.mock("../../logging/subsystem.js", () => ({
100111info: (message: string) => {
101112gatewayLogMessages.push(message);
102113},
103-warn: () => undefined,
114+warn: (message: string) => {
115+gatewayLogMessages.push(message);
116+},
104117error: () => undefined,
105118}),
106119}));
@@ -144,6 +157,10 @@ describe("gateway run option collisions", () => {
144157configState.snapshot = { exists: false };
145158controlUiState.root = "/tmp/openclaw-control-ui";
146159gatewayLogMessages.length = 0;
160+recoverConfigFromLastKnownGood.mockReset();
161+recoverConfigFromLastKnownGood.mockResolvedValue(false);
162+writeRestartSentinel.mockReset();
163+writeRestartSentinel.mockResolvedValue("/tmp/restart-sentinel.json");
147164startGatewayServer.mockClear();
148165setGatewayWsLogStyle.mockClear();
149166setVerbose.mockClear();
@@ -258,6 +275,119 @@ describe("gateway run option collisions", () => {
258275expect(startGatewayServer).not.toHaveBeenCalled();
259276});
260277278+it("restores last-known-good config before startup when the effective config is invalid", async () => {
279+configState.cfg = {};
280+configState.snapshot = {
281+exists: true,
282+valid: false,
283+path: "/tmp/openclaw-test-missing-config.json",
284+config: {},
285+parsed: null,
286+issues: [{ path: "<root>", message: "JSON5 parse failed" }],
287+legacyIssues: [],
288+};
289+recoverConfigFromLastKnownGood.mockImplementationOnce(async () => {
290+configState.snapshot = {
291+exists: true,
292+valid: true,
293+path: "/tmp/openclaw-test-missing-config.json",
294+config: {
295+gateway: {
296+mode: "local",
297+port: 19170,
298+auth: { mode: "none" },
299+},
300+},
301+parsed: {
302+gateway: {
303+mode: "local",
304+port: 19170,
305+auth: { mode: "none" },
306+},
307+},
308+issues: [],
309+legacyIssues: [],
310+};
311+return true;
312+});
313+314+await runGatewayCli(["gateway", "run", "--allow-unconfigured"]);
315+316+expect(recoverConfigFromLastKnownGood).toHaveBeenCalledWith({
317+snapshot: expect.objectContaining({
318+exists: true,
319+valid: false,
320+}),
321+reason: "gateway-run-invalid-config",
322+});
323+expect(writeRestartSentinel).toHaveBeenCalledWith({
324+kind: "config-auto-recovery",
325+status: "ok",
326+ts: expect.any(Number),
327+message:
328+"Gateway recovered automatically after a failed config change and restored the last known good configuration.",
329+stats: {
330+mode: "config-auto-recovery",
331+reason: "gateway-run-invalid-config",
332+after: { restoredFrom: "last-known-good" },
333+},
334+});
335+expect(gatewayLogMessages).toContain(
336+"gateway: restored invalid effective config from last-known-good backup: /tmp/openclaw-test-missing-config.json",
337+);
338+expect(startGatewayServer).toHaveBeenCalledWith(
339+19170,
340+expect.objectContaining({
341+bind: "loopback",
342+auth: undefined,
343+}),
344+);
345+});
346+347+it("keeps startup recovery non-fatal when writing the recovery notice fails", async () => {
348+configState.cfg = {};
349+configState.snapshot = {
350+exists: true,
351+valid: false,
352+path: "/tmp/openclaw-test-missing-config.json",
353+config: {},
354+parsed: null,
355+issues: [{ path: "<root>", message: "JSON5 parse failed" }],
356+legacyIssues: [],
357+};
358+recoverConfigFromLastKnownGood.mockImplementationOnce(async () => {
359+configState.snapshot = {
360+exists: true,
361+valid: true,
362+path: "/tmp/openclaw-test-missing-config.json",
363+config: {
364+gateway: {
365+mode: "local",
366+},
367+},
368+parsed: {
369+gateway: {
370+mode: "local",
371+},
372+},
373+issues: [],
374+legacyIssues: [],
375+};
376+return true;
377+});
378+writeRestartSentinel.mockRejectedValueOnce(new Error("disk full"));
379+380+await runGatewayCli(["gateway", "run"]);
381+382+expect(startGatewayServer).toHaveBeenCalledWith(
383+18789,
384+expect.objectContaining({ bind: "loopback" }),
385+);
386+expect(gatewayLogMessages).toContain(
387+"gateway: failed to persist config auto-recovery notice: disk full",
388+);
389+});
390+261391it.each(["none", "trusted-proxy"] as const)("accepts --auth %s override", async (mode) => {
262392await runGatewayCli(["gateway", "run", "--auth", mode, "--allow-unconfigured"]);
263393@@ -288,7 +418,12 @@ describe("gateway run option collisions", () => {
288418},
289419},
290420};
291-configState.snapshot = { exists: true, parsed: configState.cfg };
421+configState.snapshot = {
422+exists: true,
423+valid: true,
424+config: configState.cfg,
425+parsed: configState.cfg,
426+};
292427293428await runGatewayCli(["gateway", "run", "--allow-unconfigured"]);
294429此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。