@xiaoqiong0v0/opencode-browser-tool 1.6.0 → 1.9.0

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,191 +2,235 @@ 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, getProfileDir, getExportsDir, getTmpDir, getActiveProfile, setActiveProfile, getSessionDataDir, getSessionTmpDir, } 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, closeSession, closeAllSessions, clearClosedState, service, probeStatus, } from "./client.js";
10
10
  import { startNotifyServer } from "./notify-server.js";
11
11
  import { startDownload, getBinaryStatus, describeBinaryStatus } from "./binary.js";
12
12
  import { tool } from "@opencode-ai/plugin";
13
13
  import { log } from "./logger.js";
14
14
  import { createSessionIDCache, extractSessionIDFromEvent } from "./session-id.js";
15
- const _t = (k) => t(k);
15
+ /** 取 i18n 文案(tf 的快捷别名;vars 可选,替换 {name} 占位符) */
16
+ const _t = (k, vars) => tf(k, vars);
17
+ /** 当前会话 id(工具调用的显式 _sessionId 优先,否则用钩子缓存兜底) */
18
+ function sidOf(a) {
19
+ return resolveSessionId(typeof a?._sessionId === "string" ? a._sessionId : "");
20
+ }
21
+ /** 构造只带会话 id 的请求体(用于无参但需按会话路由的命令,如 list_tabs / reload) */
22
+ function sidArgs(a) {
23
+ return { _sessionId: sidOf(a) };
24
+ }
16
25
  /** 降级说明:服务端在无可信通道、退回 untrusted DOM/JS 时返回 degraded,统一在此追加标注 */
17
26
  function degradedNote(r) {
18
- return r && r.degraded ? ` (degraded: ${r.degradedReason || "untrusted fallback"})` : "";
27
+ return r && r.degraded ? _t("cli.note.degraded", { reason: r.degradedReason || "untrusted fallback" }) : "";
19
28
  }
20
29
  /** 就绪说明:导航/前进后退未在超时内就绪时如实标注(不假装成功) */
21
30
  function readyNote(r) {
22
31
  if (!r || r.ready !== false)
23
32
  return "";
24
33
  const rs = r.readyState ? `, readyState=${r.readyState}` : "";
25
- return ` (not ready after ${r.waitedMs ?? "?"}ms${rs})`;
34
+ return _t("cli.note.not_ready", { ms: r.waitedMs ?? "?", rs });
26
35
  }
27
36
  /** 滚动稳定说明:未在超时内稳定时如实标注 */
28
37
  function stableNote(r) {
29
38
  if (!r || r.stable !== false)
30
39
  return "";
31
- return ` (scroll position not stable after ${r.waitedMs ?? "?"}ms)`;
40
+ return _t("cli.note.scroll_unstable", { ms: r.waitedMs ?? "?" });
32
41
  }
33
42
  /** scroll_to_element 到达说明:未进入视口时如实标注(含原因) */
34
43
  function reachedNote(r) {
35
44
  if (!r || r.reached !== false)
36
45
  return "";
37
46
  const why = r.reason ? `: ${r.reason}` : "";
38
- return ` (element reached=${r.inViewport ? "in viewport" : "not in viewport"} after ${r.waitedMs ?? "?"}ms${why})`;
47
+ return _t("cli.note.reached", {
48
+ where: r.inViewport ? "in viewport" : "not in viewport",
49
+ ms: r.waitedMs ?? "?",
50
+ why,
51
+ });
39
52
  }
40
53
  /** 命令表:bt_cli 按 command 分发;命令描述全部走 i18n 键,帮助按 toolLang 本地化 */
