@angelky7/dsh-browser-control 1.3.0 → 1.5.0

package/README.en.md

@@ -64,8 +64,8 @@ In one line: **for "use MY browser" tasks (logged-in Bilibili, Zhihu, admin pane
 
 | File | Purpose |
 |---|---|
-| [DSH-Browser-Control-v1.3.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.3.0/DSH-Browser-Control-v1.3.0.zip) | Chrome extension (unzip and load; extension code is unchanged since 1.2.0 — no reinstall needed) |
-| [dsh-browser-control-plugin-v1.3.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.3.0/dsh-browser-control-plugin-v1.3.0.zip) | dsh plugin (offline fallback; online installs use Option A/B) |
+| [DSH-Browser-Control-v1.5.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.5.0/DSH-Browser-Control-v1.5.0.zip) | Chrome extension (unzip and load; this release adds the archive command — reinstall required) |
+| [dsh-browser-control-plugin-v1.5.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.5.0/dsh-browser-control-plugin-v1.5.0.zip) | dsh plugin (offline fallback; online installs use Option A/B) |
 
 ## Install the Chrome extension (30 seconds)
 
@@ -104,7 +104,7 @@ npm install @angelky7/dsh-browser-control
 
 ```bash
 # Straight from GitHub
-dsh plugin --profile web add "github:angelky7/dsh-browser-control#v1.3.0"
+dsh plugin --profile web add "github:angelky7/dsh-browser-control#v1.5.0"
 
 # Local checkout for debugging (note: the explicit file: prefix is required)
 dsh plugin --profile web add "file:D:\path\to\dsh-browser-control"
@@ -263,11 +263,12 @@ curl -X POST http://127.0.0.1:9777/api/command \
 | `browser_network_log` | Captured HTTP requests, listed with method/status/URL (v1.0.7+) |
 | `browser_network_clear` | Clear the network log buffer on its own (v1.0.7+) |
 | `browser_pdf` | Export the current page as PDF (v1.0.7+) |
+| `browser_archive` | Save the whole page as a single-file MHTML (text/images/styles inline; a greppable offline evidence snapshot — embedded scripts do not run, v1.5.0+) |
 | `browser_emulate` | Switch to a device viewport (mobile / desktop / custom, v1.0.7+) |
 | `browser_cleanup` | Clean up temp files |
 | `browser_info` | Which browser and extension build is attached (run it first when debugging, v1.0.9+) |
 
-21 tools in total. `browser_wait`, `browser_find`, `browser_dialog` and `browser_info` existed inside the extension up to v1.0.8 but were never registered as tools, so the agent could not reach them; `browser_network_clear` existed in code and was simply missing from this table. `verify/verify_surface.mjs` now reconciles the extension command table, the commands the plugin calls, this table and the built bundle, so any drift fails `npm run verify`.
+23 tools in total. `browser_wait`, `browser_find`, `browser_dialog` and `browser_info` existed inside the extension up to v1.0.8 but were never registered as tools, so the agent could not reach them; `browser_network_clear` existed in code and was simply missing from this table. `verify/verify_surface.mjs` now reconciles the extension command table, the commands the plugin calls, this table and the built bundle, so any drift fails `npm run verify`.
 
 ## Architecture
 

package/README.md

@@ -64,8 +64,8 @@ Chrome 扩展（CDP 驱动）
 
 | 文件 | 说明 |
 |---|---|
-| [DSH-Browser-Control-v1.3.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.3.0/DSH-Browser-Control-v1.3.0.zip) | Chrome 扩展（解压后加载；与 1.2.0 相比扩展代码无改动，已装 1.2.0 不必重装） |
-| [dsh-browser-control-plugin-v1.3.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.3.0/dsh-browser-control-plugin-v1.3.0.zip) | dsh 插件（离线兜底，在线装直接用方式 A/B） |
+| [DSH-Browser-Control-v1.5.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.5.0/DSH-Browser-Control-v1.5.0.zip) | Chrome 扩展（解压后加载；这一版扩展新增 archive 存档命令，**必须重装**） |
+| [dsh-browser-control-plugin-v1.5.0.zip](https://github.com/angelky7/dsh-browser-control/releases/download/v1.5.0/dsh-browser-control-plugin-v1.5.0.zip) | dsh 插件（离线兜底，在线装直接用方式 A/B） |
 
 ## 安装 Chrome 扩展（30 秒）
 
@@ -104,7 +104,7 @@ npm install @angelky7/dsh-browser-control
 
 ```bash
 # 直接从 GitHub 安装
-dsh plugin --profile web add "github:angelky7/dsh-browser-control#v1.3.0"
+dsh plugin --profile web add "github:angelky7/dsh-browser-control#v1.5.0"
 
 # 本地目录调试（注意：必须显式 file: 前缀）
 dsh plugin --profile web add "file:D:\path\to\dsh-browser-control"
@@ -257,11 +257,12 @@ curl -X POST http://127.0.0.1:9777/api/command \
 | `browser_network_log` | 抓取 HTTP 请求/响应并逐条给出方法/状态/URL（v1.0.7+） |
 | `browser_network_clear` | 单独清空网络日志缓冲（v1.0.7+） |
 | `browser_pdf` | 当前页导出 PDF（v1.0.7+） |
+| `browser_archive` | 整页存成单文件 MHTML（正文/图片/样式全内联，可当文本 grep 的离线证据；是快照，内嵌脚本不会跑，v1.5.0+） |
 | `browser_emulate` | 切设备视口（移动 / 桌面 / 自定义，v1.0.7+） |
 | `browser_cleanup` | 清理临时文件 |
 | `browser_info` | 报告实际连上的浏览器与扩展版本（排障先跑它，v1.0.9+） |
 
-共 21 个工具。`browser_wait` / `browser_find` / `browser_dialog` / `browser_info` 在 v1.0.8 及以前是「扩展里已实现、但没注册成工具」，agent 调不到；`browser_network_clear` 则是代码里有、这张表漏了。这四条现在由 `verify/verify_surface.mjs` 做三方对账（扩展命令表 ↔ 插件调用 ↔ 文档表 ↔ 构建产物），漂移会直接让 `npm run verify` 失败。
+共 23 个工具。`browser_wait` / `browser_find` / `browser_dialog` / `browser_info` 在 v1.0.8 及以前是「扩展里已实现、但没注册成工具」，agent 调不到；`browser_network_clear` 则是代码里有、这张表漏了。这些现在由 `verify/verify_surface.mjs` 做三方对账（扩展命令表 ↔ 插件调用 ↔ 文档表 ↔ 构建产物），漂移会直接让 `npm run verify` 失败。
 
 ## 架构
 

package/lib/index.js

@@ -942,6 +942,18 @@ function policyRefusal(command, flags, params) {
 /** Navigation wait ceiling (same as browser_wait); the bridge gets this plus BRIDGE_MARGIN_MS. */
 const NAV_MAX_MS = 12e4;
 /**
+* Same tier table as the extension's NAV_TIERS (extension/background.js). Both
+* literals must stay in lockstep — verify_nav_waituntil.mjs extracts the
+* extension's by regex and asserts the two agree (cross-side literals are wire
+* protocol: a value only one side knows is a lie on the other).
+*/
+const NAV_TIERS = {
+	none: 0,
+	commit: 4e3,
+	domcontentloaded: 4e3,
+	load: 15e3
+};
+/**
 * Extra time handed to the bridge on top of the navigation budget. Without it a
 * caller-requested budget longer than the bridge default (60s) would be beaten by
 * the bridge, and the model would get `command_timeout` (effect unknown) instead
@@ -1226,6 +1238,30 @@ async function savePdf(controller, payload, requestedPath) {
 		...payload.tabUrl === void 0 ? {} : { url: payload.tabUrl }
 	};
 }
+/** Write one MHTML archive payload to `path` (absolute or under `controller.shotsDir`).
+*  Mirrors savePdf's contract; MHTML is text, so it is written verbatim as UTF-8. */
+async function saveMhtml(controller, payload, requestedPath) {
+	const dir = controller.shotsDir;
+	if (dir === void 0) throw new Error("browser-bridge is not configured yet");
+	let file;
+	if (requestedPath && path.isAbsolute(requestedPath)) {
+		file = requestedPath;
+		await mkdir(path.dirname(file), { recursive: true });
+	} else {
+		await mkdir(dir, { recursive: true });
+		const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+		const random = Math.random().toString(36).slice(2, 6);
+		const name = requestedPath ? path.basename(requestedPath) : `${stamp}-${random}.mhtml`;
+		file = path.join(dir, name);
+	}
+	const buffer = Buffer.from(payload.mhtml, "utf8");
+	await writeFile(file, buffer);
+	return {
+		file,
+		bytes: buffer.length,
+		tabId: payload.tabId
+	};
+}
 /** Register every `browser_*` tool; each is a thin adapter over one extension command. */
 function applyBrowserTools(ctx, controller) {
 	ctx.systemPrompt.section({
@@ -1246,9 +1282,13 @@ function applyBrowserTools(ctx, controller) {
 				type: "number",
 				description: "Target tab; defaults to the active tab."
 			},
+			waitUntil: {
+				type: "string",
+				description: "When the navigation counts as arrived: \"load\" (default) waits for the page load event (15s budget), \"domcontentloaded\" returns once the DOM is parsed (async components may still be mounting — follow with browser_wait if an element is missing), \"commit\" once the new document's address lands, \"none\" returns immediately with no arrival check at all."
+			},
 			timeoutMs: {
 				type: "number",
-				description: `How long to wait for the page load to settle: defaults to 15000, capped at ${NAV_MAX_MS}. Raise it for slow pages instead of retrying; drop it to 3000-5000 when you do not need the page to finish loading and will read/wait afterwards.`
+				description: `How long to wait for the page load to settle: defaults to the waitUntil tier (load 15000, commit/domcontentloaded 4000), capped at ${NAV_MAX_MS}. An explicit value always wins over the tier.`
 			}
 		},
 		output: {
@@ -1264,7 +1304,10 @@ function applyBrowserTools(ctx, controller) {
 					title: { type: "string" },
 					pendingUrl: { type: "string" },
 					loadPending: { type: "boolean" },
-					siteUnreachable: { type: "boolean" }
+					siteUnreachable: { type: "boolean" },
+					waitUntil: { type: "string" },
+					waitedMs: { type: "number" },
+					readyState: { type: "string" }
 				}
 			},
 			render: (_args, value) => {
@@ -1298,17 +1341,26 @@ function applyBrowserTools(ctx, controller) {
 			kind: "other"
 		}),
 		async execute(args, exec) {
-			const params = { url: args.url };
+			const waitUntil = args.waitUntil === void 0 ? "load" : String(args.waitUntil);
+			if (!(waitUntil in NAV_TIERS)) throw new Error(`browser_navigate: waitUntil must be one of none, commit, domcontentloaded, load — got "${waitUntil}"`);
+			const params = {
+				url: args.url,
+				waitUntil
+			};
 			if (args.tabId !== void 0) params.tabId = args.tabId;
-			const budgetMs = typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs) ? Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs))) : 15e3;
-			params.timeoutMs = budgetMs;
-			const raw = await controller.execute("nav", params, exec.signal, budgetMs + BRIDGE_MARGIN_MS);
+			let budgetMs = NAV_TIERS[waitUntil];
+			if (typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs)) budgetMs = Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs)));
+			if (waitUntil !== "none") params.timeoutMs = budgetMs;
+			const raw = await controller.execute("nav", params, exec.signal, waitUntil === "none" ? void 0 : budgetMs + BRIDGE_MARGIN_MS);
 			const out = { tabId: raw.tabId };
 			if (typeof raw.url === "string") out.url = raw.url;
 			if (typeof raw.title === "string") out.title = raw.title;
 			if (typeof raw.pendingUrl === "string") out.pendingUrl = raw.pendingUrl;
 			if (raw.loadPending === true) out.loadPending = true;
 			if (raw.siteUnreachable === true || typeof raw.siteUnreachable === "object" && raw.siteUnreachable !== null) out.siteUnreachable = true;
