@opentiny/webmcp-cli 0.0.6 → 0.0.8

package/dist/index.d.cts

@@ -11,7 +11,10 @@ declare function stateCommand({ tabid }: {
     } | null)[];
     url: string;
     title: string;
-    webmcpTools: any[];
+    webmcpTools: {
+        name: string;
+        description?: string;
+    }[];
 }>;
 
 declare function runCommand({ toolName, argsJson, tabid }: {

package/dist/index.d.ts

@@ -11,7 +11,10 @@ declare function stateCommand({ tabid }: {
     } | null)[];
     url: string;
     title: string;
-    webmcpTools: any[];
+    webmcpTools: {
+        name: string;
+        description?: string;
+    }[];
 }>;
 
 declare function runCommand({ toolName, argsJson, tabid }: {

package/dist/index.js

@@ -9,11 +9,37 @@ import { spawn } from "child_process";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
-var CDP_PORT = 9222;
-var CDP_URL = `http://localhost:${CDP_PORT}`;
+function getCdpPort() {
+  const raw = process.env.WEBMCP_CDP_PORT;
+  if (raw) {
+    const port = Number.parseInt(raw, 10);
+    if (Number.isFinite(port) && port > 0) return port;
+  }
+  return 9222;
+}
 function getWorkspaceDir() {
   return process.env.WEBMCP_WORKSPACE || path.join(os.homedir(), ".webmcp_chrome_profile");
 }
+function shouldLaunchHeadless() {
+  if (process.env.WEBMCP_HEADLESS === "0") return false;
+  return process.env.WEBMCP_HEADLESS === "1" || process.env.CI === "true" || process.env.CI === "1";
+}
+function readActivePortFromProfile(userDataDir) {
+  try {
+    const content = fs.readFileSync(path.join(userDataDir, "DevToolsActivePort"), "utf-8");
+    const port = parseInt(content.split("\n")[0].trim(), 10);
+    return Number.isFinite(port) && port > 0 ? port : null;
+  } catch {
+    return null;
+  }
+}
+function candidateCdpBaseUrls(port) {
+  return [
+    `http://127.0.0.1:${port}`,
+    `http://[::1]:${port}`,
+    `http://localhost:${port}`
+  ];
+}
 function getLastTabIdFilePath() {
   return path.join(getWorkspaceDir(), ".last-tab-id");
 }
@@ -97,6 +123,13 @@ async function connectPuppeteer(browserBaseUrl, attempt = 1, maxAttempts = 3) {
   }
 }
 function getDefaultBrowserPath() {
+  const envPath = process.env.CHROME_PATH || process.env.WEBMCP_CHROME_PATH || process.env.PUPPETEER_EXECUTABLE_PATH;
+  if (envPath && fs.existsSync(envPath)) {
+    return { path: envPath, name: "Chrome" };
+  }
+  if (envPath) {
+    console.log(pc.yellow(`\u6307\u5B9A\u7684\u6D4F\u89C8\u5668\u8DEF\u5F84\u4E0D\u5B58\u5728\uFF0C\u5C06\u56DE\u9000\u5230\u81EA\u52A8\u68C0\u6D4B: ${envPath}`));
+  }
   const platform = os.platform();
   if (platform === "darwin") {
     const chromePath = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";
@@ -140,16 +173,30 @@ async function startBrowserInBackground() {
   if (!browserInfo || !fs.existsSync(browserInfo.path)) {
     throw new Error("\u65E0\u6CD5\u5728\u7CFB\u7EDF\u4E2D\u627E\u5230 Chrome \u6216 Edge \u6D4F\u89C8\u5668\u7684\u9ED8\u8BA4\u5B89\u88C5\u8DEF\u5F84\u3002");
   }
-  console.log(pc.yellow(`\u6B63\u5728\u542F\u52A8\u540E\u53F0 ${browserInfo.name} \u5B9E\u4F8B (\u7AEF\u53E3: ${CDP_PORT})...`));
-  const userDataDir = process.env.WEBMCP_WORKSPACE || path.join(os.homedir(), ".webmcp_chrome_profile");
+  const cdpPort = getCdpPort();
+  console.log(pc.yellow(`\u6B63\u5728\u542F\u52A8\u540E\u53F0 ${browserInfo.name} \u5B9E\u4F8B (\u7AEF\u53E3: ${cdpPort})...`));
+  const userDataDir = getWorkspaceDir();
+  if (!fs.existsSync(userDataDir)) {
+    fs.mkdirSync(userDataDir, { recursive: true });
+  }
+  try {
+    fs.unlinkSync(path.join(userDataDir, "DevToolsActivePort"));
+  } catch {
+  }
   const launchArgs = [
-    `--remote-debugging-port=${CDP_PORT}`,
+    `--remote-debugging-port=${cdpPort}`,
     `--user-data-dir=${userDataDir}`,
     "--no-first-run",
     "--no-default-browser-check"
   ];
-  if (os.platform() === "win32") {
-    launchArgs.push("--remote-debugging-address=127.0.0.1");
+  if (shouldLaunchHeadless()) {
+    launchArgs.push(
+      "--headless=new",
+      "--no-sandbox",
+      "--disable-setuid-sandbox",
+      "--disable-gpu",
+      "--disable-dev-shm-usage"
+    );
   }
   const child = spawn(
     browserInfo.path,
@@ -160,15 +207,22 @@ async function startBrowserInBackground() {
     }
   );
   child.unref();
-  const pollUrls = [`http://127.0.0.1:${CDP_PORT}/json/version`, `http://localhost:${CDP_PORT}/json/version`];
-  for (let i = 0; i < 30; i++) {
-    for (const url of pollUrls) {
-      try {
-        await httpGet(url, 1e3);
-        console.log(pc.green(`${browserInfo.name} \u542F\u52A8\u5E76\u5C31\u7EEA\u3002`));
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        return;
-      } catch {
+  for (let i = 0; i < 40; i++) {
+    const ports = /* @__PURE__ */ new Set([cdpPort]);
+    const activePort = readActivePortFromProfile(userDataDir);
+    if (activePort) ports.add(activePort);
+    for (const port of ports) {
+      for (const baseUrl of candidateCdpBaseUrls(port)) {
+        try {
+          await httpGet(`${baseUrl}/json/version`, 1e3);
+          if (port !== cdpPort) {
+            console.log(pc.yellow(`\u68C0\u6D4B\u5230\u7AEF\u53E3 ${cdpPort} \u5DF2\u88AB\u5176\u4ED6\u7A0B\u5E8F\u5360\u7528\uFF0C${browserInfo.name} \u5DF2\u81EA\u52A8\u5207\u6362\u5230\u7AEF\u53E3 ${port}\u3002`));
+          }
+          console.log(pc.green(`${browserInfo.name} \u542F\u52A8\u5E76\u5C31\u7EEA\uFF08${baseUrl}\uFF09\u3002`));
+          await new Promise((resolve) => setTimeout(resolve, 500));
+          return baseUrl;
+        } catch {
+        }
       }
     }
     await new Promise((resolve) => setTimeout(resolve, 500));
@@ -176,13 +230,16 @@ async function startBrowserInBackground() {
   throw new Error(`${browserInfo.name} \u542F\u52A8\u8D85\u65F6\uFF0C\u65E0\u6CD5\u8FDE\u63A5\u5230 CDP \u7AEF\u53E3\u3002`);
 }
 async function connectBrowser() {
+  const userDataDir = getWorkspaceDir();
+  const cdpPort = getCdpPort();
+  const recordedPort = readActivePortFromProfile(userDataDir);
   const versionAddresses = [
-    `http://127.0.0.1:${CDP_PORT}/json/version`,
-    `http://localhost:${CDP_PORT}/json/version`
+    ...recordedPort && recordedPort !== cdpPort ? candidateCdpBaseUrls(recordedPort).map((u) => `${u}/json/version`) : [],
+    ...candidateCdpBaseUrls(cdpPort).map((u) => `${u}/json/version`)
   ];
   const existingUrl = await findAvailableCdpUrl(versionAddresses, 2);
   if (existingUrl) {
-    console.log(pc.yellow(`connectBrowser: \u68C0\u6D4B\u5230\u7AEF\u53E3 ${CDP_PORT} \u5DF2\u5C31\u7EEA\uFF0C\u6B63\u5728\u8FDE\u63A5 ${existingUrl}...`));
+    console.log(pc.yellow(`connectBrowser: \u68C0\u6D4B\u5230\u7AEF\u53E3 ${cdpPort} \u5DF2\u5C31\u7EEA\uFF0C\u6B63\u5728\u8FDE\u63A5 ${existingUrl}...`));
     try {
       const browser = await connectPuppeteer(existingUrl);
       console.log(pc.green(`connectBrowser: \u6210\u529F\u8FDE\u63A5 ${existingUrl}`));
@@ -194,25 +251,22 @@ async function connectBrowser() {
       );
     }
   }
-  console.log(pc.yellow(`connectBrowser: \u7AEF\u53E3 ${CDP_PORT} \u65E0\u54CD\u5E94\uFF0C\u6B63\u5728\u542F\u52A8\u65B0\u7684\u6D4F\u89C8\u5668\u5B9E\u4F8B...`));
+  console.log(pc.yellow(`connectBrowser: \u7AEF\u53E3 ${cdpPort} \u65E0\u54CD\u5E94\uFF0C\u6B63\u5728\u542F\u52A8\u65B0\u7684\u6D4F\u89C8\u5668\u5B9E\u4F8B...`));
+  let launchedUrl;
   try {
-    await startBrowserInBackground();
+    launchedUrl = await startBrowserInBackground();
   } catch (launchError) {
     const msg = launchError instanceof Error ? launchError.message : String(launchError);
     console.error(pc.red(`\u65E0\u6CD5\u542F\u52A8\u6D4F\u89C8\u5668: ${msg}`));
     throw new Error("Browser launch failed.");
   }
-  const launchedUrl = await findAvailableCdpUrl(versionAddresses, 5);
-  if (!launchedUrl) {
-    throw new Error(`\u65E0\u6CD5\u8FDE\u63A5\u5230\u6D4F\u89C8\u5668\uFF08\u7AEF\u53E3 ${CDP_PORT}\uFF09\uFF0C\u8BF7\u68C0\u67E5 Chrome/Edge \u662F\u5426\u5DF2\u5B89\u88C5\u3002`);
-  }
   try {
     console.log(pc.yellow(`connectBrowser: \u6D4F\u89C8\u5668\u5DF2\u542F\u52A8\uFF0C\u6B63\u5728\u8FDE\u63A5 ${launchedUrl}...`));
     const browser = await connectPuppeteer(launchedUrl);
     console.log(pc.green(`connectBrowser: \u6210\u529F\u8FDE\u63A5 ${launchedUrl}`));
     return browser;
   } catch {
-    throw new Error(`\u65E0\u6CD5\u8FDE\u63A5\u5230\u6D4F\u89C8\u5668\uFF08\u7AEF\u53E3 ${CDP_PORT}\uFF09\uFF0C\u8BF7\u68C0\u67E5 Chrome/Edge \u662F\u5426\u5DF2\u5B89\u88C5\u3002`);
+    throw new Error(`\u65E0\u6CD5\u8FDE\u63A5\u5230\u6D4F\u89C8\u5668\uFF08${launchedUrl}\uFF09\uFF0C\u8BF7\u68C0\u67E5 Chrome/Edge \u662F\u5426\u5DF2\u5B89\u88C5\u3002`);
   }
 }
 async function getPageTargetId(page) {
@@ -270,10 +324,11 @@ async function getTargetPage(browser, tabid) {
     }
     if (!targetPage) {
       try {
-        const urls = [
-          `http://localhost:${CDP_PORT}/json/list`,
-          `http://127.0.0.1:${CDP_PORT}/json/list`
-        ];
+        const workspaceDir = getWorkspaceDir();
+        const cdpPort = getCdpPort();
+        const recordedPort = readActivePortFromProfile(workspaceDir);
+        const ports = recordedPort && recordedPort !== cdpPort ? [recordedPort, cdpPort] : [cdpPort];
+        const urls = ports.flatMap((port) => candidateCdpBaseUrls(port).map((u) => `${u}/json/list`));
         let activeTargetId = null;
         for (const url of urls) {
           try {
@@ -310,10 +365,10 @@ async function getTargetPage(browser, tabid) {
   return targetPage;
 }
 async function injectIntoPage(page) {
-  await injectWebMCPPolyfillAndTools(page, true);
+  await injectWebMCPPolyfillAndTools(page);
 }
-async function injectWebMCPPolyfillAndTools(page, force = false) {
-  const polyfillReady = !force && await page.evaluate(() => {
+async function injectWebMCPPolyfillAndTools(page) {
+  const polyfillReady = await page.evaluate(() => {
     return !!window.__webmcpcli_init;
   }).catch(() => false);
   if (!polyfillReady) {
@@ -403,11 +458,19 @@ async function stateCommand({ tabid }) {
     const state = await page.evaluate(async () => {
       const url = document.URL;
       const title = document.title;
-      const mcp = document.modelContext;
+      const mcp = document.modelContext || navigator.modelContext;
       let webmcpTools = [];
-      if (mcp && typeof mcp.listTools === "function") {
-        const toolsResult = await mcp.getTools();
-        webmcpTools = toolsResult?.tools || toolsResult || [];
+      if (mcp && typeof mcp.getTools === "function") {
+        try {
+          const toolsResult = await mcp.getTools();
+          const list = toolsResult?.tools || toolsResult || [];
+          webmcpTools = list.filter((t) => t && typeof t.name === "string").map((t) => ({
+            name: t.name,
+            description: typeof t.description === "string" ? t.description.slice(0, 200) : void 0
+          }));
+        } catch {
+          webmcpTools = [];
+        }
       }
       return { url, title, webmcpTools };
     });
@@ -439,155 +502,6 @@ async function stateCommand({ tabid }) {
   }
 }
 
-// src/zhihu/create-article.ts
-import os2 from "os";
-
-// src/zhihu/markdown.ts
-import { Marked } from "marked";
-function stripLeadingH1(markdown) {
-  return markdown.replace(/^#\s+[^\n]*\n+/, "");
-}
-function markdownToHtml(markdown) {
-  const marked = new Marked({
-    gfm: true,
-    breaks: false,
-    renderer: {
-      code({ text, lang }) {
-        const langClass = lang ? ` class="language-${lang}"` : "";
-        const escaped = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        return `<pre><code${langClass}>${escaped}</code></pre>`;
-      },
-      codespan({ text }) {
-        const escaped = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        return `<code>${escaped}</code>`;
-      }
-    }
-  });
-  return marked.parse(markdown);
-}
-function decodeBase64Content(content) {
-  return Buffer.from(content, "base64").toString("utf-8");
-}
-var ZHIHU_WRITE_PAGE_RE = /^https:\/\/zhuanlan\.zhihu\.com\/(write|p\/\d+\/edit)/;
-function isZhihuWriteUrl(url) {
-  return ZHIHU_WRITE_PAGE_RE.test(url);
-}
-
-// src/zhihu/create-article.ts
-function delay(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function getPasteModifier() {
-  return os2.platform() === "darwin" ? "Meta" : "Control";
-}
-async function fillTitle(page, title) {
-  await page.evaluate((titleText) => {
-    const input = document.querySelector('textarea[placeholder*="\u6807\u9898"]') || document.querySelector(".WriteIndex-titleInput textarea") || document.querySelector(".WriteIndex-titleInput input");
-    if (!input) throw new Error("\u672A\u627E\u5230\u6807\u9898\u8F93\u5165\u6846\uFF0C\u8BF7\u786E\u8BA4\u7F16\u8F91\u5668\u9875\u9762\u5DF2\u5B8C\u5168\u52A0\u8F7D");
-    const setter = Object.getOwnPropertyDescriptor(
-      input instanceof HTMLTextAreaElement ? HTMLTextAreaElement.prototype : HTMLInputElement.prototype,
-      "value"
-    )?.set;
-    if (setter) {
-      setter.call(input, titleText);
-    } else {
-      input.value = titleText;
-    }
-    input.dispatchEvent(new InputEvent("input", { bubbles: true, cancelable: true, data: titleText }));
-    input.dispatchEvent(new Event("change", { bubbles: true }));
-    if (input.value.trim() !== titleText.trim()) {
-      throw new Error("\u6807\u9898\u586B\u5199\u5931\u8D25\uFF0C\u8BF7\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5");
-    }
-  }, title);
-}
-async function pasteHtmlToEditor(page, html) {
-  const browser = page.browser();
-  const tempPage = await browser.newPage();
-  const modifier = getPasteModifier();
-  try {
-    const fullHtml = `<!DOCTYPE html><html><head><meta charset="utf-8"></head><body>${html}</body></html>`;
-    await tempPage.setContent(fullHtml, { waitUntil: "domcontentloaded" });
-    await delay(300);
-    await tempPage.click("body");
-    await tempPage.keyboard.down(modifier);
-    await tempPage.keyboard.press("KeyA");
-    await tempPage.keyboard.up(modifier);
-    await delay(100);
-    await tempPage.keyboard.down(modifier);
-    await tempPage.keyboard.press("KeyC");
-    await tempPage.keyboard.up(modifier);
-    await delay(300);
-  } finally {
-    await tempPage.close();
-  }
-  await page.bringToFront();
-  await page.waitForSelector(".public-DraftEditor-content", { timeout: 1e4 });
-  await page.click(".public-DraftEditor-content");
-  await delay(200);
-  await page.keyboard.down(modifier);
-  await page.keyboard.press("KeyA");
-  await page.keyboard.up(modifier);
-  await delay(100);
-  await page.keyboard.press("Backspace");
-  await delay(200);
-  await page.keyboard.down(modifier);
-  await page.keyboard.press("KeyV");
-  await page.keyboard.up(modifier);
-  await delay(1500);
-  const probe = html.replace(/<[^>]+>/g, "").trim().slice(0, 15);
-  const verifyResult = await page.evaluate((probeText) => {
-    const editor = document.querySelector(".public-DraftEditor-content");
-    if (!editor) return { ok: false, reason: "no editor" };
-    const text = (editor.innerText || "").trim();
-    if (!text) return { ok: false, reason: "empty" };
-    const inner = editor.innerHTML;
-    const hasRichFormat = inner.includes("data-text") || /font-weight:\s*bold|font-style:\s*italic|code-block|blockquote/i.test(inner);
-    const normalizedText = text.replace(/\s+/g, "");
-    const normalizedProbe = probeText.replace(/\s+/g, "");
-    const hasProbe = normalizedText.includes(normalizedProbe);
-    return {
-      ok: text.length > 20 && hasProbe && (hasRichFormat || text.length > 50),
-      reason: !hasProbe ? "probe mismatch" : !hasRichFormat && text.length <= 50 ? "no rich format" : void 0
-    };
-  }, probe);
-  if (!verifyResult.ok) {
-    throw new Error(
-      `\u6B63\u6587\u586B\u5199\u5931\u8D25\uFF08Markdown \u8F6C HTML \u7C98\u8D34\u672A\u751F\u6548\uFF09${verifyResult.reason ? `: ${verifyResult.reason}` : ""}`
-    );
-  }
-}
-async function zhihuCreateArticle(page, args) {
-  const { title, content } = args;
-  if (!title?.trim()) throw new Error("\u53C2\u6570 title \u4E0D\u80FD\u4E3A\u7A7A");
-  if (!content?.trim()) throw new Error("\u53C2\u6570 content \u4E0D\u80FD\u4E3A\u7A7A");
-  const url = page.url();
-  if (!isZhihuWriteUrl(url)) {
-    throw new Error("\u5F53\u524D\u9875\u9762\u4E0D\u662F\u77E5\u4E4E\u4E13\u680F\u7F16\u8F91\u5668\uFF0C\u8BF7\u5148\u6253\u5F00 https://zhuanlan.zhihu.com/write");
-  }
-  let markdown;
-  try {
-    markdown = stripLeadingH1(decodeBase64Content(content));
-  } catch {
-    throw new Error("content \u4E0D\u662F\u6709\u6548\u7684 Base64 \u7F16\u7801\uFF0C\u8BF7\u68C0\u67E5\u53C2\u6570\u6216\u4F7F\u7528 @base64file: \u5F15\u7528\u6587\u4EF6");
-  }
-  if (!markdown.trim()) {
-    throw new Error("\u6B63\u6587\u5185\u5BB9\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5 Markdown \u6587\u4EF6");
-  }
-  const html = markdownToHtml(markdown);
-  await fillTitle(page, title.trim());
-  await delay(500);
-  await pasteHtmlToEditor(page, html);
-  const result = {
-    success: true,
-    message: "\u6587\u7AE0\u6807\u9898\u548C\u6B63\u6587\u5DF2\u6210\u529F\u586B\u5199\u5230\u77E5\u4E4E\u4E13\u680F\u7F16\u8F91\u5668\uFF08Markdown \u5DF2\u8F6C\u4E3A\u5BCC\u6587\u672C\uFF09\uFF0C\u8349\u7A3F\u5C06\u81EA\u52A8\u4FDD\u5B58",
-    title: title.trim(),
-    contentLength: markdown.length
-  };
-  return {
-    content: [{ type: "text", text: JSON.stringify(result) }]
-  };
-}
-
 // src/commands/run.ts
 async function runCommand({
   toolName,
@@ -598,18 +512,8 @@ async function runCommand({
   try {
     const page = await getTargetPage(browser, tabid);
     const urlBefore = page.url();
+    await injectIntoPage(page);
     const cleanedArgs = argsJson.trim();
-    if (toolName === "create_article") {
-      let parsedArgs;
-      try {
-        parsedArgs = JSON.parse(cleanedArgs);
-      } catch {
-        throw new Error("\u53C2\u6570\u4E0D\u662F\u6709\u6548\u7684 JSON");
-      }
-      if (isZhihuWriteUrl(page.url())) {
-        return await zhihuCreateArticle(page, parsedArgs);
-      }
-    }
     let result;
     try {
       result = await page.evaluate(async (name, inputString) => {