@xiaoqiong0v0/opencode-browser-tool 1.7.0 → 1.10.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/dist/index.js CHANGED
@@ -2,193 +2,264 @@ import { readFileSync, writeFileSync, readdirSync, unlinkSync, mkdirSync, rmSync
2
2
  import { resolve } from "path";
3
3
  import stringArgv from "string-argv";
4
4
  import { parseArgs } from "node:util";
5
- import { loadConfig, getConfig, getBrowsersDir, getProfilesDir, getProfileDir, getExportsDir, getTmpDir, getActiveProfile, setActiveProfile, } from "./config/index.js";
6
- import { registerLocale, t } from "./i18n/index.js";
5
+ import { loadConfig, getConfig, getBrowsersDir, getProfilesDir, getExportsDir, getTmpDir, getActiveProfile, setActiveProfile, getSessionDataDir, getSessionTmpDir, getSessionsDir, resolveProfilePath, isInsideDir, } from "./config/index.js";
6
+ import { registerLocale, tf } from "./i18n/index.js";
7
7
  import en from "./i18n/en.js";
8
8
  import zh from "./i18n/zh.js";
9
- import { configureService, setUserDataDir, setAppDirectory, setServiceReadyHandler, ensureService, openWindow, isRunning, stopService, service, probeStatus } from "./client.js";
9
+ import { configureService, setAppDirectory, setServiceReadyHandler, setSessionIdResolver, setTitleResolver, resolveSessionId, openWindow, isRunning, isStarting, closeSession, closeAllSessions, clearClosedState, service, probeStatus, clearAttachNotifyForSid, } from "./client.js";
10
10
  import { startNotifyServer } from "./notify-server.js";
11
11
  import { startDownload, getBinaryStatus, describeBinaryStatus } from "./binary.js";
12
+ import { sanitizeForModel } from "./util/sanitize.js";
12
13
  import { tool } from "@opencode-ai/plugin";
13
14
  import { log } from "./logger.js";
14
15
  import { createSessionIDCache, extractSessionIDFromEvent } from "./session-id.js";
15
- const _t = (k) => t(k);
16
+ /** 取 i18n 文案(tf 的快捷别名;vars 可选,替换 {name} 占位符) */
17
+ const _t = (k, vars) => tf(k, vars);
18
+ /** 当前会话 id(工具调用的显式 _sessionId 优先,否则用钩子缓存兜底) */
19
+ function sidOf(a) {
20
+ return resolveSessionId(typeof a?._sessionId === "string" ? a._sessionId : "");
21
+ }
22
+ /** 构造只带会话 id 的请求体(用于无参但需按会话路由的命令,如 list_tabs / reload) */
23
+ function sidArgs(a) {
24
+ return { _sessionId: sidOf(a) };
25
+ }
16
26
  /** 降级说明:服务端在无可信通道、退回 untrusted DOM/JS 时返回 degraded,统一在此追加标注 */
17
27
  function degradedNote(r) {
18
- return r && r.degraded ? ` (degraded: ${r.degradedReason || "untrusted fallback"})` : "";
28
+ return r && r.degraded ? _t("cli.note.degraded", { reason: r.degradedReason || "untrusted fallback" }) : "";
19
29
  }
20
30
  /** 就绪说明:导航/前进后退未在超时内就绪时如实标注(不假装成功) */
21
31
  function readyNote(r) {
22
32
  if (!r || r.ready !== false)
23
33
  return "";
24
34
  const rs = r.readyState ? `, readyState=${r.readyState}` : "";
25
- return ` (not ready after ${r.waitedMs ?? "?"}ms${rs})`;
35
+ return _t("cli.note.not_ready", { ms: r.waitedMs ?? "?", rs });
26
36
  }
27
37
  /** 滚动稳定说明:未在超时内稳定时如实标注 */
28
38
  function stableNote(r) {
29
39
  if (!r || r.stable !== false)
30
40
  return "";
31
- return ` (scroll position not stable after ${r.waitedMs ?? "?"}ms)`;
41
+ return _t("cli.note.scroll_unstable", { ms: r.waitedMs ?? "?" });
32
42
  }
33
43
  /** scroll_to_element 到达说明:未进入视口时如实标注(含原因) */
34
44
  function reachedNote(r) {
35
45
  if (!r || r.reached !== false)
36
46
  return "";
37
47
  const why = r.reason ? `: ${r.reason}` : "";
38
- return ` (element reached=${r.inViewport ? "in viewport" : "not in viewport"} after ${r.waitedMs ?? "?"}ms${why})`;
48
+ return _t("cli.note.reached", {
49
+ where: r.inViewport ? "in viewport" : "not in viewport",
50
+ ms: r.waitedMs ?? "?",
51
+ why,
52
+ });
39
53
  }
40
54
  /** 命令表:bt_cli 按 command 分发;命令描述全部走 i18n 键,帮助按 toolLang 本地化 */
55
+ /** `--timeout` 合法区间(ms):与 Rust `service.rs` 的 `TIMEOUT_MIN_MS`/`TIMEOUT_MAX_MS` 同口径 */
56
+ const TIMEOUT_MIN_MS = 100;
57
+ const TIMEOUT_MAX_MS = 60000;
58
+ /** 解析并规范化模型传入的 `--timeout`(毫秒,与 `wait_for_selector` 既有单位一致)
59
+ * - 未传/空:返回空串,各命令走服务端默认(1.9.0 批次4 起 eval/CDP/截图/wait_for_selector 均 15s)
60
+ * - 非正整数:抛错 —— 快速明确拒绝,不带着坏值进浏览器
61
+ * - 超出 [100, 60000]:钳制并把 `a.timeout` 改写为钳后值(实际生效值),返回如实标注文案
62
+ * 服务端 Rust 侧同口径二次钳制兜底(直连 HTTP 也安全);响应体的 timeoutClamped 与这里一致
63
+ */
64
+ function timeoutNote(a) {
65
+ const raw = a?.timeout;
66
+ if (raw === undefined || raw === null || raw === "")
67
+ return "";
68
+ const n = typeof raw === "number" ? raw : Number(String(raw).trim());
69
+ if (!Number.isInteger(n) || n <= 0) {
70
+ throw new Error(_t("cli.err.timeout_invalid", { v: String(raw) }));
71
+ }
72
+ const c = Math.min(Math.max(n, TIMEOUT_MIN_MS), TIMEOUT_MAX_MS);
73
+ a.timeout = c;
74
+ return c === n ? "" : _t("cli.note.timeout_clamped", { ms: c });
75
+ }
41
76
  const COMMANDS = {
42
77
  navigate: { usage: "--url", descKey: "cli.cmd.navigate", args: [{ flag: "url" }], run: async (a) => {
43
78
  const r = await service.navigate(a);
44
79
  if (r.installError)
45
- return `Installation failed: ${r.error}. Retry.`;
46
- return r.installing ? `Installing ${r.installing} (${r.progress}). Try again.` : `Navigated to: ${r.url}` + readyNote(r);
80
+ return _t("cli.out.navigate.install_failed", { error: r.error });
81
+ return r.installing ? _t("cli.out.navigate.installing", { name: r.installing, progress: r.progress }) : _t("cli.out.navigate.ok", { url: r.url }) + readyNote(r);
47
82
  } },
48
- click: { usage: "--selector", descKey: "cli.cmd.click", args: [{ flag: "selector" }], run: async (a) => { const r = await service.click(a); return "Clicked" + degradedNote(r); } },
49
- fill: { usage: "--selector --value", descKey: "cli.cmd.fill", args: [{ flag: "selector" }, { flag: "value" }], run: async (a) => { const r = await service.fill(a); return "Filled" + degradedNote(r); } },
50
- clear: { usage: "--selector", descKey: "cli.cmd.clear", args: [{ flag: "selector" }], run: async (a) => { const r = await service.clear(a); return "Cleared" + degradedNote(r); } },
51
- select: { usage: "--selector --value", descKey: "cli.cmd.select", args: [{ flag: "selector" }, { flag: "value" }], run: async (a) => { const r = await service.select(a); return "Selected" + degradedNote(r); } },
52
- hover: { usage: "--selector", descKey: "cli.cmd.hover", args: [{ flag: "selector" }], run: async (a) => { const r = await service.hover(a); return "Hovered" + degradedNote(r); } },
53
- drag: { usage: "--sourceSelector --targetSelector", descKey: "cli.cmd.drag", args: [{ flag: "sourceSelector" }, { flag: "targetSelector" }], run: async (a) => { await service.drag(a); return "Dragged"; } },
54
- press_key: { usage: "--key [--selector]", descKey: "cli.cmd.press_key", args: [{ flag: "key" }, { flag: "selector" }], run: async (a) => { await service.pressKey(a); return `Pressed: ${a.key}`; } },
55
- upload_file: { usage: "--selector --filePath", descKey: "cli.cmd.upload_file", args: [{ flag: "selector" }, { flag: "filePath" }], run: async (a) => { await service.uploadFile(a); return "Uploaded"; } },
56
- screenshot: { usage: "[--selector]", descKey: "cli.cmd.screenshot", args: [{ flag: "selector" }], run: async (a) => {
83
+ click: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.click", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.click(a); return _t("cli.out.click") + degradedNote(r) + tn; } },
84
+ fill: { usage: "--selector --value [--timeout ms]", descKey: "cli.cmd.fill", args: [{ flag: "selector" }, { flag: "value" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.fill(a); return _t("cli.out.fill") + degradedNote(r) + tn; } },
85
+ clear: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.clear", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.clear(a); return _t("cli.out.clear") + degradedNote(r) + tn; } },
86
+ select: { usage: "--selector --value [--timeout ms]", descKey: "cli.cmd.select", args: [{ flag: "selector" }, { flag: "value" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.select(a); return _t("cli.out.select") + degradedNote(r) + tn; } },
87
+ hover: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.hover", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.hover(a); return _t("cli.out.hover") + degradedNote(r) + tn; } },
88
+ drag: { usage: "--sourceSelector --targetSelector [--timeout ms]", descKey: "cli.cmd.drag", args: [{ flag: "sourceSelector" }, { flag: "targetSelector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); await service.drag(a); return _t("cli.out.drag") + tn; } },
89
+ press_key: { usage: "--key [--selector] [--timeout ms]", descKey: "cli.cmd.press_key", args: [{ flag: "key" }, { flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); await service.pressKey(a); return _t("cli.out.press_key", { key: a.key }) + tn; } },
90
+ upload_file: { usage: "--selector --filePath [--timeout ms]", descKey: "cli.cmd.upload_file", args: [{ flag: "selector" }, { flag: "filePath" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); await service.uploadFile(a); return _t("cli.out.upload_file") + tn; } },
91
+ screenshot: { usage: "[--selector] [--timeout ms]", descKey: "cli.cmd.screenshot", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => {
92
+ const tn = timeoutNote(a);
57
93
  const r = await service.screenshot(a);
58
94
  // 元素截图:先滚动到可见再截;rect 超出视口时走越界路径(截全),滚动未稳定/未到达如实标注
59
- const note = r?.beyondViewport ? " (element larger than viewport, captured beyond viewport)" : "";
60
- return { output: `Screenshot taken${a.selector ? ` (element: ${a.selector})` : " (full page)"}` + note + reachedNote(r) + stableNote(r), attachments: [{ type: "file", mime: r.mime || "image/png", url: `data:${r.mime || "image/png"};base64,${r.base64}` }] };
95
+ const where = a.selector ? _t("cli.out.screenshot.element", { sel: a.selector }) : _t("cli.out.screenshot.fullpage");
96
+ const note = r?.beyondViewport ? _t("cli.note.beyond") : "";
97
+ return { output: _t("cli.out.screenshot", { where }) + note + reachedNote(r) + stableNote(r) + tn, attachments: [{ type: "file", mime: r.mime || "image/png", url: `data:${r.mime || "image/png"};base64,${r.base64}` }] };
61
98
  } },
62
- evaluate: { usage: "--script", descKey: "cli.cmd.evaluate", args: [{ flag: "script" }], run: async (a) => JSON.stringify(await service.evaluate(a), null, 2) },
63
- get_visible_text: { usage: "[--selector]", descKey: "cli.cmd.get_visible_text", args: [{ flag: "selector" }], run: async (a) => (await service.visibleText(a))?.text || "(no visible text)" },
99
+ // evaluate:超时最常用(脚本 await 慢操作);超时返回明确 eval timeout 错误,不再恒 5s
100
+ evaluate: { usage: "--script [--timeout ms]", descKey: "cli.cmd.evaluate", args: [{ flag: "script" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); return JSON.stringify(await service.evaluate(a), null, 2) + tn; } },
101
+ get_visible_text: { usage: "[--selector]", descKey: "cli.cmd.get_visible_text", args: [{ flag: "selector" }], run: async (a) => (await service.visibleText(a))?.text || _t("cli.out.no_visible_text") },
64
102
  get_visible_html: { usage: "[--selector --removeScripts --removeComments --maxLength]", descKey: "cli.cmd.get_visible_html", args: [{ flag: "selector" }, { flag: "removeScripts", type: "boolean" }, { flag: "removeComments", type: "boolean" }, { flag: "maxLength" }], run: async (a) => {
65
103
  // 宿主要求 tool 返回字符串;服务端返回对象 {html,truncated},这里取出 html 文本本体
66
104
  const r = await service.visibleHtml(a);
67
105
  const html = r?.html || "";
68
106
  if (!html)
69
- return "(no visible html)";
107
+ return _t("cli.out.no_visible_html");
70
108
  // 被截断时追加提示:html.length 即服务端实际生效的 maxLength(已 slice),无需再传参
71
- return r?.truncated ? `${html}\n…(truncated at maxLength=${html.length})` : html;
109
+ return r?.truncated ? `${html}\n${_t("cli.out.html_truncated", { n: html.length })}` : html;
110
+ } },
111
+ 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); } },
114
+ // resize:宽高=内容区(视口)尺寸;被钳到下限时如实标注(服务端返回 clamped/content/window)
115
+ resize: { usage: "--width --height", descKey: "cli.cmd.resize", args: [{ flag: "width" }, { flag: "height" }], run: async (a) => {
116
+ const r = await service.resize(a);
117
+ const c = r.content || {};
118
+ return _t("cli.out.resize", { w: c.w, h: c.h }) + (r.clamped ? _t("cli.out.resize_clamped") : "");
72
119
  } },
73
- 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") || "(no logs)"; } },
74
- go_back: { usage: "", descKey: "cli.cmd.go_back", run: async () => { const r = await service.goBack(); return `Went back, current URL: ${r.url}` + readyNote(r); } },
75
- go_forward: { usage: "", descKey: "cli.cmd.go_forward", run: async () => { const r = await service.goForward(); return `Went forward, current URL: ${r.url}` + readyNote(r); } },
76
- resize: { usage: "--width --height", descKey: "cli.cmd.resize", args: [{ flag: "width" }, { flag: "height" }], run: async (a) => { await service.resize(a); return "Resized"; } },
77
120
  set_device: { usage: "[--name]", descKey: "cli.cmd.set_device", args: [{ flag: "name" }], run: async (a) => {
78
121
  if (!a.name) {
79
- const list = await service.deviceList();
80
- return ["Available device presets:", "", ...(list.devices || []).map((d) => ` ${d.name} ${d.width}x${d.height}${d.ua ? ` ${d.ua.slice(0, 60)}...` : " (default UA)"}`)].join("\n");
122
+ const list = await service.deviceList(sidArgs(a));
123
+ 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");
81
124
  }
82
125
  const r = await service.device({ name: a.name });
83
- return `Device preset applied: ${r.device} (${r.width}x${r.height})\nUser-Agent: ${r.ua}`;
126
+ return _t("cli.out.device_applied", { name: r.device, w: r.width, h: r.height, ua: r.ua });
127
+ } },
128
+ devtools: { usage: "[--action]", descKey: "cli.cmd.devtools", args: [{ flag: "action" }], run: async (a) => {
129
+ const r = await service.devtools({ action: a.action || "toggle" });
130
+ // supported=false:该平台无法真正关闭(Windows/wry 空实现)→ 如实提示,不接受误导性的「已关闭」
131
+ if (r?.supported === false)
132
+ return _t("cli.out.devtools_unsupported");
133
+ return r.open ? _t("cli.out.devtools_open") : _t("cli.out.devtools_closed");
84
134
  } },
85
- devtools: { usage: "[--action]", descKey: "cli.cmd.devtools", args: [{ flag: "action" }], run: async (a) => { const r = await service.devtools({ action: a.action || "toggle" }); return r.open ? "Devtools opened" : "Devtools closed"; } },
86
- reload: { usage: "", descKey: "cli.cmd.reload", run: async () => { const r = await service.reload(); return `Page reloaded: ${r.url}`; } },
87
- open_window: { usage: "", descKey: "cli.cmd.open_window", run: async () => { await openWindow(); return "Browser window opened"; } },
88
- close: { usage: "", descKey: "cli.cmd.close", run: async () => { if (!isRunning())
89
- return "Browser already closed"; await service.close(); await stopService(); return "Browser closed"; } },
90
- show_notification: { usage: "--message [--type]", descKey: "cli.cmd.show_notification", args: [{ flag: "message" }, { flag: "type" }], run: async (a) => { await service.notify(a); return "Notification shown"; } },
91
- scroll: { usage: "[--direction --amount]", descKey: "cli.cmd.scroll", args: [{ flag: "direction" }, { flag: "amount" }], run: async (a) => { const r = await service.scroll(a); return `Scrolled ${a.direction || "down"} by ${a.amount || 300}px` + stableNote(r); } },
92
- wait_for_selector: { usage: "--selector [--timeout]", descKey: "cli.cmd.wait_for_selector", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { await service.waitForSelector(a); return "Element appeared"; } },
93
- click_and_switch_tab: { usage: "--selector", descKey: "cli.cmd.click_and_switch_tab", args: [{ flag: "selector" }], run: async (a) => { const r = await service.clickSwitchTab(a); return `Clicked ${a.selector}, current URL: ${r.url || ""}` + degradedNote(r); } },
94
- iframe_click: { usage: "--iframeSelector --selector", descKey: "cli.cmd.iframe_click", args: [{ flag: "iframeSelector" }, { flag: "selector" }], run: async (a) => { const r = await service.iframeClick(a); return "Clicked in iframe" + degradedNote(r); } },
95
- iframe_fill: { usage: "--iframeSelector --selector --value", descKey: "cli.cmd.iframe_fill", args: [{ flag: "iframeSelector" }, { flag: "selector" }, { flag: "value" }], run: async (a) => { const r = await service.iframeFill(a); return "Filled in iframe" + degradedNote(r); } },
96
- get_browser_status: { usage: "", descKey: "cli.cmd.get_browser_status", run: async () => {
135
+ reload: { usage: "", descKey: "cli.cmd.reload", run: async (a) => { const r = await service.reload(sidArgs(a)); return r?.url ? _t("cli.out.reload", { url: r.url }) : _t("cli.out.reload_nourl"); } },
136
+ open_window: { usage: "", descKey: "cli.cmd.open_window", run: async (a) => { await openWindow(sidOf(a)); return _t("cli.out.open_window"); } },
137
+ close: { usage: "", descKey: "cli.cmd.close", run: async (a) => {
138
+ const sid = sidOf(a);
139
+ // 运行中或**启动中**都算「有实例可关」:启动中的实例由 closeSession 置 closedSids,启动链随后自毁
140
+ if (!isRunning(sid) && !isStarting(sid))
141
+ return _t("cli.out.close_already");
142
+ await closeSession(sid);
143
+ return _t("cli.out.close_done");
144
+ } },
145
+ show_notification: { usage: "--message [--type]", descKey: "cli.cmd.show_notification", args: [{ flag: "message" }, { flag: "type" }], run: async (a) => { await service.notify(a); return _t("cli.out.notify_shown"); } },
146
+ scroll: { usage: "[--direction --amount]", descKey: "cli.cmd.scroll", args: [{ flag: "direction" }, { flag: "amount" }], run: async (a) => { const r = await service.scroll(a); return _t("cli.out.scroll", { dir: a.direction || "down", n: a.amount || 300 }) + stableNote(r); } },
147
+ wait_for_selector: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.wait_for_selector", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); await service.waitForSelector(a); return _t("cli.out.wait_appeared") + tn; } },
148
+ click_and_switch_tab: { usage: "--selector", descKey: "cli.cmd.click_and_switch_tab", args: [{ flag: "selector" }], run: async (a) => { const r = await service.clickSwitchTab(a); return _t("cli.out.click_switch_tab", { sel: a.selector, url: r.url || "" }) + degradedNote(r); } },
149
+ iframe_click: { usage: "--iframeSelector --selector [--timeout ms]", descKey: "cli.cmd.iframe_click", args: [{ flag: "iframeSelector" }, { flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.iframeClick(a); return _t("cli.out.iframe_click") + degradedNote(r) + tn; } },
150
+ iframe_fill: { usage: "--iframeSelector --selector --value [--timeout ms]", descKey: "cli.cmd.iframe_fill", args: [{ flag: "iframeSelector" }, { flag: "selector" }, { flag: "value" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.iframeFill(a); return _t("cli.out.iframe_fill") + degradedNote(r) + tn; } },
151
+ get_browser_status: { usage: "", descKey: "cli.cmd.get_browser_status", run: async (a) => {
97
152
  // 纯查询:不 spawn、不懒启动(未运行只提示,不弹窗)
98
- const s = await probeStatus();
153
+ const s = await probeStatus(1500, sidOf(a));
99
154
  if (!s) {
100
155
  const b = getBinaryStatus();
101
- return `Browser is not running.\nbt-shell: ${describeBinaryStatus(b)}\n(执行任意其它工具会自动启动;也可用 open_window 显式启动)`;
156
+ // bt-shell 状态文案由 describeBinaryStatus 提供(已保证不含本机绝对路径)
157
+ return _t("cli.out.status.not_running", { bin: describeBinaryStatus(b) });
102
158
  }
103
159
  if (s.installing && Object.keys(s.installing).length > 0)
104
- return `Installing ${Object.entries(s.installing).map(([b, p]) => `${b} (${p})`).join(", ")}.`;
160
+ return _t("cli.out.status.installing", { list: Object.entries(s.installing).map(([b, p]) => `${b} (${p})`).join(", ") });
105
161
  if (!s.open)
106
- return "Browser is not open. Use command=open_window or navigate.";
107
- return `Browser is open\nTitle: ${s.title}\nURL: ${s.url}\nTabs: ${s.tabs}`;
162
+ return _t("cli.out.status.not_open");
163
+ return _t("cli.out.status.open", { title: s.title, url: s.url, n: s.tabs });
108
164
  } },
109
- list_tabs: { usage: "", descKey: "cli.cmd.list_tabs", run: async () => { const res = await service.tabs(); const list = res?.tabs || []; if (!list.length)
110
- return "(no tabs)"; return `Tabs (${list.length}):\n${list.map((p, i) => `[${i}] ${p.url || p.title}`).join("\n")}`; } },
111
- switch_tab: { usage: "--index", descKey: "cli.cmd.switch_tab", args: [{ flag: "index" }], run: async (a) => { const r = await service.switchTab(a); return `Switched to tab #${a.index}: ${r.url}`; } },
112
- new_tab: { usage: "--url", descKey: "cli.cmd.new_tab", args: [{ flag: "url" }], run: async (a) => { const r = await service.newTab(a); return `New tab opened: ${r.url}`; } },
113
- close_tab: { usage: "[--index]", descKey: "cli.cmd.close_tab", args: [{ flag: "index" }], run: async (a) => { await service.closeTab(a); return a.index !== undefined ? `Closed tab #${a.index}` : "Closed current tab"; } },
114
- get_element_state: { usage: "--selector", descKey: "cli.cmd.get_element_state", args: [{ flag: "selector" }], run: async (a) => { const r = await service.elementState(a); if (!r || !r.exists)
115
- return `Element not found: ${a.selector}`; return `Element <${r.tag}>: ${a.selector}\nVisible: ${r.visible}${r.text ? `\nText: ${r.text}` : ""}\nRect: ${r.rect.x},${r.rect.y} ${r.rect.w}x${r.rect.h}`; } },
116
- scroll_to_element: { usage: "--selector", descKey: "cli.cmd.scroll_to_element", args: [{ flag: "selector" }], run: async (a) => { const r = await service.scrollToElement(a); return "Scrolled to element" + reachedNote(r); } },
117
- get_dropdown_options: { usage: "--selector", descKey: "cli.cmd.get_dropdown_options", args: [{ flag: "selector" }], run: async (a) => { const r = await service.dropdownOptions(a); const opts = r?.options ?? []; if (!opts.length)
118
- return `Select not found or no options: ${a.selector}`; return opts.map((o) => `${o.selected ? "* " : " "}${o.value}: ${o.text}`).join("\n"); } },
119
- custom_user_agent: { usage: "--userAgent", descKey: "cli.cmd.custom_user_agent", args: [{ flag: "userAgent" }], run: async (a) => { await service.userAgent(a); return "User-Agent set"; } },
120
- expect_response: { usage: "--url", descKey: "cli.cmd.expect_response", args: [{ flag: "url" }], run: async (a) => { await service.expectResponse({ urlPattern: a.url }); return `Now expecting response matching: ${a.url}. Use command=assert_response to check.`; } },
121
- 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 ? `Response matched: ${r.url} (${r.status})` : r.error || "No response yet"; } },
122
- get_accessibility_tree: { usage: "[--selector --maxDepth]", descKey: "cli.cmd.get_accessibility_tree", args: [{ flag: "selector" }, { flag: "maxDepth" }], run: async (a) => { const s = await service.accessibility(a); return s ? formatNode(s, 0, a.maxDepth ?? 8) : "(no accessibility info)"; } },
123
- list_records: { usage: "", descKey: "cli.cmd.list_records", run: async () => { try {
124
- const records = await service.annotateRecords();
165
+ list_tabs: { usage: "", descKey: "cli.cmd.list_tabs", run: async (a) => { const res = await service.tabs(sidArgs(a)); const list = res?.tabs || []; if (!list.length)
166
+ return _t("cli.out.tabs_none"); return `${_t("cli.out.tabs_header", { n: list.length })}\n${list.map((p, i) => `[${i}] ${p.url || p.title}`).join("\n")}`; } },
167
+ switch_tab: { usage: "--index", descKey: "cli.cmd.switch_tab", args: [{ flag: "index" }], run: async (a) => { const r = await service.switchTab(a); return _t("cli.out.switch_tab", { i: a.index, url: r.url }); } },
168
+ new_tab: { usage: "--url", descKey: "cli.cmd.new_tab", args: [{ flag: "url" }], run: async (a) => { const r = await service.newTab(a); return _t("cli.out.new_tab", { url: r.url }); } },
169
+ close_tab: { usage: "[--index]", descKey: "cli.cmd.close_tab", args: [{ flag: "index" }], run: async (a) => { await service.closeTab(a); return a.index !== undefined ? _t("cli.out.close_tab", { i: a.index }) : _t("cli.out.close_tab_current"); } },
170
+ get_element_state: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.get_element_state", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.elementState(a); if (!r || !r.exists)
171
+ return _t("cli.out.element_not_found", { sel: a.selector }); const text = r.text ? `\nText: ${r.text}` : ""; return _t("cli.out.element_state", { tag: r.tag, sel: a.selector, visible: r.visible, text, rect: `${r.rect.x},${r.rect.y} ${r.rect.w}x${r.rect.h}` }) + tn; } },
172
+ scroll_to_element: { usage: "--selector [--timeout ms]", descKey: "cli.cmd.scroll_to_element", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => { const tn = timeoutNote(a); const r = await service.scrollToElement(a); return _t("cli.out.scroll_to_element") + reachedNote(r) + tn; } },
173
+ 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
+ return _t("cli.out.dropdown_none", { sel: a.selector }); return opts.map((o) => `${o.selected ? "* " : " "}${o.value}: ${o.text}`).join("\n") + tn; } },
175
+ 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"); } },
178
+ 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
+ list_records: { usage: "", descKey: "cli.cmd.list_records", run: async (a) => { try {
180
+ const records = await service.annotateRecords(sidArgs(a));
125
181
  if (!records || !records.length)
126
- return "(no records)";
182
+ return _t("cli.out.no_records");
127
183
  return records.map((r) => { const rect = r.rect ? ` rect=(${r.rect[0]},${r.rect[1]},${r.rect[2]},${r.rect[3]})` : ""; const img = r.image ? " +img" : ""; const sent = r.sent ? " [sent]" : ""; return `[${r.index}] ${r.selector}${rect}${img}${sent}${r.note ? ` note="${r.note}"` : ""}`; }).join("\n");
128
184
  }
129
185
  catch {
130
- return "(no records)";
186
+ return _t("cli.out.no_records");
131
187
  } } },
132
188
  read_record_content: { usage: "--id", descKey: "cli.cmd.read_record_content", args: [{ flag: "id" }], run: async (a) => { try {
133
- const records = await service.annotateRecords();
189
+ const records = await service.annotateRecords(sidArgs(a));
134
190
  const rec = (records || []).find((r) => r.index === a.id);
135
191
  if (!rec)
136
- return `(record #${a.id} not found)`;
192
+ return _t("cli.out.record_not_found", { id: a.id });
137
193
  let img = "";
138
194
  if (rec.image) {
139
- const p = saveShotImage(log, rec.index, rec.image);
140
- img = `\nimage: ${Math.round(rec.image.length / 1024)}KB base64` + (p ? ` (saved: ${p})` : "");
195
+ const p = saveShotImage(log, sidOf(a), rec.index, rec.image);
196
+ const kb = Math.round(rec.image.length / 1024);
197
+ img = p ? _t("cli.out.record_image_saved", { kb, path: p }) : _t("cli.out.record_image", { kb });
141
198
  }
142
- return `#${rec.index} ${rec.selector}\nrect: ${JSON.stringify(rec.rect)}${img}\nnote: ${rec.note || "(none)"}`;
199
+ return `#${rec.index} ${rec.selector}\nrect: ${JSON.stringify(rec.rect)}${img}\nnote: ${rec.note || _t("cli.out.record_note_none")}`;
143
200
  }
144
201
  catch {
145
- return "(no records)";
202
+ return _t("cli.out.no_records");
146
203
  } } },
147
- fake_audio: { usage: "--kind [--data --freq --durMs --notes --digits --loop]", descKey: "cli.cmd.fake_audio", args: [{ flag: "kind" }, { flag: "data" }, { flag: "freq" }, { flag: "durMs" }, { flag: "notes" }, { flag: "digits" }, { flag: "loop", type: "boolean" }], run: async (a) => { const r = await service.mediaAudio(a); return `Fake mic audio: ${r.injected}`; } },
148
- fake_video: { usage: "--kind [--data --url --loop]", descKey: "cli.cmd.fake_video", args: [{ flag: "kind" }, { flag: "data" }, { flag: "url" }, { flag: "loop", type: "boolean" }], run: async (a) => { const r = await service.mediaVideo(a); return `Fake camera video: ${r.injected}`; } },
204
+ fake_audio: { usage: "--kind [--data --freq --durMs --notes --digits --loop]", descKey: "cli.cmd.fake_audio", args: [{ flag: "kind" }, { flag: "data" }, { flag: "freq" }, { flag: "durMs" }, { flag: "notes" }, { flag: "digits" }, { flag: "loop", type: "boolean" }], run: async (a) => { const r = await service.mediaAudio(a); return _t("cli.out.fake_audio", { injected: r.injected }); } },
205
+ fake_video: { usage: "--kind [--data --url --loop]", descKey: "cli.cmd.fake_video", args: [{ flag: "kind" }, { flag: "data" }, { flag: "url" }, { flag: "loop", type: "boolean" }], run: async (a) => { const r = await service.mediaVideo(a); return _t("cli.out.fake_video", { injected: r.injected }); } },
149
206
  profile: { usage: "[--set <name> | --delete <name>]", descKey: "cli.cmd.profile", args: [{ flag: "set" }, { flag: "delete" }], run: async (a) => {
150
- mkdirSync(getProfilesDir(), { recursive: true });
151
207
  const active = getActiveProfile();
208
+ /** 解析 profile 路径;名字非法时返回错误文案(不 mkdir、不 rm) */
209
+ const resolveOrError = (raw) => {
210
+ const name = String(raw);
211
+ try {
212
+ return { dir: resolveProfilePath(name), name };
213
+ }
214
+ catch {
215
+ return { name, err: _t("cli.err.profile_invalid_name", { name }) };
216
+ }
217
+ };
152
218
  if (a.delete) {
153
- const name = String(a.delete);
219
+ const r = resolveOrError(a.delete);
220
+ if (r.err)
221
+ return r.err;
222
+ const name = r.name;
154
223
  if (name === "default")
155
- return "Cannot delete the default profile";
224
+ return _t("cli.out.profile_no_delete_default");
156
225
  if (name === active)
157
- return "Cannot delete the active profile; switch to another first (profile --set <name>)";
158
- const dir = getProfileDir(name);
226
+ return _t("cli.out.profile_no_delete_active");
227
+ const dir = r.dir;
159
228
  if (!existsSync(dir))
160
- return `Profile not found: ${name}`;
229
+ return _t("cli.out.profile_not_found", { name });
161
230
  rmSync(dir, { recursive: true, force: true });
162
- return `Deleted profile: ${name}`;
231
+ return _t("cli.out.profile_deleted", { name });
163
232
  }
164
233
  if (a.set) {
165
- const name = String(a.set);
234
+ const r = resolveOrError(a.set);
235
+ if (r.err)
236
+ return r.err;
237
+ const name = r.name;
166
238
  // 目标配置目录不存在则创建(允许 "profile --set <新名>" 直接新建并切换)
167
- mkdirSync(getProfileDir(name), { recursive: true });
239
+ mkdirSync(r.dir, { recursive: true });
168
240
  setActiveProfile(name);
169
- setUserDataDir(getProfileDir(name));
170
- // 切换配置:重启服务使新 user-data-dir 生效(丢当前标签可接受)
171
- await stopService();
172
- await ensureService();
173
- return `Switched to profile: ${name} (browser restarted)`;
241
+ // 1.9.0 会话隔离:profile 作用域改为「影响**后续新会话**的数据根(sessions/<profile>/<sid>)」。
242
+ // **不再重启共享 shell** —— 运行中的会话各自持有独立实例,切换互不打扰(旧实现会杀掉全局唯一窗口)。
243
+ return _t("cli.out.profile_switched", { name });
174
244
  }
175
245
  // 列出 user-data 下的配置目录
246
+ mkdirSync(getProfilesDir(), { recursive: true });
176
247
  const dirs = readdirSync(getProfilesDir(), { withFileTypes: true })
177
248
  .filter((d) => d.isDirectory())
178
249
  .map((d) => d.name);
179
- const list = dirs.map((d) => `${d === active ? "*" : " "} ${d}`).join("\n") || "(no profiles yet)";
180
- return `Profiles:\n${list}\n\nActive: ${active}\nSwitch: profile --set <name> (restarts browser, current tabs lost)\nDelete: profile --delete <name> (not default/active)`;
250
+ const list = dirs.map((d) => `${d === active ? "*" : " "} ${d}`).join("\n") || _t("cli.out.profiles_none");
251
+ return _t("cli.out.profiles_header", { list, active });
181
252
  } },
182
253
  exports: { usage: "", descKey: "cli.cmd.exports", run: async () => {
183
254
  const dir = getExportsDir();
184
255
  mkdirSync(dir, { recursive: true });
185
- return `Export directory: ${dir}\n\nHow to export from Edge/Chrome:\n Passwords: Settings → Profiles → Passwords → ⋯ → Export passwords (CSV)\n Bookmarks: Settings → Bookmarks → Export (HTML)\nPlace the exported files in the directory above, then the model can read them.\n\nRead passwords without leaking into context:\n lookup --csv <file.csv> --url <site>\n fill --selector <input> --value @file:<path>`;
256
+ return _t("cli.out.exports", { dir });
186
257
  } },
187
258
  lookup: { usage: "--csv <path> --url <site>", descKey: "cli.cmd.lookup", args: [{ flag: "csv" }, { flag: "url" }], run: async (a) => {
188
259
  const csv = a.csv;
189
260
  const url = a.url;
190
261
  if (!csv || !url)
191
- return "Usage: lookup --csv <path> --url <site>";
262
+ return _t("cli.out.lookup_usage");
192
263
  // 解析密码 CSV(name,url,username,password[,note]),按 url 子串匹配
193
264
  const lines = readFileSync(csv, "utf-8").split(/\r?\n/).filter((l) => l.trim());
194
265
  for (const line of lines.slice(1)) {
@@ -204,10 +275,10 @@ const COMMANDS = {
204
275
  mkdirSync(tmpDir, { recursive: true });
205
276
  const tmp = resolve(tmpDir, `secret-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.tmp`);
206
277
  writeFileSync(tmp, password, "utf-8");
207
- return `Found: ${username} @ ${rowUrl}\nUse: fill --selector <input> --value @file:${tmp}\n(password in temp file, deleted after use)`;
278
+ return _t("cli.out.lookup_found", { user: username, url: rowUrl, tmp });
208
279
  }
209
280
  }
210
- return `No entry found for: ${url}`;
281
+ return _t("cli.out.lookup_none", { url });
211
282
  } },
212
283
  };
213
284
  /** 帮助全文(command=help 或未知命令时返回;命令描述与结构按 toolLang 本地化) */
@@ -261,9 +332,7 @@ function splitCsvLine(line) {
261
332
  out.push(cur);
262
333
  return out;
263
334
  }
264
- export const opencodeBrowserTool = async ({ client, worktree, directory, serverUrl }) => {
265
- // 插件上下文(仅用于诊断:定位 session.list() 为空时是哪个实例/目录)
266
- pluginCtx = { directory: directory || "", worktree: worktree || "", serverUrl: serverUrl ? String(serverUrl) : "" };
335
+ export const opencodeBrowserTool = async ({ client, worktree, directory }) => {
267
336
  // 供 resolveShellBinary 定位本地 Rust 构建(publish-local 到缓存目录后仍能找到仓库)
268
337
  setAppDirectory(directory || "");
269
338
  registerLocale("en", en);
@@ -273,13 +342,24 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
273
342
  try {
274
343
  log.loaded();
275
344
  // 懒启动:仅保存启动参数,不立即弹窗;open_window 或首次调工具时启动
345
+ // 1.9.0 会话隔离:每个会话独立实例(独立端口 + 独立 user-data-dir),由 client.ts 的注册表管理
276
346
  configureService({
277
347
  nodePath: config.nodePath || "",
278
348
  browsersPath: getBrowsersDir(),
279
- sessionIsolation: config.sessionIsolation,
280
- browserType: config.browserType,
281
- // 多用户配置:默认用当前激活配置的独立 WebView2 用户数据目录
282
- userDataDir: getProfileDir(getActiveProfile()),
349
+ // 会话数据目录:sessions/<profile>/<sid>(profile 影响后续新会话的数据根)
350
+ resolveDataDir: (sid) => getSessionDataDir(sid),
351
+ });
352
+ // 会话 id 兜底解析器:工具调用没带 _sessionId 时用钩子缓存
353
+ setSessionIdResolver(() => sessionCache.get());
354
+ // 可选会话标题解析器:client.session.get 之类;拿不到/超时回退 sid 后缀,不阻塞启动
355
+ setTitleResolver(async (sid) => {
356
+ try {
357
+ const r = await client.session.get({ path: { id: sid } });
358
+ return r?.data?.title || null;
359
+ }
360
+ catch {
361
+ return null;
362
+ }
283
363
  });
284
364
  // 启动即后台下载 bt-shell(fire-and-forget:不阻塞启动,失败不抛出;状态见 getBinaryStatus)
285
365
  startDownload();
@@ -289,11 +369,19 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
289
369
  event: async ({ event }) => {
290
370
  // 缓存最近会话 id:这是投递批注最可靠的 sessionID 来源
291
371
  if (event.type === "session.deleted") {
292
- // 删除会话:只清缓存,**绝不触碰 shell** —— 否则会经 service.closeSession → callApi → ensureService
293
- // → spawn(bt-shell) 弹出浏览器窗口(而 /api/close-session 是空壳,唯一实际效果就是启动浏览器)
372
+ // 删除会话(1.9.0 语义升级):清钩子缓存 + **回收该会话自己的浏览器实例**。
373
+ // 仍是「绝不因删除而 spawn」:closeSession 只在注册表里有该 sid 时才动进程,
374
+ // 没有实例就直接返回(不会再走 callApi → ensureInstance 那条会弹窗的老路)。
294
375
  const delId = extractSessionIDFromEvent(event);
295
- if (delId)
376
+ if (delId) {
296
377
  sessionCache.clearIf(delId);
378
+ await closeSession(delId);
379
+ clearClosedState(delId);
380
+ // 清该 sid 的附着 notify 记录(附着模式共享 shell,避免残留 key 无限增长)
381
+ clearAttachNotifyForSid(delId);
382
+ // 回收该会话的数据目录(P1:否则退出后磁盘目录永不释放)
383
+ removeSessionDataDir(delId);
384
+ }
297
385
  return;
298
386
  }
299
387
  sessionCache.updateFromEvent(event);
@@ -332,26 +420,40 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
332
420
  params = parseFlagArgs(tokens, def);
333
421
  }
334
422
  catch (e) {
335
- return `${_t("cli.invalid_args").replace("{cmd}", cmdName).replace("{msg}", e.message)}\n\nUsage: bt_cli({ args: "${cmdName} ${def.usage}" })`;
423
+ // 解析错误可能夹带底层异常文本:进模型前先脱敏(用法提示本身不含路径)
424
+ return `${_t("cli.invalid_args").replace("{cmd}", cmdName).replace("{msg}", sanitizeForModel(e?.message || String(e)))}\n\nUsage: bt_cli({ args: "${cmdName} ${def.usage}" })`;
336
425
  }
337
426
  }
338
427
  // @file: 引用解析:值以 @file:<path> 开头时读文件内容作为实际值
339
428
  // (密码等敏感值不进 LLM 上下文,如 fill --value @file:C:\...\secret.tmp)
340
- // 仅删除临时目录(getTmpDir)内的文件,避免误删用户文件
341
- const tmpDir = resolve(getTmpDir());
429
+ // 安全边界:只允许读全局 tmp(getTmpDir)或**该会话** tmp(getSessionTmpDir)之内的文件;
430
+ // 其余路径一律拒绝(不读取),避免模型借助 @file: 读取任意本地文件。
431
+ // sid 形态校验:resolveSessionId 会原样返回外部传入的 sessionID,任意字符串(含 .. 、路径分隔符)
432
+ // 会把 getSessionTmpDir 带到 sessions 目录之外,从而左右 allowed dirs。不匹配 SESSION_SID_RE
433
+ // 一律回退 "default" 桶(而非 resolveSessionId(""):后者仍可能返回同一个非法的钩子缓存值)。
434
+ // "default" 本身合法,getSessionTmpDir("default") = sessions/<profile>/default/tmp,必在 sessions 内。
435
+ const fileSidRaw = resolveSessionId(context?.sessionID || "");
436
+ const fileSid = SESSION_SID_RE.test(fileSidRaw) ? fileSidRaw : "default";
437
+ const globalTmpDir = getTmpDir();
438
+ const allowedTmpDirs = [globalTmpDir, getSessionTmpDir(fileSid)];
342
439
  for (const key of Object.keys(params)) {
343
440
  const v = params[key];
344
441
  if (typeof v === "string" && v.startsWith("@file:")) {
345
442
  const p = v.slice(6);
443
+ const abs = resolve(p);
444
+ if (!allowedTmpDirs.some((d) => isInsideDir(abs, d))) {
445
+ return _t("cli.err.file_outside_tmp", { path: p });
446
+ }
346
447
  try {
347
- params[key] = readFileSync(p, "utf-8").replace(/\r?\n$/, "");
348
- // 用完即删(仅限 lookup 生成的临时密码文件)
349
- if (resolve(p).startsWith(tmpDir)) {
350
- unlinkSync(p);
448
+ params[key] = readFileSync(abs, "utf-8").replace(/\r?\n$/, "");
449
+ // 用完即删(仅限 lookup 生成的全局 tmp 临时密码文件;会话 tmp 内的截图等保留)
450
+ if (isInsideDir(abs, globalTmpDir)) {
451
+ unlinkSync(abs);
351
452
  }
352
453
  }
353
454
  catch (e) {
354
- return `Cannot read @file: ${p}: ${e.message}`;
455
+ // {path} 是模型自己传入的值,保持原样;{msg} 来自 fs 错误,必须脱敏
456
+ return _t("cli.read_file_failed", { path: p, msg: sanitizeForModel(e?.message || String(e)) });
355
457
  }
356
458
  }
357
459
  }
@@ -363,7 +465,8 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
363
465
  return await def.run(params);
364
466
  }
365
467
  catch (e) {
366
- return `${_t("cli.failed").replace("{cmd}", cmdName).replace("{msg}", e.message || e)}`;
468
+ // 命令失败可能带 fs/网络错误文本:统一脱敏后再回模型
469
+ return `${_t("cli.failed").replace("{cmd}", cmdName).replace("{msg}", sanitizeForModel(e?.message || String(e)))}`;
367
470
  }
368
471
  },
369
472
  }),
@@ -377,10 +480,14 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
377
480
  sessionCache.updateFromHookInput(context);
378
481
  setAppDirectory(context?.directory || "");
379
482
  const r = await service.mediaMode({ ...a, _sessionId: context?.sessionID || "" });
380
- return `Media mode: ${r.mode}`;
483
+ return _t("cli.out.media_mode", { mode: r.mode });
381
484
  },
382
485
  }),
383
486
  }, config.disabledTools),
