mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-13 11:00:50 +00:00
* fix: ensure CLI exits after command completion The CLI process would hang indefinitely after commands like `openclaw gateway restart` completed successfully. Two root causes: 1. `runCli()` returned without calling `process.exit()` after `program.parseAsync()` resolved, and Commander.js does not force-exit the process. 2. `daemon-cli/register.ts` eagerly called `createDefaultDeps()` which imported all messaging-provider modules, creating persistent event-loop handles that prevented natural Node exit. Changes: - Add `flushAndExit()` helper that drains stdout/stderr before calling `process.exit()`, preventing truncated piped output in CI/scripts. - Call `flushAndExit()` after both `tryRouteCli()` and `program.parseAsync()` resolve. - Remove unnecessary `void createDefaultDeps()` from daemon-cli registration — daemon lifecycle commands never use messaging deps. - Make `serveAcpGateway()` return a promise that resolves on intentional shutdown (SIGINT/SIGTERM), so `openclaw acp` blocks `parseAsync` for the bridge lifetime and exits cleanly on signal. - Handle the returned promise in the standalone main-module entry point to avoid unhandled rejections. Fixes #12904 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: refactor CLI lifecycle and lazy outbound deps (#12906) (thanks @DrCrinkle) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
50 lines
1.4 KiB
TypeScript
50 lines
1.4 KiB
TypeScript
import process from "node:process";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const tryRouteCliMock = vi.hoisted(() => vi.fn());
|
|
const loadDotEnvMock = vi.hoisted(() => vi.fn());
|
|
const normalizeEnvMock = vi.hoisted(() => vi.fn());
|
|
const ensurePathMock = vi.hoisted(() => vi.fn());
|
|
const assertRuntimeMock = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("./route.js", () => ({
|
|
tryRouteCli: tryRouteCliMock,
|
|
}));
|
|
|
|
vi.mock("../infra/dotenv.js", () => ({
|
|
loadDotEnv: loadDotEnvMock,
|
|
}));
|
|
|
|
vi.mock("../infra/env.js", () => ({
|
|
normalizeEnv: normalizeEnvMock,
|
|
}));
|
|
|
|
vi.mock("../infra/path-env.js", () => ({
|
|
ensureOpenClawCliOnPath: ensurePathMock,
|
|
}));
|
|
|
|
vi.mock("../infra/runtime-guard.js", () => ({
|
|
assertSupportedRuntime: assertRuntimeMock,
|
|
}));
|
|
|
|
const { runCli } = await import("./run-main.js");
|
|
|
|
describe("runCli exit behavior", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("does not force process.exit after successful routed command", async () => {
|
|
tryRouteCliMock.mockResolvedValueOnce(true);
|
|
const exitSpy = vi.spyOn(process, "exit").mockImplementation(((code?: number) => {
|
|
throw new Error(`unexpected process.exit(${String(code)})`);
|
|
}) as typeof process.exit);
|
|
|
|
await runCli(["node", "openclaw", "status"]);
|
|
|
|
expect(tryRouteCliMock).toHaveBeenCalledWith(["node", "openclaw", "status"]);
|
|
expect(exitSpy).not.toHaveBeenCalled();
|
|
exitSpy.mockRestore();
|
|
});
|
|
});
|