@opentiny/webmcp-cli 0.0.2 → 0.0.4

package/dist/bin.js

@@ -161,21 +161,28 @@ ${hint}`);
   }
 }
 function prepareRunArgsJson(args, fileContent, baseDir) {
-  let raw = "";
   if (fileContent !== void 0) {
-    raw = fileContent.trim();
-  } else if (args.length > 0) {
-    const joined = joinShellArgs(args);
-    if (joined.startsWith("{") || looksLikeObjectBody(joined)) {
-      raw = joined;
-    } else if (args.every((arg) => arg.includes("="))) {
-      raw = buildArgsFromKeyValuePairs(args);
-    } else {
-      raw = joined;
+    const trimmed = fileContent.trim();
+    if (!trimmed) {
+      throw new Error("\u901A\u8FC7 -f/--file \u6307\u5B9A\u7684\u53C2\u6570\u6587\u4EF6\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A");
     }
+    const expanded2 = expandFileRefs(trimmed, baseDir);
+    return parseArgsJson(expanded2);
+  }
+  if (args.length === 0) {
+    return "{}";
+  }
+  const joined = joinShellArgs(args);
+  let raw = "";
+  if (joined.startsWith("{") || looksLikeObjectBody(joined)) {
+    raw = joined;
+  } else if (args.every((arg) => arg.includes("="))) {
+    raw = buildArgsFromKeyValuePairs(args);
+  } else {
+    raw = joined;
   }
-  if (!raw) {
-    throw new Error("\u5FC5\u987B\u63D0\u4F9B\u53C2\u6570\u6216\u901A\u8FC7 -f/--file \u6307\u5B9A\u53C2\u6570\u6587\u4EF6");
+  if (!raw.trim()) {
+    throw new Error("\u672A\u63D0\u4F9B\u6709\u6548\u53C2\u6570");
   }
   const expanded = expandFileRefs(raw, baseDir);
   return parseArgsJson(expanded);
@@ -194,6 +201,30 @@ var __filename = fileURLToPath2(import.meta.url);
 var __dirname = path.dirname(__filename);
 var CDP_PORT = 9222;
 var CDP_URL = `http://localhost:${CDP_PORT}`;
