Skip to content

Commit 0826306

Browse files
committed
fix: narrow managed web browser reaping
1 parent 36ebd9e commit 0826306

7 files changed

Lines changed: 457 additions & 37 deletions

‎src/daemon/request-router.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export function createRequestHandler(deps: RequestRouterDeps): DaemonInvokeFn {
176176
webProvider:
177177
webProvider ??
178178
(shouldUseDefaultWebProvider(lockedScope)
179-
? createDefaultWebProvider(stateDir)
179+
? createDefaultWebProvider(stateDir, sessionStore)
180180
: undefined),
181181
appLogProvider,
182182
recordingProvider,
@@ -244,14 +244,25 @@ export function createRequestHandler(deps: RequestRouterDeps): DaemonInvokeFn {
244244
}
245245

246246
const createDefaultWebProvider =
247-
(stateDir: string | undefined): WebProviderResolver =>
247+
(stateDir: string | undefined, sessionStore: SessionStore): WebProviderResolver =>
248248
({ req, session }) =>
249-
createAgentBrowserWebProvider({ session: session?.name ?? req.session, stateDir });
249+
createAgentBrowserWebProvider({
250+
session: session?.name ?? req.session,
251+
stateDir,
252+
openWebSessionNames: () => openWebSessionNames(sessionStore),
253+
});
250254

251255
function shouldUseDefaultWebProvider(scope: LockedRequestScope): boolean {
252256
return scope.existingSession?.device.platform === 'web' || scope.req.flags?.platform === 'web';
253257
}
254258

259+
function openWebSessionNames(sessionStore: SessionStore): string[] {
260+
return sessionStore
261+
.toArray()
262+
.filter((session) => session.device.platform === 'web')
263+
.map((session) => session.name);
264+
}
265+
255266
function unauthorizedResponse(): DaemonResponse {
256267
return {
257268
ok: false,
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import assert from 'node:assert/strict';
2+
import fs from 'node:fs';
3+
import os from 'node:os';
4+
import path from 'node:path';
5+
import { beforeEach, test, vi } from 'vitest';
6+
7+
const { cleanupManagedAgentBrowserOrphansMock } = vi.hoisted(() => ({
8+
cleanupManagedAgentBrowserOrphansMock: vi.fn(),
9+
}));
10+
11+
vi.mock('../../platforms/web/agent-browser-lifecycle.ts', async (importOriginal) => {
12+
const actual =
13+
await importOriginal<typeof import('../../platforms/web/agent-browser-lifecycle.ts')>();
14+
return {
15+
...actual,
16+
cleanupManagedAgentBrowserOrphans: cleanupManagedAgentBrowserOrphansMock,
17+
};
18+
});
19+
20+
import { WEB_DESKTOP_DEVICE } from '../../__tests__/test-utils/index.ts';
21+
import { SessionStore } from '../session-store.ts';
22+
import { cleanupWebBrowserOrphansForDaemonStartup } from './daemon-runtime.ts';
23+
import { installFakeManagedAgentBrowser } from '../../platforms/web/__tests__/test-utils.ts';
24+
25+
const mockCleanupManagedAgentBrowserOrphans = vi.mocked(cleanupManagedAgentBrowserOrphansMock);
26+
27+
beforeEach(() => {
28+
mockCleanupManagedAgentBrowserOrphans.mockReset();
29+
});
30+
31+
test('daemon-startup web cleanup passes open web sessions to the reaper', async () => {
32+
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-daemon-cleanup-'));
33+
try {
34+
installFakeManagedAgentBrowser(stateDir);
35+
const sessionStore = new SessionStore(path.join(stateDir, 'sessions'));
36+
sessionStore.set('web-session', {
37+
name: 'web-session',
38+
device: WEB_DESKTOP_DEVICE,
39+
createdAt: Date.now(),
40+
actions: [],
41+
});
42+
43+
await cleanupWebBrowserOrphansForDaemonStartup({ stateDir, sessionStore });
44+
45+
assert.equal(mockCleanupManagedAgentBrowserOrphans.mock.calls.length, 1);
46+
assert.equal(mockCleanupManagedAgentBrowserOrphans.mock.calls[0]?.[1], 'daemon-startup');
47+
assert.deepEqual(mockCleanupManagedAgentBrowserOrphans.mock.calls[0]?.[2], {
48+
openWebSessionNames: ['web-session'],
49+
});
50+
} finally {
51+
fs.rmSync(stateDir, { recursive: true, force: true });
52+
}
53+
});
54+
55+
test('daemon-startup web cleanup does not run when the managed backend is absent', async () => {
56+
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-daemon-cleanup-'));
57+
try {
58+
const sessionStore = new SessionStore(path.join(stateDir, 'sessions'));
59+
60+
await cleanupWebBrowserOrphansForDaemonStartup({ stateDir, sessionStore });
61+
62+
assert.equal(mockCleanupManagedAgentBrowserOrphans.mock.calls.length, 0);
63+
} finally {
64+
fs.rmSync(stateDir, { recursive: true, force: true });
65+
}
66+
});

‎src/daemon/server/daemon-runtime.ts‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,25 +214,11 @@ export async function startDaemonRuntime(
214214
return null;
215215
}
216216

217-
const cleanupWebBrowserOrphans = async (): Promise<void> => {
218-
const status = getManagedAgentBrowserStatus({ stateDir: baseDir });
219-
if (!status.installed) return;
220-
try {
221-
await cleanupManagedAgentBrowserOrphans(status, 'daemon-startup');
222-
} catch (error) {
223-
emitDiagnostic({
224-
level: 'warn',
225-
phase: 'web_agent_browser_orphan_cleanup_failed',
226-
data: { error: error instanceof Error ? error.message : String(error) },
227-
});
228-
}
229-
};
230-
231217
let servers: DaemonServer[] = [];
232218
let socketPort: number | undefined;
233219
let httpPort: number | undefined;
234220
try {
235-
await cleanupWebBrowserOrphans();
221+
await cleanupWebBrowserOrphansForDaemonStartup({ stateDir: baseDir, sessionStore });
236222
const opened = await openDaemonServers();
237223
servers = opened.servers;
238224
socketPort = opened.socketPort;
@@ -316,3 +302,29 @@ export async function startDaemonRuntime(
316302
token,
317303
};
318304
}
305+
306+
export async function cleanupWebBrowserOrphansForDaemonStartup(params: {
307+
stateDir: string;
308+
sessionStore: SessionStore;
309+
}): Promise<void> {
310+
const status = getManagedAgentBrowserStatus({ stateDir: params.stateDir });
311+
if (!status.installed) return;
312+
try {
313+
await cleanupManagedAgentBrowserOrphans(status, 'daemon-startup', {
314+
openWebSessionNames: openWebSessionNames(params.sessionStore),
315+
});
316+
} catch (error) {
317+
emitDiagnostic({
318+
level: 'warn',
319+
phase: 'web_agent_browser_orphan_cleanup_failed',
320+
data: { error: error instanceof Error ? error.message : String(error) },
321+
});
322+
}
323+
}
324+
325+
function openWebSessionNames(sessionStore: SessionStore): string[] {
326+
return sessionStore
327+
.toArray()
328+
.filter((session) => session.device.platform === 'web')
329+
.map((session) => session.name);
330+
}

‎src/platforms/web/agent-browser-lifecycle.test.ts‎

Lines changed: 154 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,27 @@ import assert from 'node:assert/strict';
22
import fs from 'node:fs';
33
import os from 'node:os';
44
import path from 'node:path';
5-
import { test } from 'vitest';
5+
import { afterEach, beforeEach, test, vi } from 'vitest';
6+
7+
const { runCmdMock } = vi.hoisted(() => ({
8+
runCmdMock: vi.fn(),
9+
}));
10+
11+
vi.mock('../../utils/exec.ts', async (importOriginal) => {
12+
const actual = await importOriginal<typeof import('../../utils/exec.ts')>();
13+
return {
14+
...actual,
15+
runCmd: runCmdMock,
16+
withoutCommandExecutorOverride: async <T>(fn: () => Promise<T>) => await fn(),
17+
};
18+
});
19+
620
import {
721
DEFAULT_AGENT_BROWSER_IDLE_TIMEOUT_MS,
822
agentBrowserChromeLaunchMarker,
923
appendAgentDeviceChromeArgs,
24+
cleanupManagedAgentBrowserOrphans,
25+
expandProcessTree,
1026
matchAgentBrowserChromeProcess,
1127
parseHostProcessList,
1228
resolveAgentBrowserIdleTimeoutMs,
@@ -15,6 +31,17 @@ import {
1531
import { getManagedAgentBrowserStatus } from './agent-browser-tool.ts';
1632
import { installFakeManagedAgentBrowser } from './__tests__/test-utils.ts';
1733

34+
const mockRunCmd = vi.mocked(runCmdMock);
35+
36+
beforeEach(() => {
37+
mockRunCmd.mockReset();
38+
});
39+
40+
afterEach(() => {
41+
vi.useRealTimers();
42+
vi.restoreAllMocks();
43+
});
44+
1845
test('managed Chrome launch args include a stable agent-device ownership marker once', () => {
1946
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-life-'));
2047
try {
@@ -106,6 +133,10 @@ test('ownership detection accepts only Chrome-like processes with managed marker
106133
},
107134
status,
108135
);
136+
const broadRuntimeHome = matchAgentBrowserChromeProcess(
137+
{ pid: 15, command: `${status.runtimeHomeDir}/profile-cache/chrome-helper` },
138+
status,
139+
);
109140
const markedNonBrowser = matchAgentBrowserChromeProcess(
110141
{ pid: 14, command: `/bin/sh -c echo ${marker}` },
111142
status,
@@ -114,12 +145,134 @@ test('ownership detection accepts only Chrome-like processes with managed marker
114145
assert.equal(markerMatch?.reason, 'launch-marker');
115146
assert.equal(homeMatch?.reason, 'managed-browser-home');
116147
assert.equal(userChrome, undefined);
148+
assert.equal(broadRuntimeHome, undefined);
117149
assert.equal(markedNonBrowser, undefined);
118150
} finally {
119151
fs.rmSync(stateDir, { recursive: true, force: true });
120152
}
121153
});
122154

155+
test('cleanup skips reaping when the daemon reports open web sessions', async () => {
156+
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-life-'));
157+
try {
158+
installFakeManagedAgentBrowser(stateDir);
159+
const status = getManagedAgentBrowserStatus({ stateDir });
160+
const result = await cleanupManagedAgentBrowserOrphans(status, 'daemon-startup', {
161+
openWebSessionNames: ['default-web'],
162+
});
163+
164+
assert.equal(result.skipped?.reason, 'open-web-session');
165+
assert.deepEqual(result.skipped?.openWebSessionNames, ['default-web']);
166+
assert.equal(mockRunCmd.mock.calls.length, 0);
167+
} finally {
168+
fs.rmSync(stateDir, { recursive: true, force: true });
169+
}
170+
});
171+
172+
test('cleanup skips reaping when managed browser socket activity is recent', async () => {
173+
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-life-'));
174+
const originalIdleTimeout = process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS;
175+
process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS = '60000';
176+
try {
177+
installFakeManagedAgentBrowser(stateDir);
178+
const status = getManagedAgentBrowserStatus({ stateDir });
179+
fs.mkdirSync(status.socketDir, { recursive: true });
180+
fs.writeFileSync(path.join(status.socketDir, 'agent-browser.sock'), '');
181+
182+
const result = await cleanupManagedAgentBrowserOrphans(status, 'daemon-startup');
183+
184+
assert.equal(result.skipped?.reason, 'recent-browser-activity');
185+
assert.equal(mockRunCmd.mock.calls.length, 0);
186+
} finally {
187+
if (originalIdleTimeout === undefined) {
188+
delete process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS;
189+
} else {
190+
process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS = originalIdleTimeout;
191+
}
192+
fs.rmSync(stateDir, { recursive: true, force: true });
193+
}
194+
});
195+
196+
test('process tree expansion includes descendants of matched browser roots', () => {
197+
const expanded = expandProcessTree(
198+
[{ process: { pid: 101, ppid: 1, command: 'chrome' }, reason: 'launch-marker' }],
199+
[
200+
{ pid: 101, ppid: 1, command: 'chrome' },
201+
{ pid: 201, ppid: 101, command: 'Chrome Helper --type=renderer' },
202+
{ pid: 301, ppid: 201, command: 'Chrome Helper --type=gpu' },
203+
{ pid: 999, ppid: 1, command: 'Google Chrome' },
204+
],
205+
);
206+
207+
assert.deepEqual(
208+
expanded.map((processInfo) => processInfo.pid),
209+
[101, 201, 301],
210+
);
211+
});
212+
213+
test('cleanup signals matched browser process trees with TERM then KILL only for live pids', async () => {
214+
vi.useFakeTimers();
215+
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-life-'));
216+
const originalIdleTimeout = process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS;
217+
process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS = '1';
218+
const alivePids = new Set([101, 201, 301, 999]);
219+
const killCalls: Array<{ pid: number; signal: string | number | undefined }> = [];
220+
const killSpy = vi.spyOn(process, 'kill').mockImplementation((pid, signal) => {
221+
const numericPid = Number(pid);
222+
killCalls.push({ pid: numericPid, signal });
223+
if (signal === 'SIGKILL') alivePids.delete(numericPid);
224+
if (signal === 0 && !alivePids.has(numericPid)) {
225+
const error = new Error('not found') as NodeJS.ErrnoException;
226+
error.code = 'ESRCH';
227+
throw error;
228+
}
229+
return true;
230+
});
231+
232+
try {
233+
installFakeManagedAgentBrowser(stateDir);
234+
const status = getManagedAgentBrowserStatus({ stateDir });
235+
const marker = agentBrowserChromeLaunchMarker(status);
236+
mockRunCmd.mockResolvedValue({
237+
stdout: [
238+
` 101 1 /Applications/Chromium.app/Contents/MacOS/Chromium ${marker}`,
239+
' 201 101 /Applications/Chromium.app/Contents/Frameworks/Chromium Helper --type=renderer',
240+
' 301 201 /Applications/Chromium.app/Contents/Frameworks/Chromium Helper --type=gpu',
241+
' 999 1 /Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
242+
].join('\n'),
243+
stderr: '',
244+
exitCode: 0,
245+
});
246+
247+
const cleanup = cleanupManagedAgentBrowserOrphans(status, 'provider-startup');
248+
await vi.advanceTimersByTimeAsync(1_500);
249+
const result = await cleanup;
250+
251+
assert.deepEqual(result.pids, [101]);
252+
assert.deepEqual(result.signalPids, [101, 201, 301]);
253+
assert.deepEqual(
254+
killCalls.filter((call) => call.signal === 'SIGTERM').map((call) => call.pid),
255+
[101, 201, 301],
256+
);
257+
assert.deepEqual(
258+
killCalls.filter((call) => call.signal === 'SIGKILL').map((call) => call.pid),
259+
[101, 201, 301],
260+
);
261+
assert.equal(
262+
killCalls.some((call) => call.pid === 999),
263+
false,
264+
);
265+
assert.equal(killSpy.mock.calls.length > 0, true);
266+
} finally {
267+
if (originalIdleTimeout === undefined) {
268+
delete process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS;
269+
} else {
270+
process.env.AGENT_BROWSER_IDLE_TIMEOUT_MS = originalIdleTimeout;
271+
}
272+
fs.rmSync(stateDir, { recursive: true, force: true });
273+
}
274+
});
275+
123276
test('process summary reports only conservatively owned managed Chrome processes', () => {
124277
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-web-life-'));
125278
try {

0 commit comments

Comments
 (0)