@xiaoqiong0v0/opencode-browser-tool 1.10.2 → 1.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -6
- package/dist/client.js +1 -1
- package/dist/i18n/en.js +5 -3
- package/dist/i18n/zh.js +5 -3
- package/dist/index.js +107 -29
- package/dist/session-tree.js +121 -0
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -79,7 +79,7 @@ sha256 校验(**幂等**:sha 与当前 release 期望值一致即跳过;**
|
|
|
79
79
|
>
|
|
80
80
|
> **附着模式必须设置 `BT_SHELL_TOKEN`**:外部 shell 启动时的令牌必须与插件侧环境变量一致(见下方示例),否则插件启动即报 `client.attach_need_token`,不会去连一个注定 401 的端点。令牌未设置时 shell 会随机生成,因此手动启动的 shell 务必显式传 `--token`(或用同值环境变量)。
|
|
81
81
|
|
|
82
|
-
**本地 API 语义**:`/api/*` 只监听 `127.0.0.1`,且只服务插件进程——所有请求必须带 `x-bt-token
|
|
82
|
+
**本地 API 语义**:`/api/*` 只监听 `127.0.0.1`,且只服务插件进程——所有请求必须带 `x-bt-token`(服务端常量时间比较)。**`Origin` 规则(1.11.0 起)**:只有**面板自身 origin 白名单**(`http://tauri.localhost` / `https://tauri.localhost` / `tauri://localhost`,精确匹配、不带端口/子域)放行;**其它任何 `Origin`(`null`、外部站点、子域变体、带端口)仍一律 403**,插件 Node `fetch` 不带 `Origin` 不受影响。**CORS 只对面板 origin 最小恢复**:预检 `OPTIONS` 回 204 + 精确回显该 origin 的 `Access-Control-Allow-Origin`(允许 `POST, OPTIONS` 与 `content-type, x-bt-token` 头),实际响应(含 401)也带精确 ACAO + `Vary: Origin`,**永不通配 `*`**;非面板来源的响应不带任何 CORS 头、`OPTIONS` 仍 405。令牌在 shell 实例创建期确定、运行期不可变;若提供了 `--user-data-dir`,令牌还会写到 `<user-data-dir>/bt-auth-token`(Unix `chmod 600`)供排查。日志只打印令牌前 4 位与长度。**同进程的两个合法调用方各有例外**:面板 Webview 通过 Tauri `invoke("api_token")` 读取本实例令牌(只存 JS 内存,不写 DOM/HTML/日志)后再带 `x-bt-token` 调用,其 origin 也在白名单内(**令牌仍是最终闸门**);页面注入脚本无法持有令牌,故服务端仅对**精确路径 `/api/page-event`** 豁免 `Origin` 与令牌校验(不做前缀匹配),该端点只更新标签 url/title/icon、不执行任何操作。
|
|
83
83
|
|
|
84
84
|
**WSL / Linux 附着示例**(shell 跑在 WSL,插件跑在 Windows 宿主):
|
|
85
85
|
|
|
@@ -113,7 +113,7 @@ opencode(Bun)
|
|
|
113
113
|
|
|
114
114
|
- 浏览器渲染引擎(WebView2 / WebKitGTK / WKWebView,随平台)直接绘制到插件窗口
|
|
115
115
|
- 页面零注入残留脚本,弹框类元素可正常批注
|
|
116
|
-
- 所有工具调用通过 `POST http://127.0.0.1:PORT/api/{command}` 通信,并统一带鉴权头 `x-bt-token
|
|
116
|
+
- 所有工具调用通过 `POST http://127.0.0.1:PORT/api/{command}` 通信,并统一带鉴权头 `x-bt-token`(**除面板 origin 白名单外拒绝任何带 `Origin` 的请求**;面板 origin 走最小 CORS 预检,见上。唯一鉴权豁免是页面事件桥 `/api/page-event`)
|
|
117
117
|
- 除 spawn 本地 shell 外,也可用 `BT_SHELL_URL` / `BT_SHELL_PORT` **附着到已运行的 shell**(不 spawn,适用于 shell 跑在 WSL/Linux、插件跑在 Windows;**必须同时设置 `BT_SHELL_TOKEN`**,外部 shell 用同一令牌启动)
|
|
118
118
|
- 跨平台代码:Windows / Linux / macOS;**预编译二进制只发 Windows x64 与 Linux x64**,macOS 需自行构建(`cargo build --release`)且功能不完整:截图待实现(`rust/src/control/screenshot.rs:4`)、DevTools 无法真正关闭(`close_supported = cfg!(target_os = "linux")`,`rust/src/service.rs:1063`)、自定义 UA 未实现
|
|
119
119
|
- 真多标签:每标签独立 page Webview,切换不重载;`target=_blank` / `window.open` 链接通过 WebView2 原生事件拦截并打开为新标签。**关闭标签会释放该标签的页面实例**(预创建池的 3 个 webview 保留复用,池外动态创建的实例直接销毁),反复开关标签不会累积页面进程
|
|
@@ -138,9 +138,10 @@ bt_cli({ args: "<command> [--flag value ...]" })
|
|
|
138
138
|
|
|
139
139
|
- **命令名不带 `bt_` 前缀**:写 `click`、`navigate`、`list_tabs`,**不是** `bt_click` / `bt_navigate` / `bt_list_tabs`(旧文档里的 `bt_*` 名称既不是工具名也不是命令名)
|
|
140
140
|
- **分词**:按 shell 风格切分(`string-argv` 0.3.2,`src/index.ts:3` 引入、`:388-390` 使用),含空格的值用引号包裹,如 `fill --selector #q --value "hello world"`;**只按引号配对切分、不处理反斜杠转义**——值里要出现引号就改用**另一种引号**包外层(如 `get_visible_text --selector "[title='a b']"`),写成 `--value "a\"b"` 会把 `\` 原样带进值里
|
|
141
|
-
- **flag 解析**:第一个 token 为命令名,其余交给 `node:util.parseArgs`(`src/index.ts:
|
|
142
|
-
- **敏感值 `@file:`**:值写成 `@file:<路径>` 时由插件读取文件内容作为实际值,**内容不进模型上下文**(`src/index.ts:
|
|
143
|
-
-
|
|
141
|
+
- **flag 解析**:第一个 token 为命令名,其余交给 `node:util.parseArgs`(`src/index.ts:296-304`);**未知 flag 直接报错并回显该命令用法**(输出可自愈,不必先调 help)
|
|
142
|
+
- **敏感值 `@file:`**:值写成 `@file:<路径>` 时由插件读取文件内容作为实际值,**内容不进模型上下文**(`src/index.ts:443-472`)。只允许读插件临时目录(全局 tmp 或本会话 tmp)内的文件,其余路径一律拒绝;`lookup` 生成的密码临时文件即用于 `fill --value @file:...`,位于全局 tmp 的用完即删
|
|
143
|
+
- **全局 flag `--private-session`**(任何命令都可带,`src/index.ts:296-304,433-442`):用**调用者自己的 sid** 建私有浏览器实例,不与根会话共用;并且对**同一子会话粘住**——首次用过之后,后续不带该 flag 也继续私有(根会话带它等价于自身)。典型场景:子代理需要**独立的浏览器环境做隔离测试**(自己的 cookie/登录态与窗口,不污染主会话)。根会话自己带它等价于自身(合法但无实际差别)。注意它紧跟某个 string flag 时会被当成该 flag 的值(`parseArgs` 行为),要写就写在命令名之后或命令末尾
|
|
144
|
+
- **会话归属由插件自动透传**(见「多会话」):实例按会话隔离,但 **task 子代理会话默认归并到根会话**——沿 `Session.parentID` 回溯到最顶层,用**根 sid** 作路由键,于是主会话与所有子会话共用同一 bt-shell 实例、同一数据目录 `sessions/<profile>/<根 sid>/`,窗口标题取根会话标题。`args` 里**不需要**也**不支持**传会话 id
|
|
144
145
|
|
|
145
146
|
示例:
|
|
146
147
|
|
|
@@ -270,7 +271,14 @@ bt_cli({ args: "screenshot --selector .chart" })
|
|
|
270
271
|
|
|
271
272
|
## 多会话
|
|
272
273
|
|
|
273
|
-
|
|
274
|
+
浏览器实例**按会话隔离**:独立进程 / 独立端口 / 独立用户数据目录,窗口、标签、UA、批注与 cookie/存储互不共享(`sessionIsolation` / `browserType` 配置项及 `--session-isolation` / `--browser` 参数自 1.9.0 已删除,会话隔离是唯一行为;旧配置文件里的这两项会被忽略)。
|
|
275
|
+
|
|
276
|
+
**但「会话」不等于「窗口」**(1.11.1 起):**task 子代理会话默认归并到根会话**。插件沿 `Session.parentID` 回溯到最顶层,用**根 sid** 作浏览器路由键(`browserKey`),主会话与它的**所有**子会话共用同一 bt-shell 实例、同一数据目录 `sessions/<profile>/<根 sid>/`,窗口标题取**根会话**标题——子代理调 `bt_cli` 不会再各开一个窗口。
|
|
277
|
+
|
|
278
|
+
- **回溯限制**:单跳查询 `client.session.get` 超时 **1.5s**,最多回溯 **5 跳**;失败 / 超时 / 成环 / 超限都回退调用者自己的 raw sid 且**不缓存**(下次调用重试),只打 warn 日志——不会把子会话错认成根并长期钉住。
|
|
279
|
+
- **主子默认共用,私有需显式**:要让某个子会话用自己的实例(独立 cookie/登录态/窗口做隔离测试),给它加全局 flag `--private-session`;该标志对**同一子会话粘住**(首次之后不带也保持私有)。
|
|
280
|
+
- **删除会话**:删**子会话**只清该 sid 的关闭标记 / 附着记录,**不关根实例、不删根数据目录**(与根共用一份);删**根会话 / 无父会话 / 私有会话**时才回收实例与数据目录。
|
|
281
|
+
- 例外:附着模式(`BT_SHELL_URL` / `BT_SHELL_PORT`)连接外部单例 shell,放弃会话隔离。
|
|
274
282
|
|
|
275
283
|
## 发布
|
|
276
284
|
|
package/dist/client.js
CHANGED
|
@@ -25,7 +25,7 @@ const PORT_START_ATTEMPTS = 5;
|
|
|
25
25
|
const TITLE_RESOLVE_TIMEOUT_MS = 250;
|
|
26
26
|
/** HTTP 401 Unauthorized:shell 明确判定令牌不匹配(rust/src/http.rs 的 auth_error) */
|
|
27
27
|
const HTTP_UNAUTHORIZED = 401;
|
|
28
|
-
/** HTTP 403 Forbidden:shell 明确拒绝该请求(
|
|
28
|
+
/** HTTP 403 Forbidden:shell 明确拒绝该请求(Origin 不在面板白名单;1.11.0 起面板自身 origin 已放行) */
|
|
29
29
|
const HTTP_FORBIDDEN = 403;
|
|
30
30
|
/** opencode 应用/项目目录(插件初始化与工具上下文提供);用于定位本地 Rust 开发构建 */
|
|
31
31
|
let appDirectory = "";
|
package/dist/i18n/en.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
const en = {
|
|
2
2
|
tool: {
|
|
3
|
-
"tool.cli.desc": "Browser automation via a CLI-style dispatcher: pass a single command string, e.g. \"navigate --url https://...\" or \"help\". Omit to list all commands. screenshot with --selector scrolls the element into view first. The browser process is managed automatically by this tool
|
|
3
|
+
"tool.cli.desc": "Browser automation via a CLI-style dispatcher: pass a single command string, e.g. \"navigate --url https://...\" or \"help\". Omit to list all commands. screenshot with --selector scrolls the element into view first. The browser process is managed automatically by this tool. Task sub-agent sessions share the root session's browser instance by default; add --private-session for an isolated instance (sticky for that sub-session).",
|
|
4
4
|
"tool.cli.arg.args": "Command line string: \"<command> [--flag value ...]\", e.g. \"navigate --url https://...\" (\"help\" lists all)",
|
|
5
5
|
"cli.header": "bt_cli — browser automation CLI",
|
|
6
6
|
"cli.usage": "Usage: bt_cli({ args })\n args single command line string: \"<command> [--flag value ...]\"",
|
|
7
|
+
"cli.usage.flags": "Global flag:\n --private-session use the caller's own session instance (default: share the root session's instance and data dir; once used by a sub-session it stays private)",
|
|
7
8
|
"cli.commands": "Commands:",
|
|
8
9
|
"cli.examples": "Examples:",
|
|
9
10
|
"cli.example.1": "bt_cli({ args: \"help\" })",
|
|
@@ -12,6 +13,7 @@ const en = {
|
|
|
12
13
|
"cli.example.4": "bt_cli({ args: \"fill --selector #q --value \\\"hello world\\\"\" })",
|
|
13
14
|
"cli.unknown": "Unknown command: {cmd}",
|
|
14
15
|
"cli.invalid_args": "Invalid args for {cmd}: {msg}",
|
|
16
|
+
"cli.err.flag_not_number": "Flag --{flag} needs a number, got: {v}",
|
|
15
17
|
"cli.err.timeout_invalid": "--timeout must be a positive integer in ms (100-60000), got: {v}",
|
|
16
18
|
"cli.err.profile_invalid_name": "Invalid profile name: {name}. Use 1-64 chars, no / \\ : or < > \" | ? *, must not start with a dot, and must not be a Windows reserved name (CON/PRN/AUX/NUL/COM1-9/LPT1-9).",
|
|
17
19
|
"cli.err.file_outside_tmp": "Refusing to read @file outside the plugin temp directory: {path}",
|
|
@@ -159,14 +161,14 @@ const en = {
|
|
|
159
161
|
"bin.not_ready": "bt-shell is not ready yet, retry later",
|
|
160
162
|
"bin.release_not_found": "No Release asset found for this version (tag={tag}); for a plugin-only change make sure the binary is still attached to the x.Y.0 Release, and for Rust changes bump the minor version and create/update that Release first",
|
|
161
163
|
// ---- client-layer errors surfaced to the model ----
|
|
162
|
-
"client.service_timeout": "Browser service not ready (timed out). bt-shell is managed automatically by the plugin
|
|
164
|
+
"client.service_timeout": "Browser service not ready (timed out). bt-shell is managed automatically by the plugin. Retry via bt_cli later (e.g. open_window).",
|
|
163
165
|
"client.attach_timeout": "External bt-shell at {url} is not ready (timed out). Check BT_SHELL_URL/BT_SHELL_PORT and that the shell is running.",
|
|
164
166
|
"client.not_configured": "Service not configured",
|
|
165
167
|
"client.service_error": "Service error",
|
|
166
168
|
"client.auth_rejected": "Local browser API rejected authentication (HTTP 401/403). Call open_window to reopen the browser.",
|
|
167
169
|
"client.bad_response": "Malformed response from the browser service (invalid JSON). The instance was not treated as closed; retry the call.",
|
|
168
170
|
"client.bt_shell_path_missing": "BT_SHELL_PATH points to a binary that does not exist (path is in the environment variable)",
|
|
169
|
-
"client.spawn_failed": "Failed to start the bt-shell process (retry via bt_cli later
|
|
171
|
+
"client.spawn_failed": "Failed to start the bt-shell process (retry via bt_cli later)",
|
|
170
172
|
"client.session_closed_during_start": "A close request was received while the browser was starting; that instance was terminated. Call open_window if you need it again.",
|
|
171
173
|
"client.attach_gone": "Attached external bt-shell at {url} is gone (attach mode does not own that process; restart the shell yourself).",
|
|
172
174
|
"client.attach_need_token": "Attach mode requires an auth token: set BT_SHELL_TOKEN and start the external bt-shell with the same token (--token <token>, or the same environment variable).",
|
package/dist/i18n/zh.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
const zh = {
|
|
2
2
|
tool: {
|
|
3
|
-
"tool.cli.desc": "CLI 风格的浏览器自动化控制:单个字符串命令行,如 \"navigate --url https://...\" 或 \"help\"。省略列出全部命令。screenshot 带 --selector
|
|
3
|
+
"tool.cli.desc": "CLI 风格的浏览器自动化控制:单个字符串命令行,如 \"navigate --url https://...\" 或 \"help\"。省略列出全部命令。screenshot 带 --selector 会先自动滚动到元素再截取。浏览器进程由本工具自动管理。task 子代理会话默认与主会话共用同一浏览器实例;需要独立窗口/登录态时加 --private-session(对该子会话粘住)。",
|
|
4
4
|
"tool.cli.arg.args": "命令行字符串:\"<command> [--flag 值 ...]\",如 \"navigate --url https://...\"(\"help\" 列出全部)",
|
|
5
5
|
"cli.header": "bt_cli — 浏览器自动化 CLI",
|
|
6
6
|
"cli.usage": "用法: bt_cli({ args })\n args 单个命令行字符串: \"<command> [--flag 值 ...]\"",
|
|
7
|
+
"cli.usage.flags": "全局 flag:\n --private-session 使用调用者自己的会话实例(默认与根会话共用同一实例与数据目录;同一子会话首次使用后会保持私有)",
|
|
7
8
|
"cli.commands": "子命令:",
|
|
8
9
|
"cli.examples": "示例:",
|
|
9
10
|
"cli.example.1": "bt_cli({ args: \"help\" })",
|
|
@@ -12,6 +13,7 @@ const zh = {
|
|
|
12
13
|
"cli.example.4": "bt_cli({ args: \"fill --selector #q --value \\\"hello world\\\"\" })",
|
|
13
14
|
"cli.unknown": "未知命令: {cmd}",
|
|
14
15
|
"cli.invalid_args": "参数无效 {cmd}: {msg}",
|
|
16
|
+
"cli.err.flag_not_number": "参数 --{flag} 需要数字,收到:{v}",
|
|
15
17
|
"cli.err.timeout_invalid": "--timeout 须为正整数(毫秒,100~60000),收到:{v}",
|
|
16
18
|
"cli.err.profile_invalid_name": "配置名无效:{name}。要求 1~64 个字符,不含 / \\ : 及 < > \" | ? *,不以点开头,且不是 Windows 保留名(CON/PRN/AUX/NUL/COM1-9/LPT1-9)。",
|
|
17
19
|
"cli.err.file_outside_tmp": "拒绝读取插件临时目录之外的 @file: {path}",
|
|
@@ -159,14 +161,14 @@ const zh = {
|
|
|
159
161
|
"bin.not_ready": "bt-shell 尚未就绪,请稍后重试",
|
|
160
162
|
"bin.release_not_found": "未找到该版本对应的 Release 资产(tag={tag});若这是纯插件改动请确认二进制产物仍在 x.Y.0 的 Release 中,若动了 Rust 需先升中间版本号并新开/更新对应 Release",
|
|
161
163
|
// ---- client 层抛给模型的错误 ----
|
|
162
|
-
"client.service_timeout": "浏览器服务未就绪(超时)。bt-shell
|
|
164
|
+
"client.service_timeout": "浏览器服务未就绪(超时)。bt-shell 由插件自动管理;请稍后经 bt_cli 重试(如 open_window)。",
|
|
163
165
|
"client.attach_timeout": "外部 bt-shell 在 {url} 未就绪(超时)。请检查 BT_SHELL_URL/BT_SHELL_PORT,且 shell 正在运行。",
|
|
164
166
|
"client.not_configured": "服务未配置",
|
|
165
167
|
"client.service_error": "服务错误",
|
|
166
168
|
"client.auth_rejected": "本地浏览器 API 拒绝鉴权(HTTP 401/403)。请调用 open_window 重新打开浏览器。",
|
|
167
169
|
"client.bad_response": "浏览器服务返回了无法解析的响应(非 JSON)。未判定为已关闭,请重试该调用。",
|
|
168
170
|
"client.bt_shell_path_missing": "BT_SHELL_PATH 指向的二进制不存在(路径见环境变量配置)",
|
|
169
|
-
"client.spawn_failed": "bt-shell 进程启动失败(请稍后经 bt_cli
|
|
171
|
+
"client.spawn_failed": "bt-shell 进程启动失败(请稍后经 bt_cli 重试)",
|
|
170
172
|
"client.session_closed_during_start": "启动期间已收到关闭指令,该浏览器实例已终止。如需使用请调用 open_window。",
|
|
171
173
|
"client.attach_gone": "附着的外部 bt-shell 在 {url} 已断开(附着模式不接管进程,请自行重启该 shell)。",
|
|
172
174
|
"client.attach_need_token": "附着模式需要鉴权令牌:请设置环境变量 BT_SHELL_TOKEN,并让外部 bt-shell 用同一令牌启动(启动参数 --token <token>,或设置同值的 BT_SHELL_TOKEN)。",
|
package/dist/index.js
CHANGED
|
@@ -13,12 +13,22 @@ import { sanitizeForModel } from "./util/sanitize.js";
|
|
|
13
13
|
import { tool } from "@opencode-ai/plugin";
|
|
14
14
|
import { log } from "./logger.js";
|
|
15
15
|
import { createSessionIDCache, extractSessionIDFromEvent } from "./session-id.js";
|
|
16
|
+
import { createSessionTree } from "./session-tree.js";
|
|
16
17
|
/** 取 i18n 文案(tf 的快捷别名;vars 可选,替换 {name} 占位符) */
|
|
17
18
|
const _t = (k, vars) => tf(k, vars);
|
|
18
19
|
/** 当前会话 id(工具调用的显式 _sessionId 优先,否则用钩子缓存兜底) */
|
|
19
20
|
function sidOf(a) {
|
|
20
21
|
return resolveSessionId(typeof a?._sessionId === "string" ? a._sessionId : "");
|
|
21
22
|
}
|
|
23
|
+
/** 取 raw 会话最终归属的浏览器 key(私有=自身;否则沿 parentID 归并到根;失败回退 raw,不抛) */
|
|
24
|
+
async function browserKeyOf(raw) {
|
|
25
|
+
try {
|
|
26
|
+
return await sessionTree.browserKey(raw);
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return raw || "default";
|
|
30
|
+
}
|
|
31
|
+
}
|
|
22
32
|
/** 构造只带会话 id 的请求体(用于无参但需按会话路由的命令,如 list_tabs / reload) */
|
|
23
33
|
function sidArgs(a) {
|
|
24
34
|
return { _sessionId: sidOf(a) };
|
|
@@ -109,8 +119,8 @@ const COMMANDS = {
|
|
|
109
119
|
return r?.truncated ? `${html}\n${_t("cli.out.html_truncated", { n: html.length })}` : html;
|
|
110
120
|
} },
|
|
111
121
|
console_logs: { usage: "[--type --search --limit --clear]", descKey: "cli.cmd.console_logs", args: [{ flag: "type" }, { flag: "search" }, { flag: "limit" }, { flag: "clear", type: "boolean" }], run: async (a) => { const r = await service.consoleLogs(a); return (r.logs || []).join("\n") || _t("cli.out.no_logs"); } },
|
|
112
|
-
go_back: { usage: "", descKey: "cli.cmd.go_back", run: async () => { const r = await service.goBack(); return _t("cli.out.go_back", { url: r.url }) + readyNote(r); } },
|
|
113
|
-
go_forward: { usage: "", descKey: "cli.cmd.go_forward", run: async () => { const r = await service.goForward(); return _t("cli.out.go_forward", { url: r.url }) + readyNote(r); } },
|
|
122
|
+
go_back: { usage: "", descKey: "cli.cmd.go_back", run: async (a) => { const r = await service.goBack(sidArgs(a)); return _t("cli.out.go_back", { url: r.url }) + readyNote(r); } },
|
|
123
|
+
go_forward: { usage: "", descKey: "cli.cmd.go_forward", run: async (a) => { const r = await service.goForward(sidArgs(a)); return _t("cli.out.go_forward", { url: r.url }) + readyNote(r); } },
|
|
114
124
|
// resize:宽高=内容区(视口)尺寸;被钳到下限时如实标注(服务端返回 clamped/content/window)
|
|
115
125
|
resize: { usage: "--width --height", descKey: "cli.cmd.resize", args: [{ flag: "width" }, { flag: "height" }], run: async (a) => {
|
|
116
126
|
const r = await service.resize(a);
|
|
@@ -122,11 +132,11 @@ const COMMANDS = {
|
|
|
122
132
|
const list = await service.deviceList(sidArgs(a));
|
|
123
133
|
return [_t("cli.out.device_list_header"), "", ...(list.devices || []).map((d) => ` ${d.name} ${d.width}x${d.height}${d.ua ? ` ${d.ua.slice(0, 60)}...` : " (default UA)"}`)].join("\n");
|
|
124
134
|
}
|
|
125
|
-
const r = await service.device({ name: a.name });
|
|
135
|
+
const r = await service.device({ name: a.name, ...sidArgs(a) });
|
|
126
136
|
return _t("cli.out.device_applied", { name: r.device, w: r.width, h: r.height, ua: r.ua });
|
|
127
137
|
} },
|
|
128
138
|
devtools: { usage: "[--action]", descKey: "cli.cmd.devtools", args: [{ flag: "action" }], run: async (a) => {
|
|
129
|
-
const r = await service.devtools({ action: a.action || "toggle" });
|
|
139
|
+
const r = await service.devtools({ action: a.action || "toggle", ...sidArgs(a) });
|
|
130
140
|
// supported=false:该平台无法真正关闭(Windows/wry 空实现)→ 如实提示,不接受误导性的「已关闭」
|
|
131
141
|
if (r?.supported === false)
|
|
132
142
|
return _t("cli.out.devtools_unsupported");
|
|
@@ -173,8 +183,8 @@ const COMMANDS = {
|
|
|
173
183
|
get_dropdown_options: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.get_dropdown_options", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.dropdownOptions(a); const opts = r?.options ?? []; if (!opts.length)
|
|
174
184
|
return _t("cli.out.dropdown_none", { sel: a.selector }); return opts.map((o) => `${o.selected ? "* " : " "}${o.value}: ${o.text}`).join("\n") + tn; } },
|
|
175
185
|
custom_user_agent: { usage: "--userAgent", descKey: "cli.cmd.custom_user_agent", args: [{ flag: "userAgent" }], run: async (a) => { await service.userAgent(a); return _t("cli.out.ua_set"); } },
|
|
176
|
-
expect_response: { usage: "--url", descKey: "cli.cmd.expect_response", args: [{ flag: "url" }], run: async (a) => { await service.expectResponse({ urlPattern: a.url }); return _t("cli.out.expect_response", { url: a.url }); } },
|
|
177
|
-
assert_response: { usage: "--id", descKey: "cli.cmd.assert_response", args: [{ flag: "id" }], run: async (a) => { const r = await service.assertResponse({ id: a.id }); return r.matched ? _t("cli.out.assert_matched", { url: r.url, status: r.status }) : r.error || _t("cli.out.assert_none"); } },
|
|
186
|
+
expect_response: { usage: "--url", descKey: "cli.cmd.expect_response", args: [{ flag: "url" }], run: async (a) => { await service.expectResponse({ urlPattern: a.url, ...sidArgs(a) }); return _t("cli.out.expect_response", { url: a.url }); } },
|
|
187
|
+
assert_response: { usage: "--id", descKey: "cli.cmd.assert_response", args: [{ flag: "id" }], run: async (a) => { const r = await service.assertResponse({ id: a.id, ...sidArgs(a) }); return r.matched ? _t("cli.out.assert_matched", { url: r.url, status: r.status }) : r.error || _t("cli.out.assert_none"); } },
|
|
178
188
|
get_accessibility_tree: { usage: "[--selector --maxDepth] [--timeout ms]", descKey: "cli.cmd.get_accessibility_tree", args: [{ flag: "selector" }, { flag: "maxDepth" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const s = await service.accessibility(a); return (s ? formatNode(s, 0, a.maxDepth ?? 8) : _t("cli.out.no_ax")) + tn; } },
|
|
179
189
|
list_records: { usage: "", descKey: "cli.cmd.list_records", run: async (a) => { try {
|
|
180
190
|
const records = await service.annotateRecords(sidArgs(a));
|
|
@@ -287,20 +297,41 @@ function buildHelp() {
|
|
|
287
297
|
const examples = [_t("cli.example.1"), _t("cli.example.2"), _t("cli.example.3"), _t("cli.example.4")]
|
|
288
298
|
.map((e) => ` ${e}`)
|
|
289
299
|
.join("\n");
|
|
290
|
-
return `${_t("cli.header")}\n\n${_t("cli.usage")}\n\n${_t("cli.commands")}\n${lines.join("\n")}\n\n${_t("cli.examples")}\n${examples}`;
|
|
300
|
+
return `${_t("cli.header")}\n\n${_t("cli.usage")}\n\n${_t("cli.usage.flags")}\n\n${_t("cli.commands")}\n${lines.join("\n")}\n\n${_t("cli.examples")}\n${examples}`;
|
|
291
301
|
}
|
|
292
302
|
/** 描述内嵌的紧凑命令索引(模型无需先调 help 即可用) */
|
|
293
303
|
const DESC_INDEX = Object.entries(COMMANDS).map(([k, v]) => `${k} ${v.usage}`).join(" | ");
|
|
294
|
-
/** 解析 --flag 风格参数(基于 node:util.parseArgs,未知 flag 报错;tokens 已由 string-argv 正确分词)
|
|
304
|
+
/** 解析 --flag 风格参数(基于 node:util.parseArgs,未知 flag 报错;tokens 已由 string-argv 正确分词)
|
|
305
|
+
* 全局 flag `--private-session` 对所有命令可用,由调用方消费(不进入命令业务参数)。
|
|
306
|
+
*
|
|
307
|
+
* `parseArgs` 默认把值解析成字符串,而 Rust 端对下列 flag 用 `as_i64`/`as_f64` 读取
|
|
308
|
+
* (取不到就落默认值/0):不转换会静默失效(如 `resize --width 800` 被钳到下限)。
|
|
309
|
+
* 因此这里对已知数值 flag 统一转 number;非数字直接报错,不带着坏值进浏览器。 */
|
|
295
310
|
function parseFlagArgs(tokens, def) {
|
|
296
311
|
if (tokens.length === 0)
|
|
297
312
|
return {};
|
|
298
|
-
|
|
313
|
+
// 全局 boolean flag 先声明,避免被当作未知参数;若它出现在某个 string flag 之后,
|
|
314
|
+
// parseArgs 会把它当成该 flag 的值(与用户显式传值一致,不会误判为私有会话)。
|
|
315
|
+
const options = { "private-session": { type: "boolean" } };
|
|
299
316
|
for (const arg of def.args || [])
|
|
300
317
|
options[arg.flag] = { type: arg.type || "string" };
|
|
301
318
|
const { values } = parseArgs({ args: tokens, options, allowPositionals: true });
|
|
319
|
+
for (const key of Object.keys(values)) {
|
|
320
|
+
if (!NUMERIC_FLAGS.has(key))
|
|
321
|
+
continue;
|
|
322
|
+
const raw = values[key];
|
|
323
|
+
if (raw === undefined || raw === null || raw === "")
|
|
324
|
+
continue;
|
|
325
|
+
const n = Number(String(raw).trim());
|
|
326
|
+
if (!Number.isFinite(n)) {
|
|
327
|
+
throw new Error(_t("cli.err.flag_not_number", { flag: key, v: String(raw) }));
|
|
328
|
+
}
|
|
329
|
+
values[key] = n;
|
|
330
|
+
}
|
|
302
331
|
return values;
|
|
303
332
|
}
|
|
333
|
+
/** 需要转成 number 的 flag(Rust 端按数值读取;新增数值参数时必须同步登记) */
|
|
334
|
+
const NUMERIC_FLAGS = new Set(["width", "height", "index", "freq", "durMs"]);
|
|
304
335
|
/** 简单 CSV 行解析(处理引号包裹的字段,Edge/Chrome 密码导出格式) */
|
|
305
336
|
function splitCsvLine(line) {
|
|
306
337
|
const out = [];
|
|
@@ -349,8 +380,11 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
349
380
|
// 会话数据目录:sessions/<profile>/<sid>(profile 影响后续新会话的数据根)
|
|
350
381
|
resolveDataDir: (sid) => getSessionDataDir(sid),
|
|
351
382
|
});
|
|
352
|
-
//
|
|
353
|
-
|
|
383
|
+
// 会话树归并的 client:父会话查询用 client.session.get({ path: { id } }).parentID
|
|
384
|
+
sessionTreeClient = client;
|
|
385
|
+
// 会话 id 兜底解析器:工具调用没带 _sessionId 时用钩子缓存;若该 raw 已解析过根,
|
|
386
|
+
// 返回归并后的 key(否则未显式透传 sid 的调用会落到子会话,另起实例)
|
|
387
|
+
setSessionIdResolver(() => sessionTree.knownKey(sessionCache.get()));
|
|
354
388
|
// 可选会话标题解析器:client.session.get 之类;拿不到/超时回退 sid 后缀,不阻塞启动
|
|
355
389
|
setTitleResolver(async (sid) => {
|
|
356
390
|
try {
|
|
@@ -369,18 +403,32 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
369
403
|
event: async ({ event }) => {
|
|
370
404
|
// 缓存最近会话 id:这是投递批注最可靠的 sessionID 来源
|
|
371
405
|
if (event.type === "session.deleted") {
|
|
372
|
-
// 删除会话(1.9.0 语义升级):清钩子缓存 + **回收该会话自己的浏览器实例**。
|
|
406
|
+
// 删除会话(1.9.0 语义升级 + 会话树归并):清钩子缓存 + **回收该会话自己的浏览器实例**。
|
|
373
407
|
// 仍是「绝不因删除而 spawn」:closeSession 只在注册表里有该 sid 时才动进程,
|
|
374
408
|
// 没有实例就直接返回(不会再走 callApi → ensureInstance 那条会弹窗的老路)。
|
|
409
|
+
// 归并语义:删除**子会话**时不得关闭根实例、不得删根数据目录(子会话与根共用一份)。
|
|
375
410
|
const delId = extractSessionIDFromEvent(event);
|
|
376
411
|
if (delId) {
|
|
412
|
+
// 先取归并 key(删除后 session.get 可能失败 → 回退 raw;此前工具调用已缓存根)
|
|
413
|
+
const key = await browserKeyOf(delId);
|
|
377
414
|
sessionCache.clearIf(delId);
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
415
|
+
sessionTree.forget(delId);
|
|
416
|
+
if (key === delId) {
|
|
417
|
+
// 根会话 / 无父会话 / 私有会话:回收它自己的实例与数据目录
|
|
418
|
+
await closeSession(delId);
|
|
419
|
+
clearClosedState(delId);
|
|
420
|
+
// 清该 sid 的附着 notify 记录(附着模式共享 shell,避免残留 key 无限增长)
|
|
421
|
+
clearAttachNotifyForSid(delId);
|
|
422
|
+
// 回收该会话的数据目录(P1:否则退出后磁盘目录永不释放)
|
|
423
|
+
removeSessionDataDir(delId);
|
|
424
|
+
sessionCache.clearIf(key);
|
|
425
|
+
}
|
|
426
|
+
else {
|
|
427
|
+
// 子会话:只清它自己的关闭标记/附着记录;根实例与根数据目录保持不动
|
|
428
|
+
clearClosedState(delId);
|
|
429
|
+
clearAttachNotifyForSid(delId);
|
|
430
|
+
log.info(`[session] child session deleted sid=${delId} (browserKey=${key}); root instance/data kept`);
|
|
431
|
+
}
|
|
384
432
|
}
|
|
385
433
|
return;
|
|
386
434
|
}
|
|
@@ -395,7 +443,7 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
395
443
|
},
|
|
396
444
|
tool: filterDisabled({
|
|
397
445
|
bt_cli: tool({
|
|
398
|
-
description: _t("tool.cli.desc") + "\n" + DESC_INDEX,
|
|
446
|
+
description: _t("tool.cli.desc") + "\n" + DESC_INDEX + "\n" + _t("cli.usage.flags"),
|
|
399
447
|
args: {
|
|
400
448
|
// 单字符串命令行: "<command> [--flag value ...]", 如 "navigate --url https://..." / "help"
|
|
401
449
|
args: tool.schema.string().optional().describe(_t("tool.cli.arg.args")),
|
|
@@ -424,16 +472,25 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
424
472
|
return `${_t("cli.invalid_args").replace("{cmd}", cmdName).replace("{msg}", sanitizeForModel(e?.message || String(e)))}\n\nUsage: bt_cli({ args: "${cmdName} ${def.usage}" })`;
|
|
425
473
|
}
|
|
426
474
|
}
|
|
475
|
+
// 全局 flag:`--private-session` 表示本次与后续调用都用调用者自己的 sid(不归并根会话)。
|
|
476
|
+
// parseFlagArgs 已声明该 boolean flag;这里消费掉,不进入命令业务参数。
|
|
477
|
+
const privateRequested = params["private-session"] === true;
|
|
478
|
+
delete params["private-session"];
|
|
479
|
+
// 刷新钩子缓存(兜底:即使钩子未触发也能拿到 sid),再按会话树取浏览器 key:
|
|
480
|
+
// raw = 调用者会话;browserKey = 私有会话?raw : 沿 parentID 回溯到的根会话。
|
|
481
|
+
sessionCache.updateFromHookInput(context);
|
|
482
|
+
const rawSid = resolveSessionId(context?.sessionID || "");
|
|
483
|
+
if (privateRequested)
|
|
484
|
+
sessionTree.markPrivate(rawSid);
|
|
485
|
+
const browserSid = await browserKeyOf(rawSid);
|
|
427
486
|
// @file: 引用解析:值以 @file:<path> 开头时读文件内容作为实际值
|
|
428
487
|
// (密码等敏感值不进 LLM 上下文,如 fill --value @file:C:\...\secret.tmp)
|
|
429
|
-
// 安全边界:只允许读全局 tmp(getTmpDir)
|
|
488
|
+
// 安全边界:只允许读全局 tmp(getTmpDir)或**该会话(归并后 key)** tmp(getSessionTmpDir)之内的文件;
|
|
430
489
|
// 其余路径一律拒绝(不读取),避免模型借助 @file: 读取任意本地文件。
|
|
431
|
-
// sid
|
|
490
|
+
// sid 形态校验:归并 key 来自会话树/外部传入值,任意字符串(含 .. 、路径分隔符)
|
|
432
491
|
// 会把 getSessionTmpDir 带到 sessions 目录之外,从而左右 allowed dirs。不匹配 SESSION_SID_RE
|
|
433
|
-
// 一律回退 "default" 桶(
|
|
434
|
-
|
|
435
|
-
const fileSidRaw = resolveSessionId(context?.sessionID || "");
|
|
436
|
-
const fileSid = SESSION_SID_RE.test(fileSidRaw) ? fileSidRaw : "default";
|
|
492
|
+
// 一律回退 "default" 桶("default" 本身合法,getSessionTmpDir("default") = sessions/<profile>/default/tmp,必在 sessions 内)。
|
|
493
|
+
const fileSid = SESSION_SID_RE.test(browserSid) ? browserSid : "default";
|
|
437
494
|
const globalTmpDir = getTmpDir();
|
|
438
495
|
const allowedTmpDirs = [globalTmpDir, getSessionTmpDir(fileSid)];
|
|
439
496
|
for (const key of Object.keys(params)) {
|
|
@@ -457,10 +514,9 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
457
514
|
}
|
|
458
515
|
}
|
|
459
516
|
}
|
|
460
|
-
//
|
|
461
|
-
sessionCache.updateFromHookInput(context);
|
|
517
|
+
// 透传归并后的会话 key(会话隔离 + 子会话归并):后续 sidOf/sidArgs 优先用它
|
|
462
518
|
setAppDirectory(context?.directory || "");
|
|
463
|
-
params._sessionId =
|
|
519
|
+
params._sessionId = browserSid;
|
|
464
520
|
try {
|
|
465
521
|
return await def.run(params);
|
|
466
522
|
}
|
|
@@ -479,7 +535,10 @@ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
|
|
|
479
535
|
async execute(a, context) {
|
|
480
536
|
sessionCache.updateFromHookInput(context);
|
|
481
537
|
setAppDirectory(context?.directory || "");
|
|
482
|
-
|
|
538
|
+
// 与 bt_cli 同口径:走归并后的 key(私有会话粘住自身)
|
|
539
|
+
const rawSid = resolveSessionId(context?.sessionID || "");
|
|
540
|
+
const key = await browserKeyOf(rawSid);
|
|
541
|
+
const r = await service.mediaMode({ ...a, _sessionId: key });
|
|
483
542
|
return _t("cli.out.media_mode", { mode: r.mode });
|
|
484
543
|
},
|
|
485
544
|
}),
|
|
@@ -535,6 +594,25 @@ let annotateClient = null;
|
|
|
535
594
|
const drainingSid = new Set();
|
|
536
595
|
/** 最近一次见到的会话 id 缓存(来自 event/chat.message/tool.execute.before 钩子) */
|
|
537
596
|
const sessionCache = createSessionIDCache();
|
|
597
|
+
/** 会话树归并所需的插件 client(插件初始化时赋值;未就绪时父查询按失败处理) */
|
|
598
|
+
let sessionTreeClient = null;
|
|
599
|
+
/**
|
|
600
|
+
* 会话树归并:子代理会话默认归并到根会话(共用实例/数据目录/标题);
|
|
601
|
+
* `--private-session` 的会话粘住自身。缓存与私有标记是**进程级**的,插件重载不丢。
|
|
602
|
+
*/
|
|
603
|
+
const sessionTree = createSessionTree({
|
|
604
|
+
fetchParent: async (sid) => {
|
|
605
|
+
if (!sessionTreeClient)
|
|
606
|
+
return undefined;
|
|
607
|
+
const r = await sessionTreeClient.session.get({ path: { id: sid } });
|
|
608
|
+
// 包络异常(有 error / 无 data)按失败处理:绝不把子会话误判为根并长期缓存
|
|
609
|
+
if (!r || !r.data)
|
|
610
|
+
return undefined;
|
|
611
|
+
const parent = r.data.parentID;
|
|
612
|
+
return typeof parent === "string" && parent.trim() ? parent.trim() : null;
|
|
613
|
+
},
|
|
614
|
+
onWarn: (m) => log.info(m),
|
|
615
|
+
});
|
|
538
616
|
/** 把截图 base64 落盘为临时 PNG,返回路径(失败返回 null);用于发送时保留图片与给出可读路径
|
|
539
617
|
* 1.9.0:落盘到**该会话**的临时目录 sessions/<profile>/<sid>/tmp(不再与其它会话共享全局 tmp) */
|
|
540
618
|
function saveShotImage(log, sid, index, b64) {
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
// 会话树归并(纯逻辑,便于单测):把子代理会话归并到根会话的浏览器实例。
|
|
2
|
+
//
|
|
3
|
+
// 背景:浏览器实例按 session 隔离,但 task 子代理会话也是 session。若直接用钩子里的
|
|
4
|
+
// sessionID 作路由键,子代理一调 bt_cli 就会另起一个 shell 与数据目录。
|
|
5
|
+
// 目标语义(用户确认):
|
|
6
|
+
// 1. 默认归并到根会话:沿 Session.parentID 回溯到最顶层,以根 sid 作 browserKey;
|
|
7
|
+
// 2. --private-session:用调用者自己的 sid 建私有实例,并且**粘住**(之后不带标志也继续私有);
|
|
8
|
+
// 3. 根会话自己带 --private-session 等价于自己,不报错。
|
|
9
|
+
//
|
|
10
|
+
// 失败/超时不抛异常:回退 raw sid,且**不缓存**该结果(下一次调用可重试)。
|
|
11
|
+
/** 默认单跳查询超时(ms) */
|
|
12
|
+
const DEFAULT_QUERY_TIMEOUT_MS = 1500;
|
|
13
|
+
/** 默认最大回溯跳数 */
|
|
14
|
+
const DEFAULT_MAX_HOPS = 5;
|
|
15
|
+
/** 拿不到任何 sid 时的兜底桶(与 client.resolveSessionId 同口径) */
|
|
16
|
+
const DEFAULT_SESSION_BUCKET = "default";
|
|
17
|
+
/** 规范化会话 id:去空白;空值落到 default 桶 */
|
|
18
|
+
function normalizeSid(raw) {
|
|
19
|
+
const sid = (raw || "").trim();
|
|
20
|
+
return sid || DEFAULT_SESSION_BUCKET;
|
|
21
|
+
}
|
|
22
|
+
/** 创建会话树归并器(无副作用,不做 IO;IO 由 fetchParent 注入) */
|
|
23
|
+
export function createSessionTree(opts) {
|
|
24
|
+
const timeoutMs = opts.timeoutMs ?? DEFAULT_QUERY_TIMEOUT_MS;
|
|
25
|
+
const maxHops = opts.maxHops ?? DEFAULT_MAX_HOPS;
|
|
26
|
+
/** raw sid → 根 sid(仅缓存成功解析的结果) */
|
|
27
|
+
const rootCache = new Map();
|
|
28
|
+
/** 已标记私有的 raw sid */
|
|
29
|
+
const privateSids = new Set();
|
|
30
|
+
/** 有界查询 parentID;超时/异常 → undefined(区别于 null=确认无父) */
|
|
31
|
+
async function fetchParentSafe(sid) {
|
|
32
|
+
let timer;
|
|
33
|
+
try {
|
|
34
|
+
const query = Promise.resolve().then(() => opts.fetchParent(sid));
|
|
35
|
+
const timeout = new Promise((resolveTimeout) => {
|
|
36
|
+
timer = setTimeout(() => resolveTimeout(undefined), timeoutMs);
|
|
37
|
+
});
|
|
38
|
+
const parent = await Promise.race([query, timeout]);
|
|
39
|
+
if (parent === undefined)
|
|
40
|
+
return undefined;
|
|
41
|
+
if (parent === null)
|
|
42
|
+
return null;
|
|
43
|
+
const p = String(parent).trim();
|
|
44
|
+
return p || null;
|
|
45
|
+
}
|
|
46
|
+
catch (e) {
|
|
47
|
+
opts.onWarn?.(`[session-tree] parent lookup failed sid=${sid}: ${e?.message || String(e)}`);
|
|
48
|
+
return undefined;
|
|
49
|
+
}
|
|
50
|
+
finally {
|
|
51
|
+
if (timer)
|
|
52
|
+
clearTimeout(timer);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function knownKey(raw) {
|
|
56
|
+
const sid = normalizeSid(raw);
|
|
57
|
+
if (privateSids.has(sid))
|
|
58
|
+
return sid;
|
|
59
|
+
return rootCache.get(sid) || sid;
|
|
60
|
+
}
|
|
61
|
+
async function browserKey(raw) {
|
|
62
|
+
const sid = normalizeSid(raw);
|
|
63
|
+
if (privateSids.has(sid))
|
|
64
|
+
return sid;
|
|
65
|
+
const cached = rootCache.get(sid);
|
|
66
|
+
if (cached)
|
|
67
|
+
return cached;
|
|
68
|
+
// 沿 parentID 向上回溯;路径上的节点在成功时一并缓存
|
|
69
|
+
const path = [sid];
|
|
70
|
+
const seen = new Set([sid]);
|
|
71
|
+
let current = sid;
|
|
72
|
+
for (let hop = 0; hop < maxHops; hop++) {
|
|
73
|
+
const parent = await fetchParentSafe(current);
|
|
74
|
+
if (parent === undefined) {
|
|
75
|
+
opts.onWarn?.(`[session-tree] resolve failed at sid=${current}; fallback to raw sid=${sid}`);
|
|
76
|
+
return sid; // 失败不缓存,下次重试
|
|
77
|
+
}
|
|
78
|
+
if (parent === null) {
|
|
79
|
+
// current 是根:路径上所有节点都归并到它
|
|
80
|
+
for (const node of path)
|
|
81
|
+
rootCache.set(node, current);
|
|
82
|
+
return current;
|
|
83
|
+
}
|
|
84
|
+
if (seen.has(parent)) {
|
|
85
|
+
opts.onWarn?.(`[session-tree] cycle detected (sid=${sid}, repeated=${parent}); fallback to raw sid`);
|
|
86
|
+
return sid;
|
|
87
|
+
}
|
|
88
|
+
if (hop === maxHops - 1) {
|
|
89
|
+
opts.onWarn?.(`[session-tree] exceeded maxHops=${maxHops} (sid=${sid}); fallback to raw sid`);
|
|
90
|
+
return sid;
|
|
91
|
+
}
|
|
92
|
+
seen.add(parent);
|
|
93
|
+
path.push(parent);
|
|
94
|
+
current = parent;
|
|
95
|
+
}
|
|
96
|
+
return sid;
|
|
97
|
+
}
|
|
98
|
+
function markPrivate(raw) {
|
|
99
|
+
const sid = (raw || "").trim();
|
|
100
|
+
if (sid)
|
|
101
|
+
privateSids.add(sid);
|
|
102
|
+
}
|
|
103
|
+
function isPrivate(raw) {
|
|
104
|
+
return privateSids.has((raw || "").trim());
|
|
105
|
+
}
|
|
106
|
+
function forget(sid) {
|
|
107
|
+
if (!sid)
|
|
108
|
+
return;
|
|
109
|
+
privateSids.delete(sid);
|
|
110
|
+
rootCache.delete(sid);
|
|
111
|
+
// 删除所有映射到该会话的后代缓存(sid 是根/某层祖先时)
|
|
112
|
+
for (const [node, root] of [...rootCache]) {
|
|
113
|
+
if (root === sid)
|
|
114
|
+
rootCache.delete(node);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function cachedRoot(raw) {
|
|
118
|
+
return rootCache.get((raw || "").trim());
|
|
119
|
+
}
|
|
120
|
+
return { browserKey, knownKey, markPrivate, isPrivate, forget, cachedRoot };
|
|
121
|
+
}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xiaoqiong0v0/opencode-browser-tool",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.1",
|
|
4
4
|
"description": "opencode 浏览器工具插件:WebView2 外壳渲染 + 零注入视觉元素选取面板",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "tsc",
|
|
8
8
|
"dev": "tsc --watch",
|
|
9
|
+
"test": "npm run build && node --test \"tests/unit/*.test.mjs\"",
|
|
9
10
|
"build:frontend": "cd frontend && npm install && npm run build"
|
|
10
11
|
},
|
|
11
12
|
"keywords": [
|