+function getWorkspaceDir() {
+  return process.env.WEBMCP_WORKSPACE || path.join(os.homedir(), ".webmcp_chrome_profile");
+}
+function getLastTabIdFilePath() {
+  return path.join(getWorkspaceDir(), ".last-tab-id");
+}
+function setLastActiveTabId(tabid) {
+  try {
+    const dir = getWorkspaceDir();
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(getLastTabIdFilePath(), tabid, "utf-8");
+  } catch {
+  }
+}
+function getLastActiveTabId() {
+  try {
+    const tabid = fs.readFileSync(getLastTabIdFilePath(), "utf-8").trim();
+    return tabid || null;
+  } catch {
+    return null;
+  }
+}
 function httpGet(url, timeoutMs = 1500) {
   return new Promise((resolve3, reject) => {
     const req = http.get(url, { timeout: timeoutMs }, (res) => {
@@ -240,6 +271,31 @@ async function checkCdpReady(url, retries = 3) {
   }
   return false;
 }
+async function findAvailableCdpUrl(addresses, retries = 2) {
+  for (const addr of addresses) {
+    if (await checkCdpReady(addr, retries)) {
+      return addr.replace("/json/version", "");
+    }
+  }
+  return null;
+}
+async function connectPuppeteer(browserBaseUrl, attempt = 1, maxAttempts = 3) {
+  try {
+    return await promiseWithTimeout(
+      puppeteer.connect({ browserURL: browserBaseUrl, defaultViewport: null }),
+      1e4,
+      `puppeteer.connect to ${browserBaseUrl} timed out`
+    );
+  } catch (err) {
+    if (attempt >= maxAttempts) {
+      throw err;
+    }
+    const delayMs = 500 * attempt;
+    console.log(pc.yellow(`connectBrowser: \u7B2C ${attempt} \u6B21\u8FDE\u63A5\u5931\u8D25\uFF0C${delayMs}ms \u540E\u91CD\u8BD5...`));
+    await new Promise((resolve3) => setTimeout(resolve3, delayMs));
+    return connectPuppeteer(browserBaseUrl, attempt + 1, maxAttempts);
+  }
+}
 function getDefaultBrowserPath() {
   const platform = os.platform();
   if (platform === "darwin") {
@@ -286,72 +342,56 @@ async function startBrowserInBackground() {
   }
   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 launchArgs = [
+    `--remote-debugging-port=${CDP_PORT}`,
+    `--user-data-dir=${userDataDir}`,
+    "--no-first-run",
+    "--no-default-browser-check"
+  ];
+  if (os.platform() === "win32") {
+    launchArgs.push("--remote-debugging-address=127.0.0.1");
+  }
   const child = spawn(
     browserInfo.path,
-    [
-      `--remote-debugging-port=${CDP_PORT}`,
-      `--user-data-dir=${userDataDir}`,
-      "--no-first-run",
-      "--no-default-browser-check"
-    ],
+    launchArgs,
     {
       detached: true,
       stdio: "ignore"
     }
   );
   child.unref();
-  for (let i = 0; i < 20; i++) {
-    try {
-      const urls = [`http://127.0.0.1:${CDP_PORT}/json/version`, `http://localhost:${CDP_PORT}/json/version`];
-      for (const url of urls) {
-        try {
-          await httpGet(url, 1e3);
-          console.log(pc.green(`${browserInfo.name} \u542F\u52A8\u5E76\u5C31\u7EEA\u3002`));
-          return;
-        } catch (err) {
-        }
+  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((resolve3) => setTimeout(resolve3, 500));
+        return;
+      } catch {
       }
-    } catch (e) {
     }
     await new Promise((resolve3) => setTimeout(resolve3, 500));
   }
   throw new Error(`${browserInfo.name} \u542F\u52A8\u8D85\u65F6\uFF0C\u65E0\u6CD5\u8FDE\u63A5\u5230 CDP \u7AEF\u53E3\u3002`);
 }
 async function connectBrowser() {
-  const targetFilter = (target) => {
-    try {
-      const info = typeof target._getTargetInfo === "function" ? target._getTargetInfo() : target;
-      const type = info.type || "";
-      const url = info.url || "";
-      if (type === "service_worker" || type === "shared_worker" || type === "iframe" || type === "other" || type === "webview" || type === "background_page") {
-        return false;
-      }
-      if (url.startsWith("devtools://") || url.startsWith("chrome-extension://")) {
-        return false;
-      }
-      return true;
-    } catch (e) {
-      return false;
-    }
-  };
-  const portAddresses = [
+  const versionAddresses = [
     `http://127.0.0.1:${CDP_PORT}/json/version`,
     `http://localhost:${CDP_PORT}/json/version`
   ];
-  for (const addr of portAddresses) {
-    const isReady = await checkCdpReady(addr, 2);
-    if (!isReady) continue;
-    const browserURL = addr.replace("/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}...`));
     try {
-      console.log(pc.yellow(`connectBrowser: \u68C0\u6D4B\u5230\u7AEF\u53E3 ${CDP_PORT} \u5DF2\u5C31\u7EEA\uFF0C\u6B63\u5728\u8FDE\u63A5 ${browserURL}...`));
-      const browser = await promiseWithTimeout(
-        puppeteer.connect({ browserURL, defaultViewport: null, targetFilter }),
-        1e4,
-        `puppeteer.connect to ${browserURL} timed out`
-      );
-      console.log(pc.green(`connectBrowser: \u6210\u529F\u8FDE\u63A5 ${browserURL}`));
+      const browser = await connectPuppeteer(existingUrl);
+      console.log(pc.green(`connectBrowser: \u6210\u529F\u8FDE\u63A5 ${existingUrl}`));
       return browser;
-    } catch {
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      throw new Error(
+        `\u65E0\u6CD5\u8FDE\u63A5\u5230\u5DF2\u5728\u8FD0\u884C\u7684\u6D4F\u89C8\u5668\uFF08${existingUrl}\uFF09\uFF1A${msg}\u3002CDP \u7AEF\u53E3\u53EF\u7528\uFF0C\u8BF7\u52FF\u91CD\u590D\u542F\u52A8\u6D4F\u89C8\u5668\uFF1B\u53EF\u5173\u95ED\u591A\u4F59\u7A97\u53E3\u540E\u91CD\u8BD5\u3002`
+      );
     }
   }
   console.log(pc.yellow(`connectBrowser: \u7AEF\u53E3 ${CDP_PORT} \u65E0\u54CD\u5E94\uFF0C\u6B63\u5728\u542F\u52A8\u65B0\u7684\u6D4F\u89C8\u5668\u5B9E\u4F8B...`));
@@ -362,23 +402,18 @@ async function connectBrowser() {
     console.error(pc.red(`\u65E0\u6CD5\u542F\u52A8\u6D4F\u89C8\u5668: ${msg}`));
     throw new Error("Browser launch failed.");
   }
-  for (const addr of portAddresses) {
-    const isReady = await checkCdpReady(addr, 3);
-    if (!isReady) continue;
-    const browserURL = addr.replace("/json/version", "");
-    try {
-      console.log(pc.yellow(`connectBrowser: \u6D4F\u89C8\u5668\u5DF2\u542F\u52A8\uFF0C\u6B63\u5728\u8FDE\u63A5 ${browserURL}...`));
-      const browser = await promiseWithTimeout(
-        puppeteer.connect({ browserURL, defaultViewport: null, targetFilter }),
-        1e4,
-        `puppeteer.connect to ${browserURL} after launch timed out`
-      );
-      console.log(pc.green(`connectBrowser: \u6210\u529F\u8FDE\u63A5 ${browserURL}`));
-      return browser;
-    } catch {
-    }
+  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\u7AEF\u53E3 ${CDP_PORT}\uFF09\uFF0C\u8BF7\u68C0\u67E5 Chrome/Edge \u662F\u5426\u5DF2\u5B89\u88C5\u3002`);
 }
 async function getPageTargetId(page) {
   const session = await page.target().createCDPSession();
@@ -448,33 +483,42 @@ async function getTargetPage(browser, tabid) {
     }
     targetPage = await target.page();
   } else {
-    try {
-      const urls = [
-        `http://localhost:${CDP_PORT}/json/list`,
-        `http://127.0.0.1:${CDP_PORT}/json/list`
-      ];
-      let activeTargetId = null;
-      for (const url of urls) {
-        try {
-          const body = await httpGet(url, 1e3);
-          const targetsData = JSON.parse(body);
-          const active = targetsData.find((t) => t.type === "page" && !t.url.startsWith("devtools://"));
-          if (active) {
-            activeTargetId = active.id;
-            break;
+    const lastTabId = getLastActiveTabId();
+    if (lastTabId) {
+      const lastTarget = findPageTargetByTabId(browser, lastTabId);
+      if (lastTarget) {
+        targetPage = await lastTarget.page();
+      }
+    }
+    if (!targetPage) {
+      try {
+        const urls = [
+          `http://localhost:${CDP_PORT}/json/list`,
+          `http://127.0.0.1:${CDP_PORT}/json/list`
+        ];
+        let activeTargetId = null;
+        for (const url of urls) {
+          try {
+            const body = await httpGet(url, 1e3);
+            const targetsData = JSON.parse(body);
+            const active = targetsData.find((t) => t.type === "page" && !t.url.startsWith("devtools://"));
+            if (active) {
+              activeTargetId = active.id;
+              break;
+            }
+          } catch {
           }
-        } catch {
         }
-      }
-      if (activeTargetId) {
-        for (const target of pageTargets) {
-          if (getTargetIdFromTarget(target) === activeTargetId) {
-            targetPage = await target.page();
-            break;
+        if (activeTargetId) {
+          for (const target of pageTargets) {
+            if (getTargetIdFromTarget(target) === activeTargetId) {
+              targetPage = await target.page();
+              break;
+            }
           }
         }
+      } catch {
       }
-    } catch {
     }
     if (!targetPage) {
       const lastTarget = pageTargets[pageTargets.length - 1];
@@ -555,6 +599,12 @@ async function injectDomainTools(page) {
   if (!fs.existsSync(toolBundlePath)) {
     return;
   }
+  const bundleKey = bundleName.replace(/^webmcp-tools\//, "").replace(/\.js$/, "");
+  const flagKey = `__webmcptools_${bundleKey.replace(/[^a-zA-Z0-9]/g, "")}`;
+  const alreadyInjected = await page.evaluate((key) => !!window[key], flagKey).catch(() => false);
+  if (alreadyInjected) {
+    return;
+  }
   console.log(pc.cyan(`\u68C0\u6D4B\u5230\u57DF\u540D ${hostname} \u6709\u9884\u7F6E\u5DE5\u5177\uFF0C\u6B63\u5728\u6CE8\u5165...`));
   const toolScript = fs.readFileSync(toolBundlePath, "utf-8");
   try {
@@ -583,6 +633,7 @@ async function stateCommand({ tabid }) {
       }
       return { url, title, webmcpTools };
     });
+    const activeTabid = await getPageTargetId(page).catch(() => null);
     const pages = await browser.pages();
     const tabs2 = await Promise.all(
       pages.map(async (p) => {
@@ -602,6 +653,7 @@ async function stateCommand({ tabid }) {
     );
     return {
       ...state,
+      activeTabid,
       tabs: tabs2.filter(Boolean)
     };
   } finally {
@@ -618,28 +670,51 @@ async function runCommand({
   const browser = await connectBrowser();
   try {
     const page = await getTargetPage(browser, tabid);
+    const urlBefore = page.url();
     const cleanedArgs = argsJson.trim();
-    const result = await page.evaluate(async (name, inputString) => {
-      const mcp = navigator.modelContextTesting || navigator.modelContext;
-      if (!mcp || typeof mcp.executeTool !== "function") {
-        throw new Error("\u5F53\u524D\u9875\u9762\u6CA1\u6709\u6CE8\u5165 WebMCP \u73AF\u5883 (navigator.modelContextTesting.executeTool \u672A\u627E\u5230)");
-      }
-      let res = await mcp.executeTool(name, inputString);
-      if (typeof res === "string") {
+    let result;
+    try {
+      result = await page.evaluate(async (name, inputString) => {
+        const mcp = navigator.modelContextTesting || navigator.modelContext;
+        if (!mcp || typeof mcp.executeTool !== "function") {
+          throw new Error("\u5F53\u524D\u9875\u9762\u6CA1\u6709\u6CE8\u5165 WebMCP \u73AF\u5883 (navigator.modelContextTesting.executeTool \u672A\u627E\u5230)");
+        }
+        let res = await mcp.executeTool(name, inputString);
+        if (typeof res === "string") {
+          try {
+            res = JSON.parse(res);
+          } catch {
+          }
+        }
+        if (res === void 0 || res === null) {
+          throw new Error("\u5DE5\u5177 execute \u672A\u8FD4\u56DE\u7ED3\u679C\uFF0C\u8BF7\u68C0\u67E5\u5DE5\u5177\u5B9E\u73B0\u662F\u5426\u7F3A\u5C11 return");
+        }
+        if (typeof res === "object" && res.success === false) {
+          const failed = res;
+          throw new Error(failed.error || failed.message || "\u5DE5\u5177\u6267\u884C\u5931\u8D25");
+        }
+        return res;
+      }, toolName, cleanedArgs);
+    } catch (evalError) {
+      const errMsg = evalError instanceof Error ? evalError.message : String(evalError);
+      const isContextDestroyed = errMsg.includes("context was destroyed") || errMsg.includes("Execution context was destroyed") || errMsg.includes("Cannot read properties of null") && errMsg.includes("context");
+      if (isContextDestroyed) {
+        await new Promise((resolve3) => setTimeout(resolve3, 800));
+        let newUrl = "";
         try {
-          res = JSON.parse(res);
+          newUrl = page.url();
         } catch {
         }
+        if (newUrl && newUrl !== urlBefore) {
+          return {
+            success: true,
+            message: `\u5DE5\u5177 ${toolName} \u6267\u884C\u5B8C\u6210\uFF0C\u9875\u9762\u5DF2\u5BFC\u822A\u81F3 ${newUrl}`,
+            navigatedTo: newUrl
+          };
+        }
       }
-      if (res === void 0 || res === null) {
-        throw new Error("\u5DE5\u5177 execute \u672A\u8FD4\u56DE\u7ED3\u679C\uFF0C\u8BF7\u68C0\u67E5\u5DE5\u5177\u5B9E\u73B0\u662F\u5426\u7F3A\u5C11 return");
-      }
-      if (typeof res === "object" && res.success === false) {
-        const failed = res;
-        throw new Error(failed.error || failed.message || "\u5DE5\u5177\u6267\u884C\u5931\u8D25");
-      }
-      return res;
-    }, toolName, cleanedArgs);
+      throw evalError;
+    }
     return result;
   } finally {
     await browser.disconnect();
@@ -671,11 +746,19 @@ async function tabsOpenCommand(url) {
     await page.goto(url, { waitUntil: "domcontentloaded" });
     await injectIntoPage(page);
     await new Promise((resolve3) => setTimeout(resolve3, 500));
+    let tabid;
+    try {
+      tabid = await getPageTargetId(page);
+      await activateTabById(browser, tabid);
+      setLastActiveTabId(tabid);
+    } catch (e) {
+      console.warn("Best-effort tab activation failed:", e);
+    }
     return {
       success: true,
-      tabid: await getPageTargetId(page),
+      tabid,
       url: page.url(),
-      title: await page.title()
+      title: await page.title().catch(() => "")
     };
   } finally {
     await browser.disconnect();
@@ -707,9 +790,11 @@ async function tabsSwitchCommand(tabid) {
   try {
     await activateTabById(browser, tabid);
     const page = await getTargetPage(browser, tabid);
+    const realTabid = await getPageTargetId(page);
+    setLastActiveTabId(realTabid);
     return {
       success: true,
-      tabid: await getPageTargetId(page),
+      tabid: realTabid,
       url: page.url(),
       title: await page.title()
     };
@@ -771,7 +856,7 @@ async function tabsForwardCommand(tabid) {
 // package.json
 var package_default = {
   name: "@opentiny/webmcp-cli",
-  version: "0.0.2",
+  version: "0.0.4",
   type: "module",
   description: "WebMCP CLI for AI Agents to interact with browser via Puppeteer",
   main: "dist/index.js",