@attson/atwebpilot-mcp 0.0.66 → 0.0.68

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

@@ -212,11 +212,18 @@ var ChatSessionEventSchema = z3.discriminatedUnion("type", [
 ]);
 
 // ../shared/src/protocol/messages.ts
-var StepSchema = z4.object({
-  kind: z4.literal("tool"),
-  tool: z4.string(),
-  args: z4.unknown()
-});
+var ProtocolStepSchema = z4.discriminatedUnion("kind", [
+  z4.object({
+    kind: z4.literal("tool"),
+    tool: z4.string(),
+    args: z4.unknown()
+  }),
+  z4.object({
+    kind: z4.literal("js"),
+    source: z4.string(),
+    timeoutMs: z4.number().int().positive().optional()
+  })
+]);
 var DerivedTabFields = {
   /** true when the receiving connection owns this tab */
   mine: z4.boolean().optional(),
@@ -330,7 +337,7 @@ var ExecSchema = z4.object({
   req_id: z4.string(),
   session_id: z4.string(),
   tab_id: z4.string(),
-  step: StepSchema
+  step: ProtocolStepSchema
 });
 var CloseSessionSchema = z4.object({
   ...EnvelopeFields,
@@ -687,6 +694,7 @@ function capabilityForTool(tool, opts) {
     case "searchPageIndex":
     case "readPageBlock":
     case "extractPageFields":
+    case "inspectElement":
       return "read:dom";
     case "extractImages":
       return "read:image";
@@ -998,6 +1006,25 @@ var TOOL_DEFS = [
       required: ["selector"]
     }
   },
+  {
+    name: "inspectElement",
+    description: "[FAST\xB7READ\xB7LAYOUT] \u8BFB\u53D6\u5143\u7D20\u7684\u8FD0\u884C\u65F6\u5E03\u5C40\u771F\u76F8\uFF1Acomputed style\u3001viewport/document rect\u3001\u53EF\u89C1\u6027\u3001\u7956\u5148\u94FE\u4E0E shadow root \u4FE1\u606F\u3002\n\u8C03\u8BD5 display/box-sizing/position/overflow/z-index\u3001\u5F39\u7A97\u6302\u8F7D\u70B9\u6216\u7236\u7EA7\u5E03\u5C40\u65F6\u4F18\u5148\u7528\u5B83\uFF0C\u4E0D\u8981\u4E3A\u8FD9\u4E9B\u53EA\u8BFB\u4FE1\u606F\u8C03\u7528 runJS\u3002",
+    input_schema: {
+      type: "object",
+      properties: {
+        selector: { type: "string", description: "CSS selector\uFF1B\u4E0E uid \u4E8C\u9009\u4E00" },
+        uid: { type: "string", description: "takeSnapshot/findElements \u8FD4\u56DE\u7684 uid\uFF1B\u4E0E selector \u4E8C\u9009\u4E00" },
+        ancestorDepth: { type: "integer", default: 5, minimum: 0, maximum: 10 },
+        styleProperties: {
+          type: "array",
+          items: { type: "string" },
+          maxItems: 50,
+          description: "\u8981\u8BFB\u53D6\u7684 CSS \u5C5E\u6027\uFF1B\u7701\u7565\u65F6\u8FD4\u56DE\u5E38\u7528\u5E03\u5C40\u5C5E\u6027"
+        },
+        tabId: TAB_ID_FIELD
+      }
+    }
+  },
   {
     name: "extractText",
     description: "[FAST\xB7TARGETED] \u63D0\u53D6\u9009\u62E9\u5668\u547D\u4E2D\u5143\u7D20\u7684\u6587\u672C\u3002single=true \u8FD4\u56DE\u5B57\u7B26\u4E32\uFF0C\u5426\u5219\u8FD4\u56DE\u6570\u7EC4\u3002\n\u53EA\u7528\u4E8E\u660E\u786E\u7684\u5C0F\u8303\u56F4 selector\uFF1B\u666E\u901A\u7F51\u9875\u7406\u89E3/\u5B57\u6BB5\u63D0\u53D6\u4E0D\u8981\u7528 extractText({selector:'body'})\uFF0C\u5148\u7528 createPageIndex + extractPageFields/searchPageIndex\u3002\n\n\u793A\u4F8B\uFF1A\n- \u63D0\u53D6\u6807\u9898\uFF1A{ selector: 'h1', single: true }\n- \u63D0\u53D6\u6240\u6709\u6BB5\u843D\uFF1A{ selector: 'article p' }",
@@ -1290,6 +1317,7 @@ var TOOL_DEFS = [
       type: "object",
       properties: {
         source: { type: "string", description: "async function body" },
+        timeoutMs: { type: "integer", minimum: 1, maximum: 25e3, default: 25e3 },
         tabId: TAB_ID_FIELD
       },
       required: ["source"]
@@ -1856,25 +1884,125 @@ function readToolMode(env) {
   return "full";
 }
 
-// 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"
-    );
+// ../shared/src/static-scan.ts
+var RULES = [
+  {
+    rule: "uses-document-cookie",
+    severity: "dangerous",
+    message: "\u8BFB\u53D6/\u5199\u5165 cookie",
+    pattern: /\bdocument\s*\.\s*cookie\b/g
+  },
+  {
+    rule: "uses-eval",
+    severity: "dangerous",
+    message: "eval() \u6267\u884C\u52A8\u6001\u4EE3\u7801",
+    pattern: /\beval\s*\(/g
+  },
+  {
+    rule: "uses-new-function",
+    severity: "dangerous",
+    message: "new Function \u6267\u884C\u52A8\u6001\u4EE3\u7801",
+    pattern: /\bnew\s+Function\s*\(/g
+  },
+  {
+    rule: "uses-chrome-api",
+    severity: "dangerous",
+    message: "\u5C1D\u8BD5\u8BBF\u95EE\u6269\u5C55 API",
+    pattern: /\b(chrome|browser)\s*\.\s*[a-zA-Z_$]/g
+  },
+  {
+    rule: "uses-fetch",
+    severity: "caution",
+    message: "\u53D1\u8D77\u7F51\u7EDC\u8BF7\u6C42 (fetch)",
+    pattern: /\bfetch\s*\(/g
+  },
+  {
+    rule: "uses-xhr",
+    severity: "caution",
+    message: "\u53D1\u8D77\u7F51\u7EDC\u8BF7\u6C42 (XMLHttpRequest)",
+    pattern: /\bnew\s+XMLHttpRequest\b|\bXMLHttpRequest\s*\(/g
+  },
+  {
+    rule: "uses-send-beacon",
+    severity: "caution",
+    message: "navigator.sendBeacon",
+    pattern: /navigator\s*\.\s*sendBeacon\b/g
+  },
+  {
+    rule: "uses-storage",
+    severity: "caution",
+    message: "\u8BFB/\u5199 localStorage / sessionStorage",
+    pattern: /\b(local|session)Storage\b/g
+  },
+  {
+    rule: "uses-indexed-db",
+    severity: "caution",
+    message: "\u8BFB/\u5199 IndexedDB",
+    pattern: /\bindexedDB\b/g
+  },
+  {
+    rule: "uses-mutation-observer",
+    severity: "info",
+    message: "MutationObserver",
+    pattern: /\bMutationObserver\b/g
+  }
+];
+function runStaticScan(source) {
+  const out = [];
+  for (const r of RULES) {
+    const matches = collectMatches(source, r.pattern);
+    if (matches.length > 0) {
+      out.push({
+        rule: r.rule,
+        severity: r.severity,
+        message: r.message,
+        matches
+      });
+    }
+  }
+  return out;
+}
+function highestSeverity(findings) {
+  if (findings.some((f) => f.severity === "dangerous")) return "dangerous";
+  if (findings.some((f) => f.severity === "caution")) return "caution";
+  return "info";
+}
+function collectMatches(source, pattern) {
+  const re = new RegExp(pattern.source, pattern.flags.includes("g") ? pattern.flags : pattern.flags + "g");
+  const out = [];
+  let m;
+  while ((m = re.exec(source)) !== null) {
+    const { line, col } = locate(source, m.index);
+    out.push({ line, col, text: m[0] });
+    if (m.index === re.lastIndex) re.lastIndex++;
+  }
+  return out;
+}
+function locate(source, offset) {
+  let line = 1;
+  let col = 1;
+  for (let i = 0; i < offset; i++) {
+    if (source.charCodeAt(i) === 10) {
+      line++;
+      col = 1;
+    } else {
+      col++;
+    }
   }
-  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;
+  return { line, col };
 }
+
+// src/handlers.ts
 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);
@@ -1902,18 +2030,25 @@ async function handleBrowserTool(deps, gen, args) {
   const session_id = String(args.session_id);
   const session = coordinator.sessions.get(session_id);
   if (!session) throw new Error(`session ${session_id} not found`);
-  const { session_id: _omit, ...toolArgs } = args;
+  const { session_id: _omit, ...suppliedToolArgs } = args;
+  const toolArgs = { ...suppliedToolArgs };
   const tool = gen.builtinTool;
   if (gen.stepKind === "js") {
     const source = String(toolArgs.source ?? "");
     if (!source) throw new Error("browser_runJS: source required");
-    const v = coordinator.validateCall({ session_id, kind: "runJS", unsafe: true });
+    const unsafe = highestSeverity(runStaticScan(source)) === "dangerous";
+    const v = coordinator.validateCall({ session_id, kind: "runJS", unsafe });
     if (!v.ok) throw new Error(`${v.error.code}: ${v.error.message}`);
     coordinator.recordCall(session_id, v.dangerous);
+    const requestedTimeout = toolArgs.timeoutMs;
     const jsResult = await hub.exec(session.worker_id, {
       session_id,
       tab_id: session.tab_id,
-      step: { kind: "js", source }
+      step: {
+        kind: "js",
+        source,
+        ...typeof requestedTimeout === "number" && Number.isInteger(requestedTimeout) && requestedTimeout > 0 ? { timeoutMs: requestedTimeout } : {}
+      }
     });
     if (!jsResult.ok) {
       throw new Error(
@@ -1922,6 +2057,13 @@ async function handleBrowserTool(deps, gen, args) {
     }
     return jsResult.return ?? null;
   }
+  if (gen.builtinTool === "switchToTab" || gen.builtinTool === "closeTab") {
+    const boundTabId = Number.parseInt(session.tab_id, 10);
+    if (!Number.isFinite(boundTabId)) {
+      throw new Error(`InvalidArgs: session tab_id "${session.tab_id}" is not numeric`);
+    }
+    toolArgs.tabId = boundTabId;
+  }
   const override = NON_BUILTIN_CAPABILITY[gen.builtinTool];
   if (override) {
     const v = coordinator.validateCall({ session_id, kind: "capability", capability: override });
@@ -2068,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;
@@ -2106,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";
@@ -2177,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");
@@ -2200,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.
@@ -2215,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"));
@@ -2374,7 +2564,7 @@ var LoopbackWSHub = class {
         req_id,
         session_id: params.session_id,
         tab_id: params.tab_id,
-        step: { kind: "tool", tool: params.step.tool, args: params.step.args }
+        step: params.step
       });
       if (this.byWorker.get(worker_id) !== socket) {
         clearTimeout(timer);
@@ -2422,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);
@@ -2498,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;
@@ -2528,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() {
@@ -2548,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.66",
+  "version": "0.0.68",
   "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",