Files
openclaw/src/daemon/systemd-unit.ts
Bob 61f7cea48b fix: kill stuck ACP child processes on startup and harden sessions in discord threads (#33699)
* Gateway: resolve agent.wait for chat.send runs

* Discord: harden ACP thread binding + listener timeout

* ACPX: handle already-exited child wait

* Gateway/Discord: address PR review findings

* Discord: keep ACP error-state thread bindings on startup

* gateway: make agent.wait dedupe bridge event-driven

* discord: harden ACP probe classification and cap startup fan-out

* discord: add cooperative timeout cancellation

* discord: fix startup probe concurrency helper typing

* plugin-sdk: avoid Windows root-alias shard timeout

* plugin-sdk: keep root alias reflection path non-blocking

* discord+gateway: resolve remaining PR review findings

* gateway+discord: fix codex review regressions

* Discord/Gateway: address Codex review findings

* Gateway: keep agent.wait lifecycle active with shared run IDs

* Discord: clean up status reactions on aborted runs

* fix: add changelog note for ACP/Discord startup hardening (#33699) (thanks @dutifulbob)

---------

Co-authored-by: Onur <2453968+osolmaz@users.noreply.github.com>
2026-03-04 10:52:28 +01:00

118 lines
3.2 KiB
TypeScript

import { splitArgsPreservingQuotes } from "./arg-split.js";
import type { GatewayServiceRenderArgs } from "./service-types.js";
const SYSTEMD_LINE_BREAKS = /[\r\n]/;
function assertNoSystemdLineBreaks(value: string, label: string): void {
if (SYSTEMD_LINE_BREAKS.test(value)) {
throw new Error(`${label} cannot contain CR or LF characters.`);
}
}
function systemdEscapeArg(value: string): string {
assertNoSystemdLineBreaks(value, "Systemd unit values");
if (!/[\s"\\]/.test(value)) {
return value;
}
return `"${value.replace(/\\\\/g, "\\\\\\\\").replace(/"/g, '\\\\"')}"`;
}
function renderEnvLines(env: Record<string, string | undefined> | undefined): string[] {
if (!env) {
return [];
}
const entries = Object.entries(env).filter(
([, value]) => typeof value === "string" && value.trim(),
);
if (entries.length === 0) {
return [];
}
return entries.map(([key, value]) => {
const rawValue = value ?? "";
assertNoSystemdLineBreaks(key, "Systemd environment variable names");
assertNoSystemdLineBreaks(rawValue, "Systemd environment variable values");
return `Environment=${systemdEscapeArg(`${key}=${rawValue.trim()}`)}`;
});
}
export function buildSystemdUnit({
description,
programArguments,
workingDirectory,
environment,
}: GatewayServiceRenderArgs): string {
const execStart = programArguments.map(systemdEscapeArg).join(" ");
const descriptionValue = description?.trim() || "OpenClaw Gateway";
assertNoSystemdLineBreaks(descriptionValue, "Systemd Description");
const descriptionLine = `Description=${descriptionValue}`;
const workingDirLine = workingDirectory
? `WorkingDirectory=${systemdEscapeArg(workingDirectory)}`
: null;
const envLines = renderEnvLines(environment);
return [
"[Unit]",
descriptionLine,
"After=network-online.target",
"Wants=network-online.target",
"",
"[Service]",
`ExecStart=${execStart}`,
"Restart=always",
"RestartSec=5",
// Keep service children in the same lifecycle so restarts do not leave
// orphan ACP/runtime workers behind.
"KillMode=control-group",
workingDirLine,
...envLines,
"",
"[Install]",
"WantedBy=default.target",
"",
]
.filter((line) => line !== null)
.join("\n");
}
export function parseSystemdExecStart(value: string): string[] {
return splitArgsPreservingQuotes(value, { escapeMode: "backslash" });
}
export function parseSystemdEnvAssignment(raw: string): { key: string; value: string } | null {
const trimmed = raw.trim();
if (!trimmed) {
return null;
}
const unquoted = (() => {
if (!(trimmed.startsWith('"') && trimmed.endsWith('"'))) {
return trimmed;
}
let out = "";
let escapeNext = false;
for (const ch of trimmed.slice(1, -1)) {
if (escapeNext) {
out += ch;
escapeNext = false;
continue;
}
if (ch === "\\\\") {
escapeNext = true;
continue;
}
out += ch;
}
return out;
})();
const eq = unquoted.indexOf("=");
if (eq <= 0) {
return null;
}
const key = unquoted.slice(0, eq).trim();
if (!key) {
return null;
}
const value = unquoted.slice(eq + 1);
return { key, value };
}