惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

S
SegmentFault 最新的问题
G
Google Developers Blog
H
Help Net Security
月光博客
月光博客
阮一峰的网络日志
阮一峰的网络日志
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
P
Proofpoint News Feed
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
B
Blog RSS Feed
爱范儿
爱范儿
酷 壳 – CoolShell
酷 壳 – CoolShell
博客园 - 三生石上(FineUI控件)
大猫的无限游戏
大猫的无限游戏
人人都是产品经理
人人都是产品经理
GbyAI
GbyAI
D
Docker
Hugging Face - Blog
Hugging Face - Blog
I
InfoQ
博客园 - 司徒正美
Last Week in AI
Last Week in AI
Microsoft Security Blog
Microsoft Security Blog
美团技术团队
Stack Overflow Blog
Stack Overflow Blog
M
MIT News - Artificial intelligence

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(infra): preserve inherited gateway PID across reparen...
amittell · 2026-06-16 · via Recent Commits to openclaw:main

@@ -155,8 +155,25 @@ function readParentPidFromPs(pid: number, spawnTimeoutMs: number): number | null

155155

* `/proc/<pid>/status` payloads) — there is no reachable override for

156156

* runtime callers to mutate.

157157

*/

158-

export function getSelfAndAncestorPidsSync(spawnTimeoutMs = SPAWN_TIMEOUT_MS): Set<number> {

158+

export function getSelfAndAncestorPidsSync(

159+

spawnTimeoutMs = SPAWN_TIMEOUT_MS,

160+

additionalProtectedPid?: number,

161+

): Set<number> {

159162

const pids = new Set<number>([process.pid]);

163+

// Additional protected PID. The caller passes an inherited gateway service

164+

// PID captured from `OPENCLAW_GATEWAY_SERVICE_PID` BEFORE the current

165+

// process overwrites that env with its own PID. This closes the suicide-

166+

// kill loophole when ancestor walk cannot see the parent gateway because

167+

// the caller was reparented to the supervisor (PID 1 / launchd) between

168+

// spawn and cleanup — e.g. `~/.zshrc` running `(openclaw gateway &)`

169+

// inside a shell snapshot whose parent zsh has already exited.

170+

if (

171+

additionalProtectedPid != null &&

172+

Number.isFinite(additionalProtectedPid) &&

173+

additionalProtectedPid > 0

174+

) {

175+

pids.add(additionalProtectedPid);

176+

}

160177

const immediateParent = getParentPid();

161178

if (!Number.isFinite(immediateParent) || immediateParent <= 0) {

162179

return pids;

@@ -257,12 +274,16 @@ function verifyGatewayPidByArgvSync(pid: number, spawnTimeoutMs: number): boolea

257274

return args != null && isGatewayArgv(args, { allowGatewayBinary: true });

258275

}

259276260-

function parsePidsFromLsofOutput(stdout: string, spawnTimeoutMs: number): number[] {

277+

function parsePidsFromLsofOutput(

278+

stdout: string,

279+

spawnTimeoutMs: number,

280+

additionalProtectedPid?: number,

281+

): number[] {

261282

// Deduplicate: dual-stack listeners (IPv4 + IPv6) cause lsof to emit the

262283

// same PID twice. Return each PID at most once to avoid double-killing.

263284

// Exclude self and ancestors — terminating any ancestor cascade-kills the

264285

// caller via the supervisor, recreating the #68451 restart loop.

265-

const excluded = getSelfAndAncestorPidsSync(spawnTimeoutMs);

286+

const excluded = getSelfAndAncestorPidsSync(spawnTimeoutMs, additionalProtectedPid);

266287

const pids: number[] = [];

267288

for (const entry of parseLsofEntries(stdout)) {

268289

if (excluded.has(entry.pid)) {

@@ -285,8 +306,11 @@ function parsePidsFromLsofOutput(stdout: string, spawnTimeoutMs: number): number

285306

* and its ancestors (same invariant as the lsof path — see

286307

* `getSelfAndAncestorPidsSync`).

287308

*/

288-

function filterVerifiedWindowsGatewayPids(rawPids: number[]): number[] {

289-

const excluded = getSelfAndAncestorPidsSync();

309+

function filterVerifiedWindowsGatewayPids(

310+

rawPids: number[],

311+

additionalProtectedPid?: number,

312+

): number[] {

313+

const excluded = getSelfAndAncestorPidsSync(SPAWN_TIMEOUT_MS, additionalProtectedPid);

290314

return uniqueValues(rawPids)

291315

.filter((pid) => Number.isFinite(pid) && pid > 0 && !excluded.has(pid))

292316

.filter((pid) => {

@@ -298,8 +322,9 @@ function filterVerifiedWindowsGatewayPids(rawPids: number[]): number[] {

298322

function filterVerifiedWindowsGatewayPidsResult(

299323

rawPids: number[],

300324

processArgsResult: (pid: number) => WindowsProcessArgsResult,

325+

additionalProtectedPid?: number,

301326

): WindowsListeningPidsResult {

302-

const excluded = getSelfAndAncestorPidsSync();

327+

const excluded = getSelfAndAncestorPidsSync(SPAWN_TIMEOUT_MS, additionalProtectedPid);

303328

const verified: number[] = [];

304329

for (const pid of uniqueValues(rawPids)) {

305330

if (!Number.isFinite(pid) || pid <= 0 || excluded.has(pid)) {

@@ -316,32 +341,51 @@ function filterVerifiedWindowsGatewayPidsResult(

316341

return { ok: true, pids: verified };

317342

}

318343319-

function findVerifiedWindowsGatewayPidsOnPortSync(port: number): number[] {

320-

return filterVerifiedWindowsGatewayPids(readWindowsListeningPidsOnPortSync(port));

344+

function findVerifiedWindowsGatewayPidsOnPortSync(

345+

port: number,

346+

additionalProtectedPid?: number,

347+

): number[] {

348+

return filterVerifiedWindowsGatewayPids(

349+

readWindowsListeningPidsOnPortSync(port),

350+

additionalProtectedPid,

351+

);

321352

}

322353323-

function findVerifiedWindowsGatewayPidsOnPortResultSync(port: number): WindowsListeningPidsResult {

354+

function findVerifiedWindowsGatewayPidsOnPortResultSync(

355+

port: number,

356+

additionalProtectedPid?: number,

357+

): WindowsListeningPidsResult {

324358

const result = readWindowsListeningPidsResultSync(port);

325359

if (!result.ok) {

326360

return result;

327361

}

328-

return filterVerifiedWindowsGatewayPidsResult(result.pids, (pid) =>

329-

readWindowsProcessArgsResultSync(pid),

362+

return filterVerifiedWindowsGatewayPidsResult(

363+

result.pids,

364+

(pid) => readWindowsProcessArgsResultSync(pid),

365+

additionalProtectedPid,

330366

);

331367

}

332368333369

/**

334370

* Find PIDs of gateway processes listening on the given port using synchronous lsof.

335371

* Returns only PIDs that belong to openclaw gateway processes (not the current process).

372+

*

373+

* `additionalProtectedPid`: see `getSelfAndAncestorPidsSync`. When the caller

374+

* has captured an inherited gateway service PID from

375+

* `OPENCLAW_GATEWAY_SERVICE_PID` (before overwriting it with its own PID),

376+

* pass it through here so the cleanup cannot kill a launchd-managed

377+

* grandparent that became a sibling after the caller was reparented to the

378+

* supervisor.

336379

*/

337380

export function findGatewayPidsOnPortSync(

338381

port: number,

339382

spawnTimeoutMs = SPAWN_TIMEOUT_MS,

383+

additionalProtectedPid?: number,

340384

): number[] {

341385

if (process.platform === "win32") {

342386

// Use the shared Windows port inspection (PowerShell / netstat) with

343387

// command-line verification to find only openclaw gateway processes.

344-

return findVerifiedWindowsGatewayPidsOnPortSync(port);

388+

return findVerifiedWindowsGatewayPidsOnPortSync(port, additionalProtectedPid);

345389

}

346390

const lsof = resolveLsofCommandSync();

347391

const res = spawnSync(lsof, ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-Fpc"], {

@@ -368,7 +412,7 @@ export function findGatewayPidsOnPortSync(

368412

);

369413

return [];

370414

}

371-

return parsePidsFromLsofOutput(res.stdout, spawnTimeoutMs);

415+

return parsePidsFromLsofOutput(res.stdout, spawnTimeoutMs, additionalProtectedPid);

372416

}

373417374418

/**

@@ -585,8 +629,18 @@ function waitForPortFreeSync(port: number): void {

585629

* the port and enter an EADDRINUSE restart loop.

586630

*

587631

* Called before service restart commands to prevent port conflicts.

632+

*

633+

* `additionalProtectedPid`: the caller may pass an inherited gateway service

634+

* PID (captured from `OPENCLAW_GATEWAY_SERVICE_PID` BEFORE the caller

635+

* overwrites that env with its own PID) to keep the running launchd-managed

636+

* gateway out of the kill set even when the ancestor walk has lost the link

637+

* via reparenting. See `getSelfAndAncestorPidsSync` for the suicide-kill

638+

* scenario this closes.

588639

*/

589-

export function cleanStaleGatewayProcessesSync(portOverride?: number): number[] {

640+

export function cleanStaleGatewayProcessesSync(

641+

portOverride?: number,

642+

additionalProtectedPid?: number,

643+

): number[] {

590644

try {

591645

const port =

592646

typeof portOverride === "number" && Number.isFinite(portOverride) && portOverride > 0

@@ -595,14 +649,17 @@ export function cleanStaleGatewayProcessesSync(portOverride?: number): number[]

595649

const stalePids =

596650

process.platform === "win32"

597651

? (() => {

598-

const result = findVerifiedWindowsGatewayPidsOnPortResultSync(port);

652+

const result = findVerifiedWindowsGatewayPidsOnPortResultSync(

653+

port,

654+

additionalProtectedPid,

655+

);

599656

if (result.ok) {

600657

return result.pids;

601658

}

602659

waitForPortFreeSync(port);

603660

return [];

604661

})()

605-

: findGatewayPidsOnPortSync(port);

662+

: findGatewayPidsOnPortSync(port, SPAWN_TIMEOUT_MS, additionalProtectedPid);

606663

if (stalePids.length === 0) {

607664

return [];

608665

}