487
+ // 插件卸载/进程退出:优雅关闭全部会话实例(按注册表 PID,绝不按名;附着模式不动外部进程)
488
+ dispose: async () => {
489
+ await closeAllSessions();
490
+ },
384
491
  };
385
492
  }
386
493
  catch (err) {
@@ -419,23 +526,20 @@ function filterDisabled(tools, disabled) {
419
526
  }
420
527
  return result;
421
528
  }
422
- /** 轮询批注发送队列:面板"发送全部"/截图"发送"后,拉取记录推送当前对话
423
- * 注意:插件函数会随会话/切目录多次执行,轮询器必须进程级单例,
424
- * 否则同一进程会累积多个 interval 空转(server 与 TUI 进程各一份,互不共享)
529
+ /** 事件驱动投递:shell 面板"发送全部"/截图"发送"后 POST 插件本地 /notify/<sid> 触发 drain
530
+ * 注意:插件函数会随会话/切目录多次执行,notify server 与 drain 状态必须进程级单例,
531
+ * 否则同一进程会累积多个监听/重复投递(server 与 TUI 进程各一份,互不共享)
425
532
  */
426
533
  let annotateClient = null;
427
- /** drain 进行中,避免并发重复投递 */
428
- let draining = false;
534
+ /** drain 进行中(按 sid 隔离:会话 A 的 drain 不会挡住会话 B 的投递) */
535
+ const drainingSid = new Set();
429
536
  /** 最近一次见到的会话 id 缓存(来自 event/chat.message/tool.execute.before 钩子) */
