Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(browser): 通过 CDP 正常关闭 Windows 浏览器

Dash9750d5567d98
diff --git a/packages/browser-control-runtime/src/__tests__/chrome-stop.test.ts b/packages/browser-control-runtime/src/__tests__/chrome-stop.test.ts
index 373844d50f..0c14e9ca07 100644
--- a/packages/browser-control-runtime/src/__tests__/chrome-stop.test.ts
+++ b/packages/browser-control-runtime/src/__tests__/chrome-stop.test.ts
@@ -1,11 +1,33 @@
import type { ChildProcessWithoutNullStreams } from "node:child_process";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { withCdpSocket } from "../_generated/extension/src/browser/cdp.helpers.js";
+import { readChromeVersion } from "../_generated/extension/src/browser/chrome.diagnostics.js";
import {
stopOpenClawChrome,
type RunningChrome,
} from "../_generated/extension/src/browser/chrome.js";
+vi.mock(
+ "../_generated/extension/src/browser/cdp.helpers.js",
+ async (importOriginal) => ({
+ ...(await importOriginal<
+ typeof import("../_generated/extension/src/browser/cdp.helpers.js")
+ >()),
+ withCdpSocket: vi.fn(),
+ }),
+);
+vi.mock(
+ "../_generated/extension/src/browser/chrome.diagnostics.js",
+ async (importOriginal) => ({
+ ...(await importOriginal<
+ typeof import("../_generated/extension/src/browser/chrome.diagnostics.js")
+ >()),
+ readChromeVersion: vi.fn(),
+ }),
+);
+
/**
* Regression: stop treated ChildProcess.killed (signal sent) as process exit,
* immediately SIGKILLing Chrome before it could flush login data. Existing
@@ -35,7 +57,16 @@ function runningChrome(alreadySignalled = false) {
return { running, proc, release };
}
-afterEach(() => vi.useRealTimers());
+beforeEach(() => {
+ vi.stubGlobal("process", { ...process, platform: "linux" });
+ vi.mocked(readChromeVersion).mockReset();
+ vi.mocked(withCdpSocket).mockReset();
+});
+
+afterEach(() => {
+ vi.useRealTimers();
+ vi.unstubAllGlobals();
+});
describe("managed Chrome shutdown", () => {
it.each([false, true])(
@@ -81,4 +112,56 @@ describe("managed Chrome shutdown", () => {
expect(proc.kill).not.toHaveBeenCalled();
expect(release).toHaveBeenCalledOnce();
});
+
+ // Windows SIGTERM is a force-kill too. Browser.close must precede waiting,
+ // and CDP loss must not trigger a signal while Chrome flushes its profile.
+ it("closes Windows Chrome through CDP and waits for its actual exit", async () => {
+ vi.stubGlobal("process", { ...process, platform: "win32" });
+ vi.useFakeTimers();
+ const { running, proc, release } = runningChrome();
+ const send = vi.fn().mockResolvedValue({});
+ vi.mocked(readChromeVersion).mockResolvedValue({
+ webSocketDebuggerUrl: "ws://127.0.0.1:18800/devtools/browser/fake",
+ });
+ vi.mocked(withCdpSocket).mockImplementation(async (_url, fn) => fn(send));
+ const stopping = stopOpenClawChrome(running, 300);
+ await vi.advanceTimersByTimeAsync(100);
+ expect(send.mock.calls).toEqual([["Browser.close"]]);
+ expect(proc.kill).not.toHaveBeenCalled();
+ expect(release).not.toHaveBeenCalled();
+ proc.exitCode = 0;
+ await vi.advanceTimersByTimeAsync(100);
+ await stopping;
+ expect(proc.kill).not.toHaveBeenCalled();
+ expect(release).toHaveBeenCalledOnce();
+ });
+
+ it.each(["discovery", "command"])(
+ "force-stops Windows Chrome only at the original deadline after CDP %s fails",
+ async (failure) => {
+ vi.stubGlobal("process", { ...process, platform: "win32" });
+ vi.useFakeTimers();
+ const { running, proc, release } = runningChrome();
+ vi.mocked(readChromeVersion).mockImplementation(
+ async (_url, timeoutMs) => {
+ await new Promise((resolve) => setTimeout(resolve, timeoutMs));
+ if (failure === "discovery") throw new Error("CDP unavailable");
+ return {
+ webSocketDebuggerUrl: "ws://127.0.0.1:18800/devtools/browser/fake",
+ };
+ },
+ );
+ vi.mocked(withCdpSocket).mockRejectedValue(
+ new Error("CDP socket closed"),
+ );
+ const stopping = stopOpenClawChrome(running, 300);
+ await vi.advanceTimersByTimeAsync(299);
+ expect(proc.kill).not.toHaveBeenCalled();
+ expect(release).not.toHaveBeenCalled();
+ await vi.advanceTimersByTimeAsync(1);
+ await stopping;
+ expect(proc.kill.mock.calls).toEqual([["SIGKILL"]]);
+ expect(release).toHaveBeenCalledOnce();
+ },
+ );
});
diff --git a/packages/browser-control-runtime/src/_generated/extension/src/browser/chrome.ts b/packages/browser-control-runtime/src/_generated/extension/src/browser/chrome.ts
index ce8c7fdebe..d99a15e627 100644
--- a/packages/browser-control-runtime/src/_generated/extension/src/browser/chrome.ts
+++ b/packages/browser-control-runtime/src/_generated/extension/src/browser/chrome.ts
@@ -45,6 +45,7 @@ import {
isWebSocketUrl,
normalizeCdpHttpBaseForJsonEndpoints,
openCdpWebSocket,
+ withCdpSocket,
} from "./cdp.helpers.js";
import { normalizeCdpWsUrl } from "./cdp.js";
import {
@@ -1223,9 +1224,27 @@ export async function stopOpenClawChrome(
if (proc.exitCode != null || proc.signalCode != null) {
return;
}
- // LOCAL PATCH (Cindy, via sync.mjs): killed means a signal was sent,
- // not that Chrome exited. Give it the grace period to flush site data.
- if (!proc.killed) {
+ // LOCAL PATCH (Cindy, via sync.mjs): Windows SIGTERM force-kills too.
+ // Ask Chrome to flush and close via CDP, within the existing grace period.
+ const start = Date.now();
+ if (!proc.killed && process.platform === "win32" && timeoutMs > 0) {
+ try {
+ // Discovery, WebSocket handshake and command each share the budget.
+ const cdpTimeoutMs = Math.max(1, Math.floor(timeoutMs / 3));
+ const wsUrl = await getChromeWebSocketUrl(
+ cdpUrlForPort(running.cdpPort), cdpTimeoutMs,
+ );
+ if (wsUrl && proc.exitCode == null && proc.signalCode == null && Date.now() - start < timeoutMs) {
+ await withCdpSocket(wsUrl, (send) => send("Browser.close"), {
+ handshakeTimeoutMs: cdpTimeoutMs,
+ commandTimeoutMs: cdpTimeoutMs,
+ handshakeRetries: 0,
+ });
+ }
+ } catch {
+ // Closing Chrome can drop CDP before replying. Still wait for exit.
+ }
+ } else if (!proc.killed && process.platform !== "win32") {
try {
proc.kill("SIGTERM");
} catch {
@@ -1233,7 +1252,6 @@ export async function stopOpenClawChrome(
}
}
- const start = Date.now();
while (true) {
// CDP can disappear while Chrome is still flushing its profile.
if (proc.exitCode != null || proc.signalCode != null) {
diff --git a/packages/browser-control-runtime/upstream/MAINTAINING.md b/packages/browser-control-runtime/upstream/MAINTAINING.md
index 06982ac7f8..e0b7472078 100644
--- a/packages/browser-control-runtime/upstream/MAINTAINING.md
+++ b/packages/browser-control-runtime/upstream/MAINTAINING.md
@@ -13,6 +13,8 @@
`--restore-last-session`,否则 Chrome 正常退出后不会恢复会话 Cookie(仅有固定目录不够);
退出必须等待子进程的 `exitCode` / `signalCode`,不能把 `ChildProcess.killed`(已发信号)
或 CDP 不可达当成已退出,否则立即跟上的 SIGKILL 会打断登录数据落盘。
+Windows 的 SIGTERM 也会强杀进程,因此先通过 CDP `Browser.close` 请求正常关闭,
+发现、握手、命令和后续等待共用原有宽限期,只有期限耗尽才 SIGKILL;POSIX 保留 SIGTERM。
退出修正由 `sync.mjs` 的 LOCAL_PATCH 保留,回归见 `src/__tests__/chrome-stop.test.ts`。
「使用我的浏览器登录态」目前是**每次冷启动重新复制**,不是首次导入:只在 Agent 浏览器
diff --git a/packages/browser-control-runtime/upstream/browser-runtime.lock.json b/packages/browser-control-runtime/upstream/browser-runtime.lock.json
index 68571b5eb4..6bce2238b6 100644
--- a/packages/browser-control-runtime/upstream/browser-runtime.lock.json
+++ b/packages/browser-control-runtime/upstream/browser-runtime.lock.json
@@ -28,7 +28,11 @@
},
{
"file": "extension/src/browser/chrome.ts",
- "desc": "wait for actual Chrome exit after SIGTERM so login data can flush before force-stop"
+ "desc": "reuse the bounded CDP command helper for graceful Windows Chrome shutdown"
+ },
+ {
+ "file": "extension/src/browser/chrome.ts",
+ "desc": "close Windows Chrome via CDP and wait for actual process exit before force-stop"
},
{
"file": "extension/src/browser/chrome.ts",
@@ -108,7 +112,7 @@
}
],
"fileCount": 335,
- "contentHash": "2cd752b051eb29fd8db6b2feb2ff64881ce29fa2b0867e8e43baadc7cfe18295",
+ "contentHash": "9a4e02b5c865d4f3cec6e44b1862050ba706542d96a67f564c4c3b60cf7fdc97",
"fsSafe": {
"package": "@openclaw/fs-safe",
"version": "0.4.0"
diff --git a/scripts/browser-runtime/sync.mjs b/scripts/browser-runtime/sync.mjs
index 8e3a3e3a0c..2e44249cdd 100644
--- a/scripts/browser-runtime/sync.mjs
+++ b/scripts/browser-runtime/sync.mjs
@@ -1595,7 +1595,12 @@ export async function quarantineTargetWithoutClosing(opts: {
],
'extension/src/browser/chrome.ts': [
{
- desc: 'wait for actual Chrome exit after SIGTERM so login data can flush before force-stop',
+ desc: 'reuse the bounded CDP command helper for graceful Windows Chrome shutdown',
+ find: ` openCdpWebSocket,\n} from "./cdp.helpers.js";`,
+ replace: ` openCdpWebSocket,\n withCdpSocket,\n} from "./cdp.helpers.js";`,
+ },
+ {
+ desc: 'close Windows Chrome via CDP and wait for actual process exit before force-stop',
find: ` if (proc.killed) {
return;
}
@@ -1619,9 +1624,27 @@ export async function quarantineTargetWithoutClosing(opts: {
replace: ` if (proc.exitCode != null || proc.signalCode != null) {
return;
}
- // LOCAL PATCH (Cindy, via sync.mjs): killed means a signal was sent,
- // not that Chrome exited. Give it the grace period to flush site data.
- if (!proc.killed) {
+ // LOCAL PATCH (Cindy, via sync.mjs): Windows SIGTERM force-kills too.
+ // Ask Chrome to flush and close via CDP, within the existing grace period.
+ const start = Date.now();
+ if (!proc.killed && process.platform === "win32" && timeoutMs > 0) {
+ try {
+ // Discovery, WebSocket handshake and command each share the budget.
+ const cdpTimeoutMs = Math.max(1, Math.floor(timeoutMs / 3));
+ const wsUrl = await getChromeWebSocketUrl(
+ cdpUrlForPort(running.cdpPort), cdpTimeoutMs,
+ );
+ if (wsUrl && proc.exitCode == null && proc.signalCode == null && Date.now() - start < timeoutMs) {
+ await withCdpSocket(wsUrl, (send) => send("Browser.close"), {
+ handshakeTimeoutMs: cdpTimeoutMs,
+ commandTimeoutMs: cdpTimeoutMs,
+ handshakeRetries: 0,
+ });
+ }
+ } catch {
+ // Closing Chrome can drop CDP before replying. Still wait for exit.
+ }
+ } else if (!proc.killed && process.platform !== "win32") {
try {
proc.kill("SIGTERM");
} catch {
@@ -1629,7 +1652,6 @@ export async function quarantineTargetWithoutClosing(opts: {
}
}
- const start = Date.now();
while (true) {
// CDP can disappear while Chrome is still flushing its profile.
if (proc.exitCode != null || proc.signalCode != null) {