54
+ /** `--timeout` 合法区间(ms):与 Rust `service.rs` 的 `TIMEOUT_MIN_MS`/`TIMEOUT_MAX_MS` 同口径 */
55
+ const TIMEOUT_MIN_MS = 100;
56
+ const TIMEOUT_MAX_MS = 60000;
57
+ /** 解析并规范化模型传入的 `--timeout`(毫秒,与 `wait_for_selector` 既有单位一致)
58
+ * - 未传/空:返回空串,各命令走服务端默认(1.9.0 批次4 起 eval/CDP/截图/wait_for_selector 均 15s)
59
+ * - 非正整数:抛错 —— 快速明确拒绝,不带着坏值进浏览器
60
+ * - 超出 [100, 60000]:钳制并把 `a.timeout` 改写为钳后值(实际生效值),返回如实标注文案
61
+ * 服务端 Rust 侧同口径二次钳制兜底(直连 HTTP 也安全);响应体的 timeoutClamped 与这里一致
62
+ */
63
+ function timeoutNote(a) {
64
+ const raw = a?.timeout;
65
+ if (raw === undefined || raw === null || raw === "")
66
+ return "";
67
+ const n = typeof raw === "number" ? raw : Number(String(raw).trim());
68
+ if (!Number.isInteger(n) || n <= 0) {
69
+ throw new Error(_t("cli.err.timeout_invalid", { v: String(raw) }));
70
+ }
71
+ const c = Math.min(Math.max(n, TIMEOUT_MIN_MS), TIMEOUT_MAX_MS);
72
+ a.timeout = c;
73
+ return c === n ? "" : _t("cli.note.timeout_clamped", { ms: c });
74
+ }
41
75
  const COMMANDS = {
42
76
  navigate: { usage: "--url", descKey: "cli.cmd.navigate", args: [{ flag: "url" }], run: async (a) => {
43
77
  const r = await service.navigate(a);
44
78
  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);
79
+ return _t("cli.out.navigate.install_failed", { error: r.error });
80
+ 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
81
  } },
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) => {
82
+ 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; } },
83
+ 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; } },
84
+ 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; } },
85
+ 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; } },
86
+ 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; } },
87
+ 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; } },
88
+ 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; } },
89
+ 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; } },
90
+ screenshot: { usage: "[--selector] [--timeout ms]", descKey: "cli.cmd.screenshot", args: [{ flag: "selector" }, { flag: "timeout" }], run: async (a) => {
91
+ const tn = timeoutNote(a);
57
92
  const r = await service.screenshot(a);
58
- return { output: `Screenshot taken${a.selector ? ` (element: ${a.selector})` : " (full page)"}`, attachments: [{ type: "file", mime: r.mime || "image/png", url: `data:${r.mime || "image/png"};base64,${r.base64}` }] };
93
+ // 元素截图:先滚动到可见再截;rect 超出视口时走越界路径(截全),滚动未稳定/未到达如实标注
94
+ const where = a.selector ? _t("cli.out.screenshot.element", { sel: a.selector }) : _t("cli.out.screenshot.fullpage");
95
+ const note = r?.beyondViewport ? _t("cli.note.beyond") : "";
96
+ 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}` }] };
59
97
  } },
60
- evaluate: { usage: "--script", descKey: "cli.cmd.evaluate", args: [{ flag: "script" }], run: async (a) => JSON.stringify(await service.evaluate(a), null, 2) },
61
- 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)" },
98
+ // evaluate:超时最常用(脚本 await 慢操作);超时返回明确 eval timeout 错误,不再恒 5s
99
+ 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; } },
100
+ 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") },
62
101
  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) => {
63
102
  // 宿主要求 tool 返回字符串;服务端返回对象 {html,truncated},这里取出 html 文本本体
64
103
  const r = await service.visibleHtml(a);
65
104
  const html = r?.html || "";
66
105
  if (!html)
67
- return "(no visible html)";
106
+ return _t("cli.out.no_visible_html");
68
107
  // 被截断时追加提示:html.length 即服务端实际生效的 maxLength(已 slice),无需再传参
69
- return r?.truncated ? `${html}\n…(truncated at maxLength=${html.length})` : html;
108
+ return r?.truncated ? `${html}\n${_t("cli.out.html_truncated", { n: html.length })}` : html;
109
+ } },
110
+ 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"); } },
111
+ 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); } },
112
+ 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); } },
113
+ // resize:宽高=内容区(视口)尺寸;被钳到下限时如实标注(服务端返回 clamped/content/window)
114
+ resize: { usage: "--width --height", descKey: "cli.cmd.resize", args: [{ flag: "width" }, { flag: "height" }], run: async (a) => {
115
+ const r = await service.resize(a);
116
+ const c = r.content || {};
117
+ return _t("cli.out.resize", { w: c.w, h: c.h }) + (r.clamped ? _t("cli.out.resize_clamped") : "");
70
118
  } },
71
- 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)"; } },
72
- go_back: { usage: "", descKey: "cli.cmd.go_back", run: async () => { const r = await service.goBack(); return `Went back, current URL: ${r.url}` + readyNote(r); } },
73
- go_forward: { usage: "", descKey: "cli.cmd.go_forward", run: async () => { const r = await service.goForward(); return `Went forward, current URL: ${r.url}` + readyNote(r); } },
74
- resize: { usage: "--width --height", descKey: "cli.cmd.resize", args: [{ flag: "width" }, { flag: "height" }], run: async (a) => { await service.resize(a); return "Resized"; } },
75
119
  set_device: { usage: "[--name]", descKey: "cli.cmd.set_device", args: [{ flag: "name" }], run: async (a) => {
76
120
  if (!a.name) {
77
- const list = await service.deviceList();
78
- 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");
121
+ const list = await service.deviceList(sidArgs(a));
122
+ 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");
79
123
  }
80
124
  const r = await service.device({ name: a.name });
81
- return `Device preset applied: ${r.device} (${r.width}x${r.height})\nUser-Agent: ${r.ua}`;
125
+ return _t("cli.out.device_applied", { name: r.device, w: r.width, h: r.height, ua: r.ua });
82
126
  } },
83
- 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"; } },
84
- reload: { usage: "", descKey: "cli.cmd.reload", run: async () => { const r = await service.reload(); return `Page reloaded: ${r.url}`; } },
85
- open_window: { usage: "", descKey: "cli.cmd.open_window", run: async () => { await openWindow(); return "Browser window opened"; } },
86
- close: { usage: "", descKey: "cli.cmd.close", run: async () => { if (!isRunning())
87
- return "Browser already closed"; await service.close(); await stopService(); return "Browser closed"; } },
88
- 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"; } },
89
- 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); } },
90
- 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"; } },
91
- 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); } },
92
- 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); } },
93
- 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); } },
94
- get_browser_status: { usage: "", descKey: "cli.cmd.get_browser_status", run: async () => {
127
+ 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 ? _t("cli.out.devtools_open") : _t("cli.out.devtools_closed"); } },
128
+ 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"); } },
129
+ open_window: { usage: "", descKey: "cli.cmd.open_window", run: async (a) => { await openWindow(sidOf(a)); return _t("cli.out.open_window"); } },
130
+ close: { usage: "", descKey: "cli.cmd.close", run: async (a) => { const sid = sidOf(a); if (!isRunning(sid))
131
+ return _t("cli.out.close_already"); await closeSession(sid); return _t("cli.out.close_done"); } },
132
+ 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"); } },
133
+ 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); } },
134
+ 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; } },
135
+ 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); } },
136
+ 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; } },
137
+ 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; } },
138
+ get_browser_status: { usage: "", descKey: "cli.cmd.get_browser_status", run: async (a) => {
95
139
  // 纯查询:不 spawn、不懒启动(未运行只提示,不弹窗)
96
- const s = await probeStatus();
140
+ const s = await probeStatus(1500, sidOf(a));
97
141
  if (!s) {
98
142
  const b = getBinaryStatus();
99
- return `Browser is not running.\nbt-shell: ${describeBinaryStatus(b)}\n(执行任意其它工具会自动启动;也可用 open_window 显式启动)`;
143
+ // bt-shell 状态文案由 describeBinaryStatus 提供(已保证不含本机绝对路径)
144
+ return _t("cli.out.status.not_running", { bin: describeBinaryStatus(b) });
100
145
  }
101
146
  if (s.installing && Object.keys(s.installing).length > 0)
102
- return `Installing ${Object.entries(s.installing).map(([b, p]) => `${b} (${p})`).join(", ")}.`;
147
+ return _t("cli.out.status.installing", { list: Object.entries(s.installing).map(([b, p]) => `${b} (${p})`).join(", ") });
103
148
  if (!s.open)
104
- return "Browser is not open. Use command=open_window or navigate.";
105
- return `Browser is open\nTitle: ${s.title}\nURL: ${s.url}\nTabs: ${s.tabs}`;
149
+ return _t("cli.out.status.not_open");
150
+ return _t("cli.out.status.open", { title: s.title, url: s.url, n: s.tabs });
106
151
  } },
107
- list_tabs: { usage: "", descKey: "cli.cmd.list_tabs", run: async () => { const res = await service.tabs(); const list = res?.tabs || []; if (!list.length)
108
- return "(no tabs)"; return `Tabs (${list.length}):\n${list.map((p, i) => `[${i}] ${p.url || p.title}`).join("\n")}`; } },
109
- 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}`; } },
110
- 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}`; } },
111
- 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"; } },
112
- 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)
113
- 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}`; } },
114
- 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); } },
115
- 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)
116
- return `Select not found or no options: ${a.selector}`; return opts.map((o) => `${o.selected ? "* " : " "}${o.value}: ${o.text}`).join("\n"); } },
117
- 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"; } },
118
- 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.`; } },
119
- 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"; } },
120
- 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)"; } },
121
- list_records: { usage: "", descKey: "cli.cmd.list_records", run: async () => { try {
122
- const records = await service.annotateRecords();
152
+ 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)
153
+ 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")}`; } },
154
+ 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 }); } },
155
+ 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 }); } },
156
+ 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"); } },
157
+ 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)
158
+ 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; } },
159
+ 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; } },
160
+ 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)
161
+ return _t("cli.out.dropdown_none", { sel: a.selector }); return opts.map((o) => `${o.selected ? "* " : " "}${o.value}: ${o.text}`).join("\n") + tn; } },
162
+ 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"); } },
163
+ 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 }); } },
164
+ 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"); } },
165
+ 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; } },
166
+ list_records: { usage: "", descKey: "cli.cmd.list_records", run: async (a) => { try {
167
+ const records = await service.annotateRecords(sidArgs(a));
123
168
  if (!records || !records.length)
124
- return "(no records)";
169
+ return _t("cli.out.no_records");
125
170
  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");
126
171
  }
127
172
  catch {
128
- return "(no records)";
173
+ return _t("cli.out.no_records");
129
174
  } } },