430
537
  const sessionCache = createSessionIDCache();
431
- /** 已记录过的 sid(避免重复刷屏) */
432
- let lastLoggedSessionID = "";
433
- /** 插件上下文(诊断用) */
434
- let pluginCtx = { directory: "", worktree: "", serverUrl: "" };
435
- /** 把截图 base64 落盘为临时 PNG,返回路径(失败返回 null);用于发送时保留图片与给出可读路径 */
436
- function saveShotImage(log, index, b64) {
538
+ /** 把截图 base64 落盘为临时 PNG,返回路径(失败返回 null);用于发送时保留图片与给出可读路径
539
+ * 1.9.0:落盘到**该会话**的临时目录 sessions/<profile>/<sid>/tmp(不再与其它会话共享全局 tmp) */
540
+ function saveShotImage(log, sid, index, b64) {
437
541
  try {
438
- const dir = resolve(getTmpDir());
542
+ const dir = resolve(getSessionTmpDir(sid));
439
543
  mkdirSync(dir, { recursive: true });
440
544
  const p = resolve(dir, `shot-${Date.now()}-${index}.png`);
441
545
  writeFileSync(p, Buffer.from(b64, "base64"));
@@ -446,42 +550,104 @@ function saveShotImage(log, index, b64) {
446
550
  return null;
447
551
  }
448
552
  }
553
+ /** 合法会话 id 形态(opencode 生成的 sid);不匹配则不删目录,避免意外路径 */
554
+ const SESSION_SID_RE = /^[A-Za-z0-9_-]{1,128}$/;
555
+ /** 会话目录删除失败后的重试延迟(ms;Windows 上文件常被短暂占用) */
556
+ const SESSION_DIR_RETRY_MS = 800;
557
+ /** 同步删除某 sid 的数据目录(失败仅记录,由调用方决定是否重试) */
558
+ function rmSessionDir(dir) {
559
+ try {
560
+ rmSync(dir, { recursive: true, force: true });
561
+ log.info(`[session] removed data dir for deleted session: ${dir}`);
562
+ return true;
563
+ }
564
+ catch (e) {
565
+ log.error(`[session] failed to remove data dir ${dir}: ${e.message}`, e);
566
+ return false;
567
+ }
568
+ }
569
+ /**
570
+ * 会话删除后回收**所有 profile 下**属于该 sid 的数据目录(sessions/<profile>/<sid>)。
571
+ * 用户切换过 activeProfile 时,老 profile 目录里的同名会话也要清掉,故枚举 sessions 根的直接子目录。
572
+ * 约束:sid 必须合法;每个目标必须在 getSessionsDir() 之内,且不等于 sessions 根或 profile 根
573
+ * (只删名为 <sid> 的目录,profile 目录本身永不删除)。
574
+ * Windows 文件锁导致失败时 800ms 后对失败列表重试一次;全部成功则不设定时器。
575
+ */
576
+ function removeSessionDataDir(sid) {
577
+ if (!SESSION_SID_RE.test(sid)) {
578
+ log.error(`[session] skip data dir cleanup: invalid session id (${sid.length} chars)`);
579
+ return;
580
+ }
581
+ const sessionsDir = getSessionsDir();
582
+ // 枚举直接子目录:每个 = 一个 profile;读不到(根不存在/无权限)视为无可回收目录
583
+ let profileNames;
584
+ try {
585
+ profileNames = readdirSync(sessionsDir, { withFileTypes: true })
586
+ .filter((e) => e.isDirectory())
587
+ .map((e) => e.name);
588
+ }
589
+ catch {
590
+ return;
591
+ }
592
+ const targets = [];
593
+ for (const name of profileNames) {
594
+ const profileDir = resolve(sessionsDir, name);
595
+ const target = resolve(profileDir, sid);
596
+ // 路径断言:仍在 sessions 根内,且不是 sessions 根/profile 根本身
597
+ if (!isInsideDir(target, sessionsDir) || target === sessionsDir || target === profileDir)
598
+ continue;
599
+ if (!existsSync(target))
600
+ continue;
601
+ targets.push(target);
602
+ }
603
+ if (!targets.length)
604
+ return;
605
+ const failed = targets.filter((t) => !rmSessionDir(t));
606
+ if (!failed.length) {
607
+ log.info(`[session] cleaned data dir for sid=${sid} across ${targets.length} profile dir(s)`);
608
+ return;
609
+ }
610
+ const timer = setTimeout(() => {
611
+ const stillFailing = failed.filter((t) => !rmSessionDir(t));
612
+ if (stillFailing.length) {
613
+ log.error(`[session] data dir cleanup still failing after retry (sid=${sid}): ${stillFailing.length} dir(s)`);
614
+ }
615
+ }, SESSION_DIR_RETRY_MS);
616
+ // 不让重试定时器拖住进程退出
617
+ timer.unref?.();
618
+ }
449
619
  /** 事件驱动投递:插件本地监听 shell 通知(收到即 drain),不再 setInterval 轮询 */
450
620
  function setupAnnotateDelivery(client) {
451
621
  // 更新 client 引用(插件重载后使用最新 client)
452
622
  annotateClient = client;
453
623
  // 服务就绪时做一次 drain(覆盖"通知机制建立前 shell 已发送过"的窗口,幂等;含 shell 重启)
454
- setServiceReadyHandler(() => {
455
- void drainAnnotate();
624
+ // 1.9.0:就绪回调带 sid → 只 drain 该会话自己的实例
625
+ setServiceReadyHandler((sid) => {
626
+ void drainAnnotate(sid);
456
627
  });
457
- // 启动监听并把地址交给 shell(spawn 时 --notify-url,就绪后 /api/notify-url 注册)
458
- startNotifyServer(() => {
459
- void drainAnnotate();
628
+ // 启动监听并把地址交给 shell(spawn 时 --notify-url /notify/<sid>,就绪后 /api/notify-url 注册)
629
+ // 1.9.0:通知按 URL 里的 sid 归属 → 彻底取代旧的「最后活跃会话」投递
630
+ startNotifyServer((sid) => {
631
+ void drainAnnotate(sid);
460
632
  })
461
- .then((p) => log.info(`[notify] listening 127.0.0.1:${p}/notify (event-driven; no polling)`))
633
+ .then((p) => log.info(`[notify] listening 127.0.0.1:${p}/notify/<sid> (event-driven; per-session routing)`))
462
634
  .catch((e) => log.error("[notify] listen failed (only initial/service-ready drain available)", e));
463
- // 插件启动时也 drain 一次(此时服务可能未起,isRunning() 会短路)
464
- void drainAnnotate();
465
635
  }
466
- /** 拉取待发送记录并投递到当前会话(推送触发;空结果不记日志) */
467
- async function drainAnnotate() {
468
- if (draining)
636
+ /** 拉取某会话待发送的记录并投递给**该会话**(推送触发;空结果不记日志) */
637
+ async function drainAnnotate(sid) {
638
+ if (!sid)
639
+ return;
640
+ if (drainingSid.has(sid))
469
641
  return;
470
642
  const c = annotateClient;
471
643
  if (!c)
472
644
  return;
473
- // 服务未启动/已关闭:跳过(服务就绪或通知到达时会再次触发)
474
- if (!isRunning())
645
+ // 该会话实例未启动/已关闭:跳过(服务就绪或下次通知到达时会再次触发;**绝不因 drain 而 spawn**)
646
+ if (!isRunning(sid))
475
647
  return;
476
- draining = true;
648
+ drainingSid.add(sid);
477
649
  try {
478
- // 观测钩子缓存:首次学到 sid 时记一次(证明 sid 来源可用)
479
- const learned = sessionCache.get();
480
- if (learned && learned !== lastLoggedSessionID) {
481
- log.info(`[notify] hook-cache sid=${learned}`);
482
- lastLoggedSessionID = learned;
483
- }
484
- const r = await service.annotateConsumeSent();
650
+ const r = await service.annotateConsumeSent({ _sessionId: sid });
485
651
  const records = r?.records || [];
486
652
  if (records.length === 0)
487
653
  return; // 空结果不刷屏
@@ -499,45 +665,22 @@ async function drainAnnotate() {
499
665
  // 图片**不经 session.prompt**(服务端对 image/* part 返回 400),而是走
500
666
  // 「工具结果附件」(bt_screenshot)或「读记录返回缓存路径」(read_record_content)。
501
667
  if (item.type === "screenshot" && item.image) {
502
- const savedPath = saveShotImage(log, item.index, item.image);
668
+ const savedPath = saveShotImage(log, sid, item.index, item.image);
503
669
  if (savedPath)
504
670
  lines.push(` (image saved: ${savedPath})`);
505
671
  }
506
672
  lines.push("");
507
673
  }
508
674
  const text = lines.join("\n");
509
- // 取当前会话 id:优先用钩子缓存(参考项目 ctx.sessionID 的等价物),session.list() 仅兜底
510
- let sid = sessionCache.get();
511
- let source = "hook-cache";
512
- let listLen = "-";
513
- if (!sid) {
514
- const sessions = await c.session.list();
515
- listLen = Array.isArray(sessions?.data) ? sessions.data.length : sessions?.error ? "error" : "none";
516
- log.info(`[drain] session.list raw=${JSON.stringify(sessions).slice(0, 400)}`);
517
- sid = sessions?.data?.[0]?.id;
518
- source = "client.session.list()[0]";
519
- }
520
- // 关键诊断:sid 来源/缓存值/list 长度/插件目录(定位"静默失败"断点)
521
- log.info(`[drain] sid source=${source} cached=${sessionCache.get() || "(EMPTY)"} listLen=${listLen} ctx=${pluginCtx.directory || "(none)"} srv=${pluginCtx.serverUrl || "(none)"} sid=${sid ?? "(EMPTY)"}`);
522
- if (!sid) {
523
- const msg = "no session id (hook cache empty and session.list returned none)";
524
- log.error(`[drain] ${msg}`, new Error(msg));
525
- try {
526
- await service.notify({ message: `发送失败: ${msg}`, type: "err" });
527
- }
528
- catch { }
529
- return;
530
- }
531
- const send = (parts) => c.session.prompt({ path: { id: sid }, body: { noReply: false, parts } });
532
- // 只发文本(参考实现同为纯文本;图片由工具附件/缓存路径交付,不在 prompt 里塞图片 part)
533
- log.info(`[drain] prompt -> sid=${sid} parts=text-only textLen=${text.length}`);
534
- const res = await send([{ type: "text", text }]);
675
+ // 投递目标 = 通知 URL 里的 sid(1.9.0 会话隔离:取代旧的 hook-cache last-writer-wins)
676
+ log.info(`[drain] sid=${sid} prompt parts=text-only textLen=${text.length}`);
677
+ const res = await c.session.prompt({ path: { id: sid }, body: { noReply: false, parts: [{ type: "text", text }] } });
535
678
  const err = res?.error;
536
679
  if (err) {
537
680
  // 不再静默:写日志 + 页面通知(SDK 返回 {error} 不抛,必须显式检查)
538
681
  log.error(`[drain] prompt FAILED sid=${sid}: ${JSON.stringify(err).slice(0, 300)}`, new Error("prompt error"));
539
682
  try {
540
- await service.notify({ message: `发送记录失败: ${JSON.stringify(err).slice(0, 180)}`, type: "err" });
683
+ await service.notify({ message: `发送记录失败: ${JSON.stringify(err).slice(0, 180)}`, type: "err" }, sid);
541
684
  }
542
685
  catch { }
543
686
  }
@@ -549,7 +692,7 @@ async function drainAnnotate() {
549
692
  log.error("annotate drain error", e);
550
693
  }
551
694
  finally {
552
- draining = false;
695
+ drainingSid.delete(sid);
553
696
  }
554
697
  }
555
698
  // Export default for npm loader