@attson/atwebpilot-mcp 0.0.68 → 0.0.70

package/README.md

@@ -17,11 +17,11 @@ Claude Code：
 **不需要手填端口。** 从 Plan 33 起是配对流程：
 
 1. 会话启动时**不绑任何端口** —— 不碰网页的会话零副作用。
-2. AI 第一次调 `list_tabs` / `browser_*` 时才绑一个空闲端口，并自动打开配对页。
+2. AI 第一次调 `list_tabs` / `browser_*` 时才绑一个空闲端口，尝试用系统默认浏览器打开配对页，并立即在 MCP 进度消息中显示配对 URL。
 3. 你在浏览器里点「允许」，扩展即接入；正在等待的调用会自动继续，无需告诉 AI 授权成功或手动重试。
 4. 之后本机的会话都免确认（信任是安装级的）；端口能复用时连配对页都不会弹。
 
-首次调用默认等待授权 90 秒。拒绝或超时会返回明确错误和配对页地址；授权成功只以扩展实际建立连接并发送 `HELLO` 为准。
+首次调用默认等待授权 90 秒。若系统未弹出浏览器，可直接打开进度消息中的 URL；拒绝或超时也会返回明确错误和配对页地址。授权成功只以扩展实际建立连接并发送 `HELLO` 为准。
 
 多个 Codex / Claude Code 会话可以同时接入同一个浏览器，各自一条连接。可在扩展设置 →
 Coordinator 查看已接入的会话、单独断开，或撤销信任。

package/dist/index.js