130
175
  read_record_content: { usage: "--id", descKey: "cli.cmd.read_record_content", args: [{ flag: "id" }], run: async (a) => { try {
131
- const records = await service.annotateRecords();
176
+ const records = await service.annotateRecords(sidArgs(a));
132
177
  const rec = (records || []).find((r) => r.index === a.id);
133
178
  if (!rec)
134
- return `(record #${a.id} not found)`;
179
+ return _t("cli.out.record_not_found", { id: a.id });
135
180
  let img = "";
136
181
  if (rec.image) {
137
- const p = saveShotImage(log, rec.index, rec.image);
138
- img = `\nimage: ${Math.round(rec.image.length / 1024)}KB base64` + (p ? ` (saved: ${p})` : "");
182
+ const p = saveShotImage(log, sidOf(a), rec.index, rec.image);
183
+ const kb = Math.round(rec.image.length / 1024);
184
+ img = p ? _t("cli.out.record_image_saved", { kb, path: p }) : _t("cli.out.record_image", { kb });
139
185
  }
140
- return `#${rec.index} ${rec.selector}\nrect: ${JSON.stringify(rec.rect)}${img}\nnote: ${rec.note || "(none)"}`;
186
+ return `#${rec.index} ${rec.selector}\nrect: ${JSON.stringify(rec.rect)}${img}\nnote: ${rec.note || _t("cli.out.record_note_none")}`;
141
187
  }
142
188
  catch {
143
- return "(no records)";
189
+ return _t("cli.out.no_records");
144
190
  } } },
