@opentiny/webmcp-cli 0.0.1-alpha.5 → 0.0.1-alpha.6

package/dist/bin.js

@@ -3,8 +3,180 @@
 // src/bin.ts
 import { Command } from "commander";
 import pc2 from "picocolors";
+import { readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve2 } from "path";
+
+// src/expand-file-refs.ts
 import { readFileSync } from "fs";
-import { resolve } from "path";
+import { dirname, isAbsolute, normalize, resolve } from "path";
+import { fileURLToPath } from "url";
+var JSON_STRING_LITERAL = /"(?:[^"\\]|\\.)*"/g;
+var UNQUOTED_FILE_REF = /(?<![\\"])@(base64)?file:([^\s"',}\]]+)/g;
+var FILE_REF_PREFIX = /^@(base64)?file:(.+)$/s;
+function resolveFilePath(filePath, baseDir = process.cwd()) {
+  let normalizedPath = filePath.trim();
+  if (normalizedPath.startsWith('"') && normalizedPath.endsWith('"') || normalizedPath.startsWith("'") && normalizedPath.endsWith("'")) {
+    normalizedPath = normalizedPath.slice(1, -1).trim();
+  }
+  if (normalizedPath.startsWith("file://")) {
+    normalizedPath = fileURLToPath(normalizedPath);
+  }
+  if (isAbsolute(normalizedPath)) {
+    return normalize(normalizedPath);
+  }
+  return resolve(baseDir, normalizedPath);
+}
+function decodeFilePath(rawPath) {
+  return rawPath.replace(/\\\\/g, "\\");
+}
+function readFileRefContent(filePath, baseDir, base64) {
+  const absPath = resolveFilePath(filePath, baseDir);
+  let content;
+  try {
+    content = readFileSync(absPath, "utf-8");
+  } catch (e) {
+    throw new Error(`\u65E0\u6CD5\u8BFB\u53D6\u6587\u4EF6\u5F15\u7528 "${filePath}" (${absPath}): ${e.message}`);
+  }
+  return base64 ? Buffer.from(content, "utf-8").toString("base64") : content;
+}
+function expandFileRefValue(rawInner, baseDir) {
+  const match = rawInner.match(FILE_REF_PREFIX);
+  if (!match) {
+    return null;
+  }
+  const [, base64Flag, rawPath] = match;
+  const filePath = decodeFilePath(rawPath);
+  const value = readFileRefContent(filePath, baseDir, Boolean(base64Flag));
+  return JSON.stringify(value);
+}
+function expandQuotedFileRefs(argsJson, baseDir) {
+  return argsJson.replace(JSON_STRING_LITERAL, (jsonStringLiteral) => {
+    const rawInner = jsonStringLiteral.slice(1, -1);
+    const replacement = expandFileRefValue(rawInner, baseDir);
+    return replacement ?? jsonStringLiteral;
+  });
+}
+function expandUnquotedFileRefs(argsJson, baseDir) {
+  return argsJson.replace(UNQUOTED_FILE_REF, (match, base64Flag, filePath) => {
+    const value = readFileRefContent(filePath, baseDir, Boolean(base64Flag));
+    return JSON.stringify(value);
+  });
+}
+function expandFileRefs(argsJson, baseDir = process.cwd()) {
+  const withQuotedExpanded = expandQuotedFileRefs(argsJson, baseDir);
+  return expandUnquotedFileRefs(withQuotedExpanded, baseDir);
+}
+function getFileBaseDir(fileOption) {
+  if (!fileOption) {
+    return process.cwd();
+  }
+  return dirname(resolve(process.cwd(), fileOption));
+}
+
+// src/parse-run-args.ts
+import JSON5 from "json5";
+function cleanJsonString(str) {
+  let cleaned = str.trim();
+  if (cleaned.startsWith("'") && cleaned.endsWith("'")) {
+    cleaned = cleaned.slice(1, -1).trim();
+  }
+  return cleaned;
+}
+function looksLikeObjectBody(raw) {
+  return /^("?[\w-]+"?\s*:)/.test(raw);
+}
+function joinShellArgs(args) {
+  const cleaned = args.map(cleanJsonString);
+  const first = cleaned[0] ?? "";
+  if (first.startsWith("{")) {
+    return cleaned.join(" ");
+  }
+  if (looksLikeObjectBody(first)) {
+    let joined = cleaned.join(" ");
+    if (!joined.startsWith("{")) {
+      joined = `{${joined}}`;
+    }
+    if (!joined.endsWith("}")) {
+      joined = `${joined}}`;
+    }
+    return joined;
+  }
+  return cleaned.join(" ");
+}
+function insertMissingCommas(raw) {
+  return raw.replace(/"(\s+)("?[\w-]+"?\s*:)/g, '",$2');
+}
+function quoteUnquotedStringValues(raw) {
+  return raw.replace(
+    /([{,]\s*(?:"([^"]+)"|([\w-]+))\s*:\s*)(?!"@(?:base64)?file:|"|true|false|null|-?\d|\{|\[)([^",}\]]+?)(?=\s*[,}])/g,
+    (_match, prefix, _quotedKey, _unquotedKey, value) => {
+      const trimmed = value.trim();
+      if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(trimmed)) {
+        return prefix + trimmed;
+      }
+      return prefix + JSON.stringify(trimmed);
+    }
+  );
+}
+function normalizeShellDamagedJson(raw) {
+  let normalized = raw.trim();
+  normalized = insertMissingCommas(normalized);
+  normalized = quoteUnquotedStringValues(normalized);
+  return normalized;
+}
+function buildArgsFromKeyValuePairs(args) {
+  const obj = {};
+  for (const pair of args) {
+    const index = pair.indexOf("=");
+    if (index === -1) {
+      throw new Error(`\u65E0\u6548\u7684\u53C2\u6570\u683C\u5F0F "${pair}"\u3002\u8BF7\u4F7F\u7528 key=value\uFF0C\u6216 JSON / -f \u6587\u4EF6\u3002`);
+    }
+    const key = pair.substring(0, index).trim();
+    let val = cleanJsonString(pair.substring(index + 1).trim());
+    try {
+      obj[key] = JSON.parse(val);
+    } catch {
+      obj[key] = val;
+    }
+  }
+  return JSON.stringify(obj);
+}
+function parseArgsJson(raw) {
+  const trimmed = cleanJsonString(raw);
+  try {
+    return JSON.stringify(JSON5.parse(trimmed));
+  } catch (firstError) {
+    const repaired = normalizeShellDamagedJson(trimmed);
+    try {
+      return JSON.stringify(JSON5.parse(repaired));
+    } catch {
+      const hint = `\u63D0\u793A\uFF1Abash \u4E2D JSON \u5FC5\u987B\u7528\u5355\u5F15\u53F7\u5305\u88F9\uFF0C\u4F8B\u5982 '{"title":"\u6807\u9898","content":"@base64file:./article.md"}'\uFF1B\u6216\u4F7F\u7528 key=value\uFF1Atitle=\u6807\u9898 content=@base64file:./article.md\uFF1B\u6216\u4F7F\u7528 -f args.json\u3002`;
+      const message = firstError instanceof Error ? firstError.message : String(firstError);
+      throw new Error(`\u53C2\u6570\u4E0D\u662F\u6709\u6548\u7684 JSON \u6216 JS \u5BF9\u8C61: ${message}
+${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;
+    }
+  }
+  if (!raw) {
+    throw new Error("\u5FC5\u987B\u63D0\u4F9B\u53C2\u6570\u6216\u901A\u8FC7 -f/--file \u6307\u5B9A\u53C2\u6570\u6587\u4EF6");
+  }
+  const expanded = expandFileRefs(raw, baseDir);
+  return parseArgsJson(expanded);
+}
 
 // src/browser.ts
 import puppeteer from "puppeteer-core";
@@ -14,13 +186,13 @@ import os from "os";
 import path from "path";
 import http from "http";
 import { spawn } from "child_process";
-import { fileURLToPath } from "url";
-var __filename = fileURLToPath(import.meta.url);
+import { fileURLToPath as fileURLToPath2 } from "url";
+var __filename = fileURLToPath2(import.meta.url);
 var __dirname = path.dirname(__filename);
 var CDP_PORT = 9222;
 var CDP_URL = `http://localhost:${CDP_PORT}`;
 function httpGet(url, timeoutMs = 1500) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const req = http.get(url, { timeout: timeoutMs }, (res) => {
       let data = "";
       res.on("data", (chunk) => {
@@ -28,7 +200,7 @@ function httpGet(url, timeoutMs = 1500) {
       });
       res.on("end", () => {
         if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-          resolve2(data);
+          resolve3(data);
         } else {
           reject(new Error(`HTTP ${res.statusCode}`));
         }
@@ -138,7 +310,7 @@ async function startBrowserInBackground() {
       }
     } catch (e) {
     }
-    await new Promise((resolve2) => setTimeout(resolve2, 500));
+    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`);
 }
@@ -332,7 +504,7 @@ async function injectWebMCPPolyfillAndTools(page2, force = false) {
       const msg = err instanceof Error ? err.message : String(err);
       throw new Error("\u81EA\u52A8\u6CE8\u5165\u811A\u672C\u6267\u884C\u5931\u8D25: " + msg);
     }
-    await new Promise((resolve2) => setTimeout(resolve2, 300));
+    await new Promise((resolve3) => setTimeout(resolve3, 300));
   }
   await injectDomainTools(page2);
 }
@@ -420,7 +592,7 @@ async function stateCommand({ tabid: tabid2 }) {
         if (pUrl.startsWith("devtools://")) return null;
         const pTitle = await Promise.race([
           p.title().catch(() => "Unknown"),
-          new Promise((resolve2) => setTimeout(() => resolve2("Unknown"), 500))
+          new Promise((resolve3) => setTimeout(() => resolve3("Unknown"), 500))
         ]);
         return {
           // 使用真实的 Chrome target ID，而非数组下标
@@ -440,7 +612,6 @@ async function stateCommand({ tabid: tabid2 }) {
 }
 
 // src/commands/run.ts
-import JSON5 from "json5";
 async function runCommand({
   toolName,
   argsJson,
@@ -449,16 +620,7 @@ async function runCommand({
   const browser2 = await connectBrowser();
   try {
     const page2 = await getTargetPage(browser2, tabid2);
-    let cleanedArgs = argsJson.trim();
-    if (cleanedArgs.startsWith("'") && cleanedArgs.endsWith("'")) {
-      cleanedArgs = cleanedArgs.slice(1, -1).trim();
-    }
-    try {
-      const obj = JSON5.parse(cleanedArgs);
-      cleanedArgs = JSON.stringify(obj);
-    } catch (e) {
-      throw new Error(`\u53C2\u6570\u4E0D\u662F\u6709\u6548\u7684 JSON \u6216 JS \u5BF9\u8C61: ${e.message}`);
-    }
+    const cleanedArgs = argsJson.trim();
     const result2 = await page2.evaluate(async (name, inputString) => {
       const mcp = navigator.modelContextTesting || navigator.modelContext;
       if (!mcp || typeof mcp.executeTool !== "function") {
@@ -468,9 +630,17 @@ async function runCommand({
       if (typeof res === "string") {
         try {
           res = JSON.parse(res);
-        } catch (e) {
+        } 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);
     return result2;
   } finally {
@@ -531,7 +701,7 @@ async function tabsOpenCommand(url) {
     url = normalizeUrl(url);
     await page2.goto(url, { waitUntil: "domcontentloaded" });
     await injectIntoPage(page2);
-    await new Promise((resolve2) => setTimeout(resolve2, 500));
+    await new Promise((resolve3) => setTimeout(resolve3, 500));
     return {
       success: true,
       tabid: await getPageTargetId(page2),
@@ -632,7 +802,7 @@ async function tabsForwardCommand(tabid2) {
 // package.json
 var package_default = {
   name: "@opentiny/webmcp-cli",
-  version: "0.0.1-alpha.5",
+  version: "0.0.1-alpha.6",
   type: "module",
   description: "WebMCP CLI for AI Agents to interact with browser via Puppeteer",
   main: "dist/index.js",
@@ -686,13 +856,6 @@ var package_default = {
 
 // src/bin.ts
 var program = new Command();
-function cleanJsonString(str) {
-  let cleaned = str.trim();
-  if (cleaned.startsWith("'") && cleaned.endsWith("'")) {
-    cleaned = cleaned.slice(1, -1).trim();
-  }
-  return cleaned;
-}
 function parseTabId(id) {
   if (!id) return void 0;
   return id;
@@ -702,19 +865,6 @@ function handleCommandError(error, commandName) {
   console.error(pc2.red(`Error executing ${commandName} command: ${msg}`));
   process.exit(1);
 }
-function expandFileRefs(argsJson) {
-  return argsJson.replace(/"@(base64)?file:([^"]+)"/g, (_match, base64Flag, filePath) => {
-    const absPath = resolve(process.cwd(), filePath);
-    let content;
-    try {
-      content = readFileSync(absPath, "utf-8");
-    } catch (e) {
-      throw new Error(`\u65E0\u6CD5\u8BFB\u53D6\u6587\u4EF6\u5F15\u7528 "${filePath}": ${e.message}`);
-    }
-    const value = base64Flag ? Buffer.from(content, "utf-8").toString("base64") : content;
-    return JSON.stringify(value);
-  });
-}
 program.name("webmcp-cli").description("WebMCP CLI for interacting with browser via CDP").version(package_default.version).option("-w, --workspace <path>", "\u6307\u5B9A\u81EA\u5B9A\u4E49\u7684\u6D4F\u89C8\u5668\u5DE5\u4F5C\u7A7A\u95F4\uFF08\u7528\u6237\u914D\u7F6E\u76EE\u5F55\uFF09\u8DEF\u5F84").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.workspace) {
@@ -738,42 +888,18 @@ program.command("run <toolName> [args...]").description("\u5411\u6307\u5B9A\u987
 \u793A\u4F8B\uFF1Awebmcp-cli run mytool '{"content":"@base64file:./doc.md"}'`
 ).action(async (toolName, args, options) => {
   try {
-    let finalArgsJson = "";
+    let fileContent;
+    let fileBaseDir = process.cwd();
     if (options.file) {
-      const filePath = resolve(process.cwd(), options.file);
+      const filePath = resolve2(process.cwd(), options.file);
+      fileBaseDir = getFileBaseDir(options.file);
       try {
-        finalArgsJson = readFileSync(filePath, "utf-8").trim();
+        fileContent = readFileSync2(filePath, "utf-8");
       } catch (e) {
         throw new Error(`\u65E0\u6CD5\u8BFB\u53D6\u6587\u4EF6 "${filePath}": ${e.message}`);
       }
-    } else if (args && args.length > 0) {
-      const firstArg = args[0].trim();
-      const cleanedFirstArg = cleanJsonString(firstArg);
-      if (cleanedFirstArg.startsWith("{") && cleanedFirstArg.endsWith("}")) {
-        finalArgsJson = args.map(cleanJsonString).join(" ");
-      } else {
-        const obj = {};
-        for (const pair of args) {
-          const index = pair.indexOf("=");
-          if (index === -1) {
-            throw new Error(`\u65E0\u6548\u7684\u53C2\u6570\u683C\u5F0F "${pair}"\u3002\u5FC5\u987B\u662F JSON \u5B57\u7B26\u4E32\u6216 key=value \u683C\u5F0F\u3002`);
-          }
-          const key = pair.substring(0, index).trim();
-          let val = pair.substring(index + 1).trim();
-          val = cleanJsonString(val);
-          try {
-            obj[key] = JSON.parse(val);
-          } catch {
-            obj[key] = val;
-          }
-        }
-        finalArgsJson = JSON.stringify(obj);
-      }
-    }
-    if (!finalArgsJson) {
-      throw new Error("\u5FC5\u987B\u63D0\u4F9B\u53C2\u6570\u6216\u901A\u8FC7 -f/--file \u6307\u5B9A\u53C2\u6570\u6587\u4EF6");
     }
-    finalArgsJson = expandFileRefs(finalArgsJson);
+    const finalArgsJson = prepareRunArgsJson(args ?? [], fileContent, fileBaseDir);
     const result2 = await runCommand({
       toolName,
       argsJson: finalArgsJson,