@attson/atwebpilot-mcp 0.0.67 → 0.0.69

package/README.md

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

package/dist/index.js

@@ -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,24 +1993,16 @@ function locate(source, offset) {
 }
 
 // src/handlers.ts
-function singleWorkerId(c, pairUrl) {
-  const workers = c.workers.list();
-  if (workers.length === 0) {
-    throw new Error(
-      "\u6CA1\u6709\u6D4F\u89C8\u5668\u8FDE\u5165\u3002\u5DF2\u4E3A\u4F60\u6253\u5F00\u914D\u5BF9\u9875" + (pairUrl ? ` ${pairUrl}` : "") + "\uFF0C\u5728\u6D4F\u89C8\u5668\u91CC\u786E\u8BA4\u540E\u91CD\u8BD5\u672C\u6B21\u8C03\u7528\u3002\uFF08\u5982\u679C\u9ED8\u8BA4\u6D4F\u89C8\u5668\u4E0D\u662F\u88C5\u4E86\u6269\u5C55\u7684\u90A3\u4E2A\uFF0C\u8BF7\u628A\u8BE5\u5730\u5740\u7C98\u8D34\u8FC7\u53BB\u6253\u5F00\uFF09"
-    );
-  }
-  if (workers.length > 1) throw new Error("\u68C0\u6D4B\u5230\u591A\u4E2A\u6D4F\u89C8\u5668\u8FDE\u5165\uFF1Bv1 \u4EC5\u652F\u6301\u5355 worker\uFF0C\u8BF7\u53EA\u4FDD\u7559\u4E00\u4E2A\u8FDE\u63A5");
-  return workers[0].id;
-}
 async function handleListTabs(deps) {
   const { coordinator } = await deps.ensure();
-  const w = coordinator.workers.get(singleWorkerId(coordinator, deps.pairUrl()));
+  const workerId = await deps.waitForWorker();
+  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) {
   const { coordinator } = await deps.ensure();
-  const worker_id = singleWorkerId(coordinator, deps.pairUrl());
+  const worker_id = await deps.waitForWorker();
   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);