145
- 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}`; } },
146
- 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}`; } },
191
+ 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 }); } },
192
+ 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 }); } },
147
193
  profile: { usage: "[--set <name> | --delete <name>]", descKey: "cli.cmd.profile", args: [{ flag: "set" }, { flag: "delete" }], run: async (a) => {
148
194
  mkdirSync(getProfilesDir(), { recursive: true });
149
195
  const active = getActiveProfile();
150
196
  if (a.delete) {
151
197
  const name = String(a.delete);
152
198
  if (name === "default")
153
- return "Cannot delete the default profile";
199
+ return _t("cli.out.profile_no_delete_default");
154
200
  if (name === active)
155
- return "Cannot delete the active profile; switch to another first (profile --set <name>)";
201
+ return _t("cli.out.profile_no_delete_active");
156
202
  const dir = getProfileDir(name);
157
203
  if (!existsSync(dir))
158
- return `Profile not found: ${name}`;
204
+ return _t("cli.out.profile_not_found", { name });
159
205
  rmSync(dir, { recursive: true, force: true });
160
- return `Deleted profile: ${name}`;
206
+ return _t("cli.out.profile_deleted", { name });
161
207
  }
162
208
  if (a.set) {
163
209
  const name = String(a.set);
164
210
  // 目标配置目录不存在则创建(允许 "profile --set <新名>" 直接新建并切换)
165
211
  mkdirSync(getProfileDir(name), { recursive: true });
166
212
  setActiveProfile(name);
167
- setUserDataDir(getProfileDir(name));
168
- // 切换配置:重启服务使新 user-data-dir 生效(丢当前标签可接受)
169
- await stopService();
170
- await ensureService();
171
- return `Switched to profile: ${name} (browser restarted)`;
213
+ // 1.9.0 会话隔离:profile 作用域改为「影响**后续新会话**的数据根(sessions/<profile>/<sid>)」。
214
+ // **不再重启共享 shell** —— 运行中的会话各自持有独立实例,切换互不打扰(旧实现会杀掉全局唯一窗口)。
215
+ return _t("cli.out.profile_switched", { name });
172
216
  }
173
217
  // 列出 user-data 下的配置目录
174
218
  const dirs = readdirSync(getProfilesDir(), { withFileTypes: true })
175
219
  .filter((d) => d.isDirectory())
176
220
  .map((d) => d.name);
177
- const list = dirs.map((d) => `${d === active ? "*" : " "} ${d}`).join("\n") || "(no profiles yet)";
178
- return `Profiles:\n${list}\n\nActive: ${active}\nSwitch: profile --set <name> (restarts browser, current tabs lost)\nDelete: profile --delete <name> (not default/active)`;
221
+ const list = dirs.map((d) => `${d === active ? "*" : " "} ${d}`).join("\n") || _t("cli.out.profiles_none");
222
+ return _t("cli.out.profiles_header", { list, active });
179
223
  } },