@@ -932,7 +932,7 @@ import { ListToolsRequestSchema, CallToolRequestSchema } from "@modelcontextprot
 var CONTROL_TOOLS = [
   {
     name: "list_tabs",
-    description: "\u5217\u51FA\u5F53\u524D\u8FDE\u5165\u7684\u6D4F\u89C8\u5668\uFF08worker\uFF09\u53EF\u7528\u7684\u6807\u7B7E\u9875\uFF1A[{tab_id,url,title}]\u3002\u5148\u8C03\u5B83\u62FF tab_id\u3002",
+    description: "\u5217\u51FA\u6D4F\u89C8\u5668\u53EF\u7528\u6807\u7B7E\u9875\uFF1A[{tab_id,url,title}]\u3002\u82E5\u6269\u5C55\u5C1A\u672A\u8FDE\u63A5\uFF0C\u9996\u6B21\u8C03\u7528\u4F1A\u5C1D\u8BD5\u81EA\u52A8\u6253\u5F00\u914D\u5BF9\u9875\u5E76\u7B49\u5F85\u6388\u6743\uFF08\u6700\u591A 90 \u79D2\uFF09\uFF0C\u7B49\u5F85\u671F\u95F4\u4F1A\u901A\u77E5\u5B9E\u9645\u914D\u5BF9 URL\u3002\u5148\u8C03\u5B83\u62FF tab_id\u3002",
     inputSchema: { type: "object", properties: {}, additionalProperties: false }
   },
   {
@@ -1312,7 +1312,7 @@ var TOOL_DEFS = [
   },
   {
     name: "runJS",
-    description: "[LAST RESORT\xB7DANGER] \u5728 MAIN world \u6CE8\u5165\u5E76\u6267\u884C async \u51FD\u6570\u4F53\uFF08receives `ctx` = bindings\uFF09\u3002\u5FC5\u987B return \u503C\u3002\n**\u4EC5\u5728\u7ED3\u6784\u5316\u5DE5\u5177\u4E0D\u591F\u7528\u65F6\u4F7F\u7528**\u2014\u2014\u4F1A\u7ECF\u8FC7\u9759\u6001\u626B\u63CF\u4E0E\u4EBA\u5DE5\u5BA1\u9605\u3002",
+    description: "[LAST RESORT\xB7DANGER] \u5728 MAIN world \u6CE8\u5165\u5E76\u6267\u884C async \u51FD\u6570\u4F53\uFF08receives `ctx` = bindings\uFF09\u3002\u5FC5\u987B return \u503C\u3002\n**\u4EC5\u5728\u7ED3\u6784\u5316\u5DE5\u5177\u4E0D\u591F\u7528\u65F6\u4F7F\u7528**\u2014\u2014\u4F1A\u7ECF\u8FC7\u9759\u6001\u626B\u63CF\u4E0E\u4EBA\u5DE5\u5BA1\u9605\u3002\u4E25\u683C CSP \u9875\u9762\u9700\u8981\u7528\u6237\u9884\u5148\u5728\u6269\u5C55\u8BBE\u7F6E\u4E2D\u5F00\u542F CDP/debugger\uFF1B\u8BFB\u53D6\u6837\u5F0F\u3001\u4F4D\u7F6E\u6216\u7956\u5148\u94FE\u8BF7\u4F18\u5148\u4F7F\u7528 inspectElement\u3002",
     input_schema: {
       type: "object",
       properties: {
@@ -1993,16 +1993,16 @@ function locate(source, offset) {
 }
 
 // src/handlers.ts
-async function handleListTabs(deps) {
+async function handleListTabs(deps, onPairingRequired) {
   const { coordinator } = await deps.ensure();
-  const workerId = await deps.waitForWorker();
+  const workerId = await deps.waitForWorker(void 0, onPairingRequired);
   const w = coordinator.workers.get(workerId);
   if (!w) throw new Error(`worker ${workerId} disconnected while opening browser context`);
   return { tabs: w.available_tabs };
 }
-async function handleOpenSession(deps, args) {
+async function handleOpenSession(deps, args, onPairingRequired) {
   const { coordinator } = await deps.ensure();
-  const worker_id = await deps.waitForWorker();
+  const worker_id = await deps.waitForWorker(void 0, onPairingRequired);
   const tab_id = String(args.tab_id);
   const requested = Array.isArray(args.capabilities) ? args.capabilities.map(String).filter(isCapability) : [];
   const scope = new Set(requested.length ? requested : CAPABILITIES);
@@ -2181,14 +2181,14 @@ function toolResult(gen, data) {
   return { content: [{ type: "image", data: d.data, mimeType }] };
 }
 var fail2 = (message) => ({ content: [{ type: "text", text: message }], isError: true });
-async function dispatchCall(deps, name, args) {
+async function dispatchCall(deps, name, args, onPairingRequired) {
   try {
     if (name === SKILL_TOOL.name) {
       const bundle = readSkillBundle();
       return { content: [{ type: "text", text: bundle.content }] };
     }
-    if (name === "list_tabs") return ok(await handleListTabs(deps));
-    if (name === "open_session") return ok(await handleOpenSession(deps, args));
+    if (name === "list_tabs") return ok(await handleListTabs(deps, onPairingRequired));
+    if (name === "open_session") return ok(await handleOpenSession(deps, args, onPairingRequired));
     if (name === "close_session") return ok(await handleCloseSession(deps, args));
     if (name === "get_quota") return ok(await handleGetQuota(deps, args));
     const gen = BROWSER_BY_NAME.get(name);
@@ -2199,11 +2199,33 @@ async function dispatchCall(deps, name, args) {
   }
 }
 function createMcpServer(deps) {
-  const server = new Server({ name: "atwebpilot-mcp", version: "0.1.0" }, { capabilities: { tools: {} } });
+  const server = new Server(
+    { name: "atwebpilot-mcp", version: "0.1.0" },
+    { capabilities: { tools: {}, logging: {} } }
+  );
   server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: buildToolList(deps) }));
-  server.setRequestHandler(CallToolRequestSchema, async (req) => {
+  server.setRequestHandler(CallToolRequestSchema, async (req, extra) => {
     const args = req.params.arguments ?? {};
-    return dispatchCall(deps, req.params.name, args);
+    const onPairingRequired = async (url) => {
+      const message = `\u7B49\u5F85\u6D4F\u89C8\u5668\u6388\u6743\uFF08\u6700\u591A 90 \u79D2\uFF09\u3002\u914D\u5BF9\u9875\uFF1A${url}\u3002\u5DF2\u5C1D\u8BD5\u81EA\u52A8\u6253\u5F00\uFF1B\u82E5\u672A\u5F39\u51FA\uFF0C\u8BF7\u624B\u52A8\u6253\u5F00\u3002`;
+      try {
+        const progressToken = extra._meta?.progressToken;
+        if (progressToken != null) {
+          await extra.sendNotification({
+            method: "notifications/progress",
+            params: { progressToken, progress: 0, total: 1, message }
+          });
+        } else {
+          await server.sendLoggingMessage({ level: "info", logger: "atwebpilot", data: message });
+        }
+      } catch (error) {
+        console.error(
+          "[atwebpilot-mcp] failed to report pairing URL:",
+          error instanceof Error ? error.message : String(error)
+        );
+      }
+    };
+    return dispatchCall(deps, req.params.name, args, onPairingRequired);
   });
   return server;
 }
@@ -2695,6 +2717,7 @@ function createHubEnsurer(d) {
   let inflight = null;
   let pairUrlValue = null;
   let opened = false;
+  let opening = null;
   let hubIsClosed = false;
   let pendingDenial = false;
   let workerWait = null;
@@ -2773,20 +2796,33 @@ function createHubEnsurer(d) {
       };
     }
   }
-  async function ensure() {
-    if (bundle) return bundle;
-    inflight ??= bind().then((b2) => {
-      bundle = b2;
-      return b2;
-    });
-    const b = await inflight;
-    if (!opened) {
+  async function openPairPage() {
+    if (opened || !pairUrlValue || !d.openUrl) return;
+    const url = pairUrlValue;
+    opening ??= Promise.resolve().then(() => d.openUrl(url)).then(() => {
       opened = true;
-      if (pairUrlValue) d.openUrl?.(pairUrlValue);
+    }).catch((error) => {
+      console.error(
+        `[atwebpilot-mcp] failed to open pairing page ${url}:`,
+        error instanceof Error ? error.message : String(error)
+      );
+    }).finally(() => {
+      opening = null;
+    });
+    await opening;
+  }
+  async function ensure() {
+    if (!bundle) {
+      inflight ??= bind().then((b) => {
+        bundle = b;
+        return b;
+      });
+      await inflight;
     }
-    return b;
+    await openPairPage();
+    return bundle;
   }
-  async function waitForWorker(timeoutMs = DEFAULT_WORKER_WAIT_TIMEOUT_MS) {
+  async function waitForWorker(timeoutMs = DEFAULT_WORKER_WAIT_TIMEOUT_MS, onWaiting) {
     const { coordinator } = await ensure();
     if (hubIsClosed) throw new Error("\u6D4F\u89C8\u5668\u914D\u5BF9\u670D\u52A1\u5DF2\u5173\u95ED\u3002");
     const connected = connectedWorkerId(coordinator);
@@ -2797,6 +2833,7 @@ function createHubEnsurer(d) {
         "\u7528\u6237\u62D2\u7EDD\u4E86\u6D4F\u89C8\u5668\u914D\u5BF9\u6388\u6743\u3002" + (pairUrlValue ? `\u914D\u5BF9\u9875\uFF1A${pairUrlValue}` : "")
       );
     }
+    if (pairUrlValue) await onWaiting?.(pairUrlValue);
     if (workerWait) return workerWait.promise;
     let resolve;
     let reject;
@@ -2807,7 +2844,7 @@ function createHubEnsurer(d) {
     const timer = setTimeout(() => {
       finishWorkerWait({
         error: new Error(
-          `\u7B49\u5F85\u6D4F\u89C8\u5668\u6388\u6743\u8D85\u65F6\uFF08${Math.ceil(timeoutMs / 1e3)} \u79D2\uFF09\u3002` + (pairUrlValue ? `\u8BF7\u5728\u5DF2\u6253\u5F00\u7684\u914D\u5BF9\u9875 ${pairUrlValue} \u5B8C\u6210\u6388\u6743\u540E\u91CD\u8BD5\u3002` : "")
+          `\u7B49\u5F85\u6D4F\u89C8\u5668\u6388\u6743\u8D85\u65F6\uFF08${Math.ceil(timeoutMs / 1e3)} \u79D2\uFF09\u3002` + (pairUrlValue ? `\u8BF7\u6253\u5F00\u914D\u5BF9\u9875 ${pairUrlValue} \u5B8C\u6210\u6388\u6743\u540E\u91CD\u8BD5\u3002` : "")
         )
       });
     }, timeoutMs);
@@ -2823,14 +2860,54 @@ function createHubEnsurer(d) {
     bound: () => bundle != null
   };
 }
-function defaultOpenUrl(url) {
-  void import("child_process").then(({ spawn }) => {
-    const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+function openCommands(url) {
+  if (process.platform === "darwin") return [{ command: "open", args: [url] }];
+  if (process.platform === "win32") {
+    return [{ command: "cmd.exe", args: ["/d", "/s", "/c", "start", "", url] }];
+  }
+  if (process.env.WSL_DISTRO_NAME) {
+    return [{ command: "cmd.exe", args: ["/c", "start", "", url] }];
+  }
+  return [
+    { command: "xdg-open", args: [url] },
+    { command: "gio", args: ["open", url] }
+  ];
+}
+async function runOpenCommand({ command, args }) {
+  const { spawn } = await import("child_process");
+  await new Promise((resolve, reject) => {
+    const child = spawn(command, args, { stdio: "ignore", detached: true });
+    let settled = false;
+    const finish = (error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (error) reject(error);
+      else resolve();
+    };
+    const timer = setTimeout(() => {
+      child.unref();
+      finish();
+    }, 3e3);
+    timer.unref?.();
+    child.once("error", (error) => finish(error));
+    child.once("exit", (code, signal) => {
+      if (code === 0) finish();
+      else finish(new Error(`${command} exited with ${code ?? signal ?? "unknown status"}`));
+    });
+  });
+}
+async function defaultOpenUrl(url) {
+  const errors = [];
+  for (const candidate of openCommands(url)) {
     try {
-      spawn(cmd, [url], { stdio: "ignore", detached: true, shell: process.platform === "win32" }).unref();
-    } catch {
+      await runOpenCommand(candidate);
+      return;
+    } catch (error) {
+      errors.push(error instanceof Error ? error.message : String(error));
     }
-  });
+  }
+  throw new Error(errors.join("; ") || "no browser opener available");
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@attson/atwebpilot-mcp",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "license": "Apache-2.0",
   "description": "MCP server for the atwebpilot browser extension - let Codex or Claude Code drive your browser.",
   "homepage": "https://github.com/attson/atwebpilot#readme",