@@ -2218,7 +2210,9 @@ function createMcpServer(deps) {
 
 // src/loopback-ws-hub.ts
 import { WebSocketServer, WebSocket } from "ws";
-import { createServer } from "http";
+import {
+  createServer
+} from "http";
 
 // ../shared/src/pairing/types.ts
 var GRACEFUL_CLOSE_CODE = 4e3;
@@ -2256,6 +2250,17 @@ function renderPairPage(payload) {
       el.textContent = e.data.trusted ? "\u5DF2\u4FE1\u4EFB\uFF0C\u8FDE\u63A5\u4E2D\u2026" : "\u5DF2\u8FDE\u63A5";
       setTimeout(function () { window.close(); }, 1200);
     } else if (e.data.reason === "denied") {
+      fetch("/pair/decision", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          v: 1,
+          decision: "denied",
+          sessionId: payload.sessionId,
+          installId: payload.installId,
+          secret: payload.secret
+        })
+      }).catch(function () {});
       el.textContent = "\u5DF2\u62D2\u7EDD\u3002\u53EF\u4EE5\u5173\u95ED\u672C\u9875\u3002";
     } else {
       el.textContent = "\u8FDE\u63A5\u6269\u5C55\u5931\u8D25\u3002\u8BF7\u5237\u65B0\u9875\u9762\u91CD\u8BD5\uFF0C\u6216\u68C0\u67E5\u6269\u5C55\u662F\u5426\u5DF2\u542F\u7528\u3002";
@@ -2327,12 +2332,17 @@ var LoopbackWSHub = class {
   execTimeoutMs;
   keepaliveIntervalMs;
   keepaliveTimers = /* @__PURE__ */ new Map();
+  closedNotified = false;
   ready() {
     return this.readyPromise;
   }
   /** Serves the pairing page; everything else is a 404. */
   onHttpRequest(req, res) {
     const path = (req.url ?? "").split("?")[0];
+    if (path === "/pair/decision" && req.method === "POST") {
+      void this.onPairDecision(req, res);
+      return;
+    }
     if (path !== "/pair") {
       res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
       res.end("not found");
@@ -2350,6 +2360,29 @@ var LoopbackWSHub = class {
     });
     res.end(renderPairPage(payload));
   }
+  async onPairDecision(req, res) {
+    try {
+      let body = "";
+      for await (const chunk of req) {
+        body += chunk.toString();
+        if (body.length > 4096) throw new Error("pairing decision too large");
+      }
+      const decision = JSON.parse(body);
+      const payload = this.opts.pairPayload?.();
+      const matches = payload && decision.v === 1 && decision.decision === "denied" && decision.sessionId === payload.sessionId && decision.installId === payload.installId && decision.secret === payload.secret;
+      if (!matches) {
+        res.writeHead(403, { "content-type": "text/plain; charset=utf-8" });
+        res.end("pairing decision rejected");
+        return;
+      }
+      this.opts.onPairingDenied?.();
+      res.writeHead(204);
+      res.end();
+    } catch {
+      res.writeHead(400, { "content-type": "text/plain; charset=utf-8" });
+      res.end("invalid pairing decision");
+    }
+  }
   /**
    * Tells connected extensions this shutdown is deliberate, so they drop the
    * endpoint instead of retrying it for the rest of the browser session.
@@ -2365,6 +2398,13 @@ var LoopbackWSHub = class {
     await this.close();
   }
   close() {
+    if (!this.closedNotified) {
+      this.closedNotified = true;
+      try {
+        this.opts.onClosed?.();
+      } catch {
+      }
+    }
     for (const p of this.pending.values()) {
       clearTimeout(p.timer);
       p.reject(new Error("hub closing"));
@@ -2572,12 +2612,13 @@ function helloToWorker(h, now) {
     last_heartbeat_at: now
   };
 }
-function installWire(hub, coordinator, clock) {
+function installWire(hub, coordinator, clock, onWorkerReady) {
   hub.onMessage((worker_id, msg) => {
     switch (msg.type) {
       case "HELLO":
         coordinator.unregisterWorker(msg.worker_id);
         coordinator.registerWorker(helloToWorker(msg, clock.now()));
+        onWorkerReady?.(msg.worker_id);
         break;
       case "PING":
         coordinator.heartbeatWorker(worker_id);
@@ -2648,12 +2689,53 @@ function processInfo(cwd = process.cwd()) {
 }
 
 // src/ensure-hub.ts
+var DEFAULT_WORKER_WAIT_TIMEOUT_MS = 9e4;
 function createHubEnsurer(d) {
   let bundle = null;
   let inflight = null;
   let pairUrlValue = null;
   let opened = false;
+  let hubIsClosed = false;
+  let pendingDenial = false;
+  let workerWait = null;
   const info = d.processInfo ?? processInfo();
+  function connectedWorkerId(coordinator) {
+    const workers = coordinator.workers.list();
+    if (workers.length === 0) return null;
+    if (workers.length > 1) {
+      throw new Error("\u68C0\u6D4B\u5230\u591A\u4E2A\u6D4F\u89C8\u5668\u8FDE\u5165\uFF1Bv1 \u4EC5\u652F\u6301\u5355 worker\uFF0C\u8BF7\u53EA\u4FDD\u7559\u4E00\u4E2A\u8FDE\u63A5");
+    }
+    return workers[0].id;
+  }
+  function finishWorkerWait(result) {
+    const pending = workerWait;
+    if (!pending) return;
+    workerWait = null;
+    clearTimeout(pending.timer);
+    if ("workerId" in result) pending.resolve(result.workerId);
+    else pending.reject(result.error);
+  }
+  function notifyWorkerReady(coordinator) {
+    try {
+      const workerId = connectedWorkerId(coordinator);
+      if (workerId) finishWorkerWait({ workerId });
+    } catch (error) {
+      finishWorkerWait({ error: error instanceof Error ? error : new Error(String(error)) });
+    }
+  }
+  function pairingDenied() {
+    const error = new Error(
+      "\u7528\u6237\u62D2\u7EDD\u4E86\u6D4F\u89C8\u5668\u914D\u5BF9\u6388\u6743\u3002" + (pairUrlValue ? `\u914D\u5BF9\u9875\uFF1A${pairUrlValue}` : "")
+    );
+    if (workerWait) finishWorkerWait({ error });
+    else pendingDenial = true;
+  }
+  function hubClosed() {
+    hubIsClosed = true;
+    if (workerWait) {
+      finishWorkerWait({ error: new Error("\u6D4F\u89C8\u5668\u914D\u5BF9\u670D\u52A1\u5DF2\u5173\u95ED\u3002") });
+    }
+  }
   async function bind() {
     const identity = loadOrCreateIdentity(d.identityDir);
     const preferred = d.explicitPort ?? loadLastPort(d.identityDir) ?? 0;
@@ -2678,11 +2760,17 @@ function createHubEnsurer(d) {
     }
     saveLastPort(port, d.identityDir);
     const coordinator = new Coordinator({ hub, clock: d.clock, idGen: d.idGen });
-    installWire(hub, coordinator, d.clock);
+    installWire(hub, coordinator, d.clock, () => notifyWorkerReady(coordinator));
     pairUrlValue = `http://127.0.0.1:${port}/pair`;
     return { coordinator, hub, port };
     function common() {
-      return { token: d.token, clock: d.clock, idGen: d.idGen };
+      return {
+        token: d.token,
+        clock: d.clock,
+        idGen: d.idGen,
+        onPairingDenied: pairingDenied,
+        onClosed: hubClosed
+      };
     }
   }
   async function ensure() {
@@ -2698,10 +2786,40 @@ function createHubEnsurer(d) {
     }
     return b;
   }
+  async function waitForWorker(timeoutMs = DEFAULT_WORKER_WAIT_TIMEOUT_MS) {
+    const { coordinator } = await ensure();
+    if (hubIsClosed) throw new Error("\u6D4F\u89C8\u5668\u914D\u5BF9\u670D\u52A1\u5DF2\u5173\u95ED\u3002");
+    const connected = connectedWorkerId(coordinator);
+    if (connected) return connected;
+    if (pendingDenial) {
+      pendingDenial = false;
+      throw new Error(
+        "\u7528\u6237\u62D2\u7EDD\u4E86\u6D4F\u89C8\u5668\u914D\u5BF9\u6388\u6743\u3002" + (pairUrlValue ? `\u914D\u5BF9\u9875\uFF1A${pairUrlValue}` : "")
+      );
+    }
+    if (workerWait) return workerWait.promise;
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    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` : "")
+        )
+      });
+    }, timeoutMs);
+    timer.unref?.();
+    workerWait = { promise, resolve, reject, timer };
+    return promise;
+  }
   return {
     ensure,
     peek: () => bundle,
     pairUrl: () => pairUrlValue,
+    waitForWorker,
     bound: () => bundle != null
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@attson/atwebpilot-mcp",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "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",