180
224
  exports: { usage: "", descKey: "cli.cmd.exports", run: async () => {
181
225
  const dir = getExportsDir();
182
226
  mkdirSync(dir, { recursive: true });
183
- 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>`;
227
+ return _t("cli.out.exports", { dir });
184
228
  } },
185
229
  lookup: { usage: "--csv <path> --url <site>", descKey: "cli.cmd.lookup", args: [{ flag: "csv" }, { flag: "url" }], run: async (a) => {
186
230
  const csv = a.csv;
187
231
  const url = a.url;
188
232
  if (!csv || !url)
189
- return "Usage: lookup --csv <path> --url <site>";
233
+ return _t("cli.out.lookup_usage");
190
234
  // 解析密码 CSV(name,url,username,password[,note]),按 url 子串匹配
191
235
  const lines = readFileSync(csv, "utf-8").split(/\r?\n/).filter((l) => l.trim());
192
236
  for (const line of lines.slice(1)) {
@@ -202,10 +246,10 @@ const COMMANDS = {
202
246
  mkdirSync(tmpDir, { recursive: true });
203
247
  const tmp = resolve(tmpDir, `secret-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.tmp`);
204
248
  writeFileSync(tmp, password, "utf-8");
205
- return `Found: ${username} @ ${rowUrl}\nUse: fill --selector <input> --value @file:${tmp}\n(password in temp file, deleted after use)`;
249
+ return _t("cli.out.lookup_found", { user: username, url: rowUrl, tmp });
206
250
  }
207
251
  }
208
- return `No entry found for: ${url}`;
252
+ return _t("cli.out.lookup_none", { url });
209
253
  } },
210
254
  };
211
255
  /** 帮助全文(command=help 或未知命令时返回;命令描述与结构按 toolLang 本地化) */
@@ -271,13 +315,24 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
271
315
  try {
272
316
  log.loaded();
273
317
  // 懒启动:仅保存启动参数,不立即弹窗;open_window 或首次调工具时启动
318
+ // 1.9.0 会话隔离:每个会话独立实例(独立端口 + 独立 user-data-dir),由 client.ts 的注册表管理
274
319
  configureService({
275
320
  nodePath: config.nodePath || "",
276
321
  browsersPath: getBrowsersDir(),
277
- sessionIsolation: config.sessionIsolation,
278
- browserType: config.browserType,
279
- // 多用户配置:默认用当前激活配置的独立 WebView2 用户数据目录
280
- userDataDir: getProfileDir(getActiveProfile()),
322
+ // 会话数据目录:sessions/<profile>/<sid>(profile 影响后续新会话的数据根)
323
+ resolveDataDir: (sid) => getSessionDataDir(sid),
324
+ });
325
+ // 会话 id 兜底解析器:工具调用没带 _sessionId 时用钩子缓存
326
+ setSessionIdResolver(() => sessionCache.get());
327
+ // 可选会话标题解析器:client.session.get 之类;拿不到/超时回退 sid 后缀,不阻塞启动
328
+ setTitleResolver(async (sid) => {
329
+ try {
330
+ const r = await client.session.get({ path: { id: sid } });
331
+ return r?.data?.title || null;
332
+ }
333
+ catch {
334
+ return null;
335
+ }
281
336
  });
282
337
  // 启动即后台下载 bt-shell(fire-and-forget:不阻塞启动,失败不抛出;状态见 getBinaryStatus)
283
338
  startDownload();
@@ -287,11 +342,15 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
287
342
  event: async ({ event }) => {
288
343
  // 缓存最近会话 id:这是投递批注最可靠的 sessionID 来源
289
344
  if (event.type === "session.deleted") {
290
- // 删除会话:只清缓存,**绝不触碰 shell** —— 否则会经 service.closeSession → callApi → ensureService
291
- // → spawn(bt-shell) 弹出浏览器窗口(而 /api/close-session 是空壳,唯一实际效果就是启动浏览器)
345
+ // 删除会话(1.9.0 语义升级):清钩子缓存 + **回收该会话自己的浏览器实例**。
346
+ // 仍是「绝不因删除而 spawn」:closeSession 只在注册表里有该 sid 时才动进程,
347
+ // 没有实例就直接返回(不会再走 callApi → ensureService 那条会弹窗的老路)。
292
348
  const delId = extractSessionIDFromEvent(event);
293
- if (delId)
349
+ if (delId) {
294
350
  sessionCache.clearIf(delId);
351
+ await closeSession(delId);
352
+ clearClosedState(delId);
353
+ }
295
354
  return;
296
355
  }
297
356
  sessionCache.updateFromEvent(event);
@@ -349,7 +408,7 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
349
408
  }
350
409
  }
351
410
  catch (e) {
352
- return `Cannot read @file: ${p}: ${e.message}`;
411
+ return _t("cli.read_file_failed", { path: p, msg: e.message });
353
412
  }
354
413
  }
355
414
  }
@@ -375,10 +434,14 @@ export const opencodeBrowserTool = async ({ client, worktree, directory, serverU
375
434
  sessionCache.updateFromHookInput(context);
376
435
  setAppDirectory(context?.directory || "");
377
436
  const r = await service.mediaMode({ ...a, _sessionId: context?.sessionID || "" });
378
- return `Media mode: ${r.mode}`;
437
+ return _t("cli.out.media_mode", { mode: r.mode });
379
438
  },
380
439
  }),
381
440
  }, config.disabledTools),
441
+ // 插件卸载/进程退出:优雅关闭全部会话实例(按注册表 PID,绝不按名;附着模式不动外部进程)
442
+ dispose: async () => {
443
+ await closeAllSessions();
444
+ },
382
445
  };
383
446
  }
384
447
  catch (err) {
@@ -422,18 +485,19 @@ function filterDisabled(tools, disabled) {
422
485
  * 否则同一进程会累积多个 interval 空转(server 与 TUI 进程各一份,互不共享)
423
486
  */
424
487
  let annotateClient = null;
425
- /** drain 进行中,避免并发重复投递 */
426
- let draining = false;
488
+ /** drain 进行中(按 sid 隔离:会话 A 的 drain 不会挡住会话 B 的投递) */
489
+ const drainingSid = new Set();
427
490
  /** 最近一次见到的会话 id 缓存(来自 event/chat.message/tool.execute.before 钩子) */
428
491
  const sessionCache = createSessionIDCache();
429
492
  /** 已记录过的 sid(避免重复刷屏) */
430
493
  let lastLoggedSessionID = "";
431
494
  /** 插件上下文(诊断用) */
432
495
  let pluginCtx = { directory: "", worktree: "", serverUrl: "" };
433
- /** 把截图 base64 落盘为临时 PNG,返回路径(失败返回 null);用于发送时保留图片与给出可读路径 */
434
- function saveShotImage(log, index, b64) {
496
+ /** 把截图 base64 落盘为临时 PNG,返回路径(失败返回 null);用于发送时保留图片与给出可读路径
497
+ * 1.9.0:落盘到**该会话**的临时目录 sessions/<profile>/<sid>/tmp(不再与其它会话共享全局 tmp) */
498
+ function saveShotImage(log, sid, index, b64) {
435
499
  try {
436
- const dir = resolve(getTmpDir());
500
+ const dir = resolve(getSessionTmpDir(sid));
437
501
  mkdirSync(dir, { recursive: true });
438
502
  const p = resolve(dir, `shot-${Date.now()}-${index}.png`);
439
503
  writeFileSync(p, Buffer.from(b64, "base64"));
@@ -449,37 +513,33 @@ function setupAnnotateDelivery(client) {
449
513
  // 更新 client 引用(插件重载后使用最新 client)
450
514
  annotateClient = client;
451
515
  // 服务就绪时做一次 drain(覆盖"通知机制建立前 shell 已发送过"的窗口,幂等;含 shell 重启)
452
- setServiceReadyHandler(() => {
453
- void drainAnnotate();
516
+ // 1.9.0:就绪回调带 sid → 只 drain 该会话自己的实例
517
+ setServiceReadyHandler((sid) => {
518
+ void drainAnnotate(sid);
454
519
  });
455
- // 启动监听并把地址交给 shell(spawn 时 --notify-url,就绪后 /api/notify-url 注册)
456
- startNotifyServer(() => {
457
- void drainAnnotate();
520
+ // 启动监听并把地址交给 shell(spawn 时 --notify-url /notify/<sid>,就绪后 /api/notify-url 注册)
521
+ // 1.9.0:通知按 URL 里的 sid 归属 → 彻底取代旧的「最后活跃会话」投递
522
+ startNotifyServer((sid) => {
523
+ void drainAnnotate(sid);
458
524
  })
459
- .then((p) => log.info(`[notify] listening 127.0.0.1:${p}/notify (event-driven; no polling)`))
525
+ .then((p) => log.info(`[notify] listening 127.0.0.1:${p}/notify/<sid> (event-driven; per-session routing)`))
460
526
  .catch((e) => log.error("[notify] listen failed (only initial/service-ready drain available)", e));
461
- // 插件启动时也 drain 一次(此时服务可能未起,isRunning() 会短路)
462
- void drainAnnotate();
463
527
  }
464
- /** 拉取待发送记录并投递到当前会话(推送触发;空结果不记日志) */
465
- async function drainAnnotate() {
466
- if (draining)
528
+ /** 拉取某会话待发送的记录并投递给**该会话**(推送触发;空结果不记日志) */
529
+ async function drainAnnotate(sid) {
530
+ if (!sid)
531
+ return;
532
+ if (drainingSid.has(sid))
467
533
  return;
468
534
  const c = annotateClient;
469
535
  if (!c)
470
536
  return;
471
- // 服务未启动/已关闭:跳过(服务就绪或通知到达时会再次触发)
472
- if (!isRunning())
537
+ // 该会话实例未启动/已关闭:跳过(服务就绪或下次通知到达时会再次触发;**绝不因 drain 而 spawn**)
538
+ if (!isRunning(sid))
473
539
  return;
474
- draining = true;
540
+ drainingSid.add(sid);
475
541
  try {
476
- // 观测钩子缓存:首次学到 sid 时记一次(证明 sid 来源可用)
477
- const learned = sessionCache.get();
478
- if (learned && learned !== lastLoggedSessionID) {
479
- log.info(`[notify] hook-cache sid=${learned}`);
480
- lastLoggedSessionID = learned;
481
- }
482
- const r = await service.annotateConsumeSent();
542
+ const r = await service.annotateConsumeSent({ _sessionId: sid });
483
543
  const records = r?.records || [];
484
544
  if (records.length === 0)
485
545
  return; // 空结果不刷屏
@@ -497,45 +557,22 @@ async function drainAnnotate() {
497
557
  // 图片**不经 session.prompt**(服务端对 image/* part 返回 400),而是走
498
558
  // 「工具结果附件」(bt_screenshot)或「读记录返回缓存路径」(read_record_content)。
499
559
  if (item.type === "screenshot" && item.image) {
500
- const savedPath = saveShotImage(log, item.index, item.image);
560
+ const savedPath = saveShotImage(log, sid, item.index, item.image);
501
561
  if (savedPath)
502
562
  lines.push(` (image saved: ${savedPath})`);
503
563
  }
504
564
  lines.push("");
505
565
  }
506
566
  const text = lines.join("\n");
507
- // 取当前会话 id:优先用钩子缓存(参考项目 ctx.sessionID 的等价物),session.list() 仅兜底
508
- let sid = sessionCache.get();
509
- let source = "hook-cache";
510
- let listLen = "-";
511
- if (!sid) {
512
- const sessions = await c.session.list();
513
- listLen = Array.isArray(sessions?.data) ? sessions.data.length : sessions?.error ? "error" : "none";
514
- log.info(`[drain] session.list raw=${JSON.stringify(sessions).slice(0, 400)}`);
515
- sid = sessions?.data?.[0]?.id;
516
- source = "client.session.list()[0]";
517
- }
518
- // 关键诊断:sid 来源/缓存值/list 长度/插件目录(定位"静默失败"断点)
519
- log.info(`[drain] sid source=${source} cached=${sessionCache.get() || "(EMPTY)"} listLen=${listLen} ctx=${pluginCtx.directory || "(none)"} srv=${pluginCtx.serverUrl || "(none)"} sid=${sid ?? "(EMPTY)"}`);
520
- if (!sid) {
521
- const msg = "no session id (hook cache empty and session.list returned none)";
522
- log.error(`[drain] ${msg}`, new Error(msg));
523
- try {
524
- await service.notify({ message: `发送失败: ${msg}`, type: "err" });
525
- }
526
- catch { }
527
- return;
528
- }
529
- const send = (parts) => c.session.prompt({ path: { id: sid }, body: { noReply: false, parts } });
530
- // 只发文本(参考实现同为纯文本;图片由工具附件/缓存路径交付,不在 prompt 里塞图片 part)
531
- log.info(`[drain] prompt -> sid=${sid} parts=text-only textLen=${text.length}`);
532
- const res = await send([{ type: "text", text }]);
567
+ // 投递目标 = 通知 URL 里的 sid(1.9.0 会话隔离:取代旧的 hook-cache last-writer-wins)
568
+ log.info(`[drain] sid=${sid} prompt parts=text-only textLen=${text.length}`);
569
+ const res = await c.session.prompt({ path: { id: sid }, body: { noReply: false, parts: [{ type: "text", text }] } });
533
570
  const err = res?.error;
534
571
  if (err) {
535
572
  // 不再静默:写日志 + 页面通知(SDK 返回 {error} 不抛,必须显式检查)
536
573
  log.error(`[drain] prompt FAILED sid=${sid}: ${JSON.stringify(err).slice(0, 300)}`, new Error("prompt error"));
537
574
  try {
538
- await service.notify({ message: `发送记录失败: ${JSON.stringify(err).slice(0, 180)}`, type: "err" });
575
+ await service.notify({ message: `发送记录失败: ${JSON.stringify(err).slice(0, 180)}`, type: "err" }, sid);
539
576
  }
540
577
  catch { }
541
578
  }
@@ -547,7 +584,7 @@ async function drainAnnotate() {
547
584
  log.error("annotate drain error", e);
548
585
  }
549
586
  finally {
550
- draining = false;
587
+ drainingSid.delete(sid);
551
588
  }
552
589
  }
553
590
  // Export default for npm loader