+			if (typeof raw.waitUntil === "string") out.waitUntil = raw.waitUntil;
+			if (typeof raw.waitedMs === "number") out.waitedMs = raw.waitedMs;
+			if (typeof raw.readyState === "string" && raw.readyState.length > 0) out.readyState = raw.readyState;
 			return out;
 		}
 	}));
@@ -2011,6 +2063,14 @@ function applyBrowserTools(ctx, controller) {
 				type: "boolean",
 				description: "For open: put the new tab in the DSH tab group. Defaults to true; pass false to keep it loose."
 			},
+			waitUntil: {
+				type: "string",
+				description: "For open: when the new tab counts as arrived — same tiers as browser_navigate (load default / domcontentloaded / commit / none)."
+			},
+			timeoutMs: {
+				type: "number",
+				description: "For open: wait budget, overriding the waitUntil tier (load 15000, commit/domcontentloaded 4000)."
+			},
 			windowId: {
 				type: "number",
 				description: "For ungroup: only dissolve that window’s DSH group; omit to clear every window."
@@ -2036,10 +2096,19 @@ function applyBrowserTools(ctx, controller) {
 				case "list": return await controller.execute("tabs.list", {}, exec.signal);
 				case "open": {
 					if (typeof args.url !== "string" || args.url.length === 0) throw new Error("open requires url");
-					const params = { url: args.url };
+					const waitUntil = args.waitUntil === void 0 ? "load" : String(args.waitUntil);
+					if (!(waitUntil in NAV_TIERS)) throw new Error(`browser_tabs open: waitUntil must be one of none, commit, domcontentloaded, load — got "${waitUntil}"`);
+					const params = {
+						url: args.url,
+						waitUntil
+					};
 					if (args.active !== void 0) params.active = args.active;
 					if (args.group !== void 0) params.group = args.group;
-					return await controller.execute("tabs.open", params, exec.signal);
+					if (waitUntil === "none") return await controller.execute("tabs.open", params, exec.signal);
+					let budgetMs = NAV_TIERS[waitUntil];
+					if (typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs)) budgetMs = Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs)));
+					params.timeoutMs = budgetMs;
+					return await controller.execute("tabs.open", params, exec.signal, budgetMs + BRIDGE_MARGIN_MS);
 				}
 				case "close": {
 					const ids = closeTabIds(args);
@@ -2545,6 +2614,54 @@ function applyBrowserTools(ctx, controller) {
 			return await savePdf(controller, await controller.execute("pdf", params, exec.signal), typeof args.path === "string" ? args.path : void 0);
 		}
 	}));
+	ctx.tools.register(defineTool({
+		name: "browser_archive",
+		description: "Save the whole page as a single-file MHTML archive (text, images and styles inline; no network needed to reopen it). Returns the absolute path. The archive is a snapshot of when it was taken — scripts inside do not run and later page changes are not reflected; read it back with file tools or grep it like text.",
+		parameters: {
+			tabId: {
+				type: "number",
+				description: "Target tab; defaults to the active tab."
+			},
+			path: {
+				type: "string",
+				description: "Absolute path. Omit to save under the configured shotsDir with a timestamped .mhtml name."
+			}
+		},
+		output: {
+			schema: {
+				type: "object",
+				additionalProperties: false,
+				properties: {
+					file: {
+						type: "string",
+						required: true
+					},
+					bytes: {
+						type: "number",
+						required: true
+					},
+					tabId: {
+						type: "number",
+						required: true
+					}
+				}
+			},
+			render: (_args, value) => [{
+				type: "text",
+				text: `MHTML archive written to ${value.file} (${(value.bytes / 1024).toFixed(1)} KB)`
+			}]
+		},
+		presentCall: (args) => ({
+			card: "generic",
+			title: `Save page archive${args.path ? " → " + args.path : ""}`,
+			kind: "other"
+		}),
+		async execute(args, exec) {
+			const params = {};
+			if (args.tabId !== void 0) params.tabId = args.tabId;
+			return await saveMhtml(controller, await controller.execute("archive", params, exec.signal), typeof args.path === "string" ? args.path : void 0);
+		}
+	}));
 	ctx.tools.register(defineTool({
 		name: "browser_emulate",
 		description: "Switch the tab into a device viewport (mobile / tablet / desktop) for responsive-UI testing. `device:\"reset\"` restores the user's actual viewport. Custom `width`/`height`/`deviceScaleFactor`/`isMobile`/`hasTouch` override any preset field.",

package/lib/types/index.js

@@ -26,6 +26,13 @@ import { BridgeError, classify } from "./errors.js";
 import { policyRefusal } from "./policy.js";
 /** Navigation wait ceiling (same as browser_wait); the bridge gets this plus BRIDGE_MARGIN_MS. */
 const NAV_MAX_MS = 120_000;
+/**
+ * Same tier table as the extension's NAV_TIERS (extension/background.js). Both
+ * literals must stay in lockstep — verify_nav_waituntil.mjs extracts the
+ * extension's by regex and asserts the two agree (cross-side literals are wire
+ * protocol: a value only one side knows is a lie on the other).
+ */
+const NAV_TIERS = { none: 0, commit: 4_000, domcontentloaded: 4_000, load: 15_000 };
 /**
  * Extra time handed to the bridge on top of the navigation budget. Without it a
  * caller-requested budget longer than the bridge default (60s) would be beaten by
@@ -344,6 +351,28 @@ async function savePdf(controller, payload, requestedPath) {
         ...(payload.tabUrl === undefined ? {} : { url: payload.tabUrl }),
     };
 }
+/** Write one MHTML archive payload to `path` (absolute or under `controller.shotsDir`).
+ *  Mirrors savePdf's contract; MHTML is text, so it is written verbatim as UTF-8. */
+async function saveMhtml(controller, payload, requestedPath) {
+    const dir = controller.shotsDir;
+    if (dir === undefined)
+        throw new Error('browser-bridge is not configured yet');
+    let file;
+    if (requestedPath && path.isAbsolute(requestedPath)) {
+        file = requestedPath;
+        await mkdir(path.dirname(file), { recursive: true });
+    }
+    else {
+        await mkdir(dir, { recursive: true });
+        const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+        const random = Math.random().toString(36).slice(2, 6);
+        const name = requestedPath ? path.basename(requestedPath) : `${stamp}-${random}.mhtml`;
+        file = path.join(dir, name);
+    }
+    const buffer = Buffer.from(payload.mhtml, 'utf8');
+    await writeFile(file, buffer);
+    return { file, bytes: buffer.length, tabId: payload.tabId };
+}
 /** Register every `browser_*` tool; each is a thin adapter over one extension command. */
 function applyBrowserTools(ctx, controller) {
     ctx.systemPrompt.section({
@@ -367,7 +396,8 @@ function applyBrowserTools(ctx, controller) {
         parameters: {
             url: { type: 'string', required: true, description: 'Absolute URL to open in the tab.' },
             tabId: { type: 'number', description: 'Target tab; defaults to the active tab.' },
-            timeoutMs: { type: 'number', description: `How long to wait for the page load to settle: defaults to 15000, capped at ${NAV_MAX_MS}. Raise it for slow pages instead of retrying; drop it to 3000-5000 when you do not need the page to finish loading and will read/wait afterwards.` },
+            waitUntil: { type: 'string', description: 'When the navigation counts as arrived: "load" (default) waits for the page load event (15s budget), "domcontentloaded" returns once the DOM is parsed (async components may still be mounting — follow with browser_wait if an element is missing), "commit" once the new document\'s address lands, "none" returns immediately with no arrival check at all.' },
+            timeoutMs: { type: 'number', description: `How long to wait for the page load to settle: defaults to the waitUntil tier (load 15000, commit/domcontentloaded 4000), capped at ${NAV_MAX_MS}. An explicit value always wins over the tier.` },
         },
         output: {
             schema: {
@@ -380,6 +410,9 @@ function applyBrowserTools(ctx, controller) {
                     pendingUrl: { type: 'string' },
                     loadPending: { type: 'boolean' },
                     siteUnreachable: { type: 'boolean' },
+                    waitUntil: { type: 'string' },
+                    waitedMs: { type: 'number' },
+                    readyState: { type: 'string' },
                 },
             },
             render: (_args, value) => {
@@ -404,14 +437,23 @@ function applyBrowserTools(ctx, controller) {
         isConcurrencySafe: () => false,
         presentCall: args => ({ card: 'generic', title: `Open ${args.url}`, kind: 'other' }),
         async execute(args, exec) {
-            const params = { url: args.url };
+            const waitUntil = args.waitUntil === undefined ? 'load' : String(args.waitUntil);
+            if (!(waitUntil in NAV_TIERS)) {
+                throw new Error(`browser_navigate: waitUntil must be one of none, commit, domcontentloaded, load — got "${waitUntil}"`);
+            }
+            const params = { url: args.url, waitUntil };
             if (args.tabId !== undefined)
                 params.tabId = args.tabId;
-            const budgetMs = typeof args.timeoutMs === 'number' && Number.isFinite(args.timeoutMs)
-                ? Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs)))
-                : 15_000;
-            params.timeoutMs = budgetMs;
-            const raw = await controller.execute('nav', params, exec.signal, budgetMs + BRIDGE_MARGIN_MS);
+            // Explicit timeoutMs always wins over the tier; 'none' waits 0 and sends
+            // no budget at all. The bridge gets budget+2s so the extension's own
+            // "navigation did not arrive" always reports before the bridge's ceiling.
+            let budgetMs = NAV_TIERS[waitUntil];
+            if (typeof args.timeoutMs === 'number' && Number.isFinite(args.timeoutMs)) {
+                budgetMs = Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs)));
+            }
+            if (waitUntil !== 'none')
+                params.timeoutMs = budgetMs;
+            const raw = await controller.execute('nav', params, exec.signal, waitUntil === 'none' ? undefined : budgetMs + BRIDGE_MARGIN_MS);
             // The declared schema is closed, so the fields describing a navigation that did
             // not arrive have to be carried over on purpose. The old shape check
             // (`siteUnreachable === true`) also missed the object the extension really
@@ -429,6 +471,12 @@ function applyBrowserTools(ctx, controller) {
                 || (typeof raw.siteUnreachable === 'object' && raw.siteUnreachable !== null);
             if (unreachable)
                 out.siteUnreachable = true;
+            if (typeof raw.waitUntil === 'string')
+                out.waitUntil = raw.waitUntil;
+            if (typeof raw.waitedMs === 'number')
+                out.waitedMs = raw.waitedMs;
+            if (typeof raw.readyState === 'string' && raw.readyState.length > 0)
+                out.readyState = raw.readyState;
             return out;
         },
     }));
@@ -836,6 +884,8 @@ function applyBrowserTools(ctx, controller) {
             tabIds: { type: 'array', items: { type: 'number' }, description: 'For close: every tab to close in one call. The result reports each id (closed / alreadyGone / failed) instead of stopping at the first failure.' },
             active: { type: 'boolean', description: 'Whether a newly opened tab becomes active; defaults to true.' },
             group: { type: 'boolean', description: 'For open: put the new tab in the DSH tab group. Defaults to true; pass false to keep it loose.' },
+            waitUntil: { type: 'string', description: 'For open: when the new tab counts as arrived — same tiers as browser_navigate (load default / domcontentloaded / commit / none).' },
+            timeoutMs: { type: 'number', description: 'For open: wait budget, overriding the waitUntil tier (load 15000, commit/domcontentloaded 4000).' },
             windowId: { type: 'number', description: 'For ungroup: only dissolve that window’s DSH group; omit to clear every window.' },
         },
         output: {
@@ -850,12 +900,24 @@ function applyBrowserTools(ctx, controller) {
                 case 'open': {
                     if (typeof args.url !== 'string' || args.url.length === 0)
                         throw new Error('open requires url');
-                    const params = { url: args.url };
+                    const waitUntil = args.waitUntil === undefined ? 'load' : String(args.waitUntil);
+                    if (!(waitUntil in NAV_TIERS)) {
+                        throw new Error(`browser_tabs open: waitUntil must be one of none, commit, domcontentloaded, load — got "${waitUntil}"`);
+                    }
+                    const params = { url: args.url, waitUntil };
                     if (args.active !== undefined)
                         params.active = args.active;
                     if (args.group !== undefined)
                         params.group = args.group;
-                    return await controller.execute('tabs.open', params, exec.signal);
+                    if (waitUntil === 'none') {
+                        return await controller.execute('tabs.open', params, exec.signal);
+                    }
+                    let budgetMs = NAV_TIERS[waitUntil];
+                    if (typeof args.timeoutMs === 'number' && Number.isFinite(args.timeoutMs)) {
+                        budgetMs = Math.min(NAV_MAX_MS, Math.max(100, Math.trunc(args.timeoutMs)));
+                    }
+                    params.timeoutMs = budgetMs;
+                    return await controller.execute('tabs.open', params, exec.signal, budgetMs + BRIDGE_MARGIN_MS);
                 }
                 case 'close': {
                     const ids = closeTabIds(args);
@@ -1211,6 +1273,37 @@ function applyBrowserTools(ctx, controller) {
             return await savePdf(controller, payload, typeof args.path === 'string' ? args.path : undefined);
         },
     }));
+    ctx.tools.register(defineTool({
+        name: 'browser_archive',
+        description: 'Save the whole page as a single-file MHTML archive (text, images and styles inline; no network needed to reopen it). Returns the absolute path. The archive is a snapshot of when it was taken — scripts inside do not run and later page changes are not reflected; read it back with file tools or grep it like text.',
+        parameters: {
+            tabId: { type: 'number', description: 'Target tab; defaults to the active tab.' },
+            path: { type: 'string', description: 'Absolute path. Omit to save under the configured shotsDir with a timestamped .mhtml name.' },
+        },
+        output: {
+            schema: {
+                type: 'object',
+                additionalProperties: false,
+                properties: {
+                    file: { type: 'string', required: true },
+                    bytes: { type: 'number', required: true },
+                    tabId: { type: 'number', required: true },
+                },
+            },
+            render: (_args, value) => [{
+                    type: 'text',
+                    text: `MHTML archive written to ${value.file} (${(value.bytes / 1024).toFixed(1)} KB)`,
+                }],
+        },
+        presentCall: args => ({ card: 'generic', title: `Save page archive${args.path ? ' → ' + args.path : ''}`, kind: 'other' }),
+        async execute(args, exec) {
+            const params = {};
+            if (args.tabId !== undefined)
+                params.tabId = args.tabId;
+            const payload = await controller.execute('archive', params, exec.signal);
+            return await saveMhtml(controller, payload, typeof args.path === 'string' ? args.path : undefined);
+        },
+    }));
     ctx.tools.register(defineTool({
         name: 'browser_emulate',
         description: 'Switch the tab into a device viewport (mobile / tablet / desktop) for responsive-UI testing. `device:"reset"` restores the user\'s actual viewport. Custom `width`/`height`/`deviceScaleFactor`/`isMobile`/`hasTouch` override any preset field.',

package/llms.txt

@@ -35,7 +35,7 @@ Chrome 浏览器扩展 + DeepSeek Harness 插件，让 AI Agent 通过 CDP 驱
 
 ## 关键文件
 
-- `src/index.ts` - 22 个 `browser_*` 工具注册 + settings 接线的版本兼容分支
+- `src/index.ts` - 23 个 `browser_*` 工具注册 + settings 接线的版本兼容分支
 - `src/policy.ts` - 三张互不相同的表：只读白名单、脚本命令、插件本地破坏性命令（`browser_cleanup` 不经过 `execute()`，必须自己站闸门）
 - `src/server.ts` - WebSocket 服务 + HTTP 面（鉴权、来源校验、状态页）
 - `src/ws.ts` - RFC 6455 帧编解码

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angelky7/dsh-browser-control",
   "description": "Local WebSocket bridge between dsh and the DSH Browser Control browser extension, with model-facing browser_* tools and a Settings-managed on/off switch",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -37,7 +37,7 @@
     "build": "tsc -p tsconfig.json && tsdown",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "check": "npm run typecheck && npm run build && publint",
-    "verify": "node verify/verify_config_patch.mjs && node verify/verify_peers.mjs && node verify/verify_surface.mjs && node verify/verify_tab_groups.mjs && node verify/verify_tabs_close_many.mjs && node verify/verify_cdp_retry.mjs && node verify/verify_snapshot_ax.mjs && node verify/verify_hard_lock.mjs && node verify/verify_policy.mjs && node verify/verify_cookies.mjs && node verify/verify_extension_e2e.mjs && node verify/verify_plugin.mjs legacy && node verify/verify_plugin.mjs conflict && node verify/verify_plugin.mjs new && node verify/verify_http.mjs && node verify/verify_errors.mjs && node verify/verify_hold.mjs && node verify/verify_protocol.mjs && node verify/verify_bundle_http.mjs && node verify/verify_nav_report.mjs && node verify/verify_nav_landing.mjs && node verify/verify_render_contract.mjs && node verify/verify_press_events.mjs && node verify/verify_nav_timeout.mjs"
+    "verify": "node verify/verify_config_patch.mjs && node verify/verify_peers.mjs && node verify/verify_surface.mjs && node verify/verify_tab_groups.mjs && node verify/verify_tabs_close_many.mjs && node verify/verify_cdp_retry.mjs && node verify/verify_snapshot_ax.mjs && node verify/verify_hard_lock.mjs && node verify/verify_policy.mjs && node verify/verify_cookies.mjs && node verify/verify_extension_e2e.mjs && node verify/verify_plugin.mjs legacy && node verify/verify_plugin.mjs conflict && node verify/verify_plugin.mjs new && node verify/verify_http.mjs && node verify/verify_errors.mjs && node verify/verify_hold.mjs && node verify/verify_protocol.mjs && node verify/verify_bundle_http.mjs && node verify/verify_nav_report.mjs && node verify/verify_nav_landing.mjs && node verify/verify_render_contract.mjs && node verify/verify_press_events.mjs && node verify/verify_nav_timeout.mjs && node verify/verify_nav_waituntil.mjs && node verify/verify_archive.mjs"
   },
   "publishConfig": {
     "access": "public",