874ff7089c
* 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>
60 lines
2.3 KiB
TypeScript
60 lines
2.3 KiB
TypeScript
import type { sendMessageWhatsApp } from "../channels/web/index.js";
|
|
import type { sendMessageDiscord } from "../discord/send.js";
|
|
import type { sendMessageIMessage } from "../imessage/send.js";
|
|
import type { OutboundSendDeps } from "../infra/outbound/deliver.js";
|
|
import type { sendMessageSignal } from "../signal/send.js";
|
|
import type { sendMessageSlack } from "../slack/send.js";
|
|
import type { sendMessageTelegram } from "../telegram/send.js";
|
|
|
|
export type CliDeps = {
|
|
sendMessageWhatsApp: typeof sendMessageWhatsApp;
|
|
sendMessageTelegram: typeof sendMessageTelegram;
|
|
sendMessageDiscord: typeof sendMessageDiscord;
|
|
sendMessageSlack: typeof sendMessageSlack;
|
|
sendMessageSignal: typeof sendMessageSignal;
|
|
sendMessageIMessage: typeof sendMessageIMessage;
|
|
};
|
|
|
|
export function createDefaultDeps(): CliDeps {
|
|
return {
|
|
sendMessageWhatsApp: async (...args) => {
|
|
const { sendMessageWhatsApp } = await import("../channels/web/index.js");
|
|
return await sendMessageWhatsApp(...args);
|
|
},
|
|
sendMessageTelegram: async (...args) => {
|
|
const { sendMessageTelegram } = await import("../telegram/send.js");
|
|
return await sendMessageTelegram(...args);
|
|
},
|
|
sendMessageDiscord: async (...args) => {
|
|
const { sendMessageDiscord } = await import("../discord/send.js");
|
|
return await sendMessageDiscord(...args);
|
|
},
|
|
sendMessageSlack: async (...args) => {
|
|
const { sendMessageSlack } = await import("../slack/send.js");
|
|
return await sendMessageSlack(...args);
|
|
},
|
|
sendMessageSignal: async (...args) => {
|
|
const { sendMessageSignal } = await import("../signal/send.js");
|
|
return await sendMessageSignal(...args);
|
|
},
|
|
sendMessageIMessage: async (...args) => {
|
|
const { sendMessageIMessage } = await import("../imessage/send.js");
|
|
return await sendMessageIMessage(...args);
|
|
},
|
|
};
|
|
}
|
|
|
|
// Provider docking: extend this mapping when adding new outbound send deps.
|
|
export function createOutboundSendDeps(deps: CliDeps): OutboundSendDeps {
|
|
return {
|
|
sendWhatsApp: deps.sendMessageWhatsApp,
|
|
sendTelegram: deps.sendMessageTelegram,
|
|
sendDiscord: deps.sendMessageDiscord,
|
|
sendSlack: deps.sendMessageSlack,
|
|
sendSignal: deps.sendMessageSignal,
|
|
sendIMessage: deps.sendMessageIMessage,
|
|
};
|
|
}
|
|
|
|
export { logWebSelfId } from "../web/auth-store.js";
|