@ai-ecoverse/mcpcat 0.23.0 → 0.23.2

package/dist/host/mcpcat.mjs

@@ -12739,6 +12739,7 @@ var DIALOG_ANSWER_MS = 7e3;
 var DIALOG_CLAIM_MS = 1e3;
 var DIALOG_MODES = ["report", "dismiss", "accept"];
 var LABEL2 = "mcpcat serve --webmcp";
+var REFUSED = "playwright-cli refuses to answer it (protected, unverified or in a frame)";
 function parseHoldEvent(line) {
   try {
     const value = JSON.parse(line);
@@ -12786,8 +12787,22 @@ function startDialogHolder(platform2, options) {
   let delay = HOLDER_RESTART_MIN_MS;
   let readyAt;
   let restartTimer;
-  let pending;
-  let settle;
+  let settled = true;
+  let pending = Promise.resolve();
+  let settle = () => {
+  };
+  const unready = () => {
+    isReady = false;
+    waitedOut = false;
+    if (!settled) return;
+    settled = false;
+    pending = new Promise((resolve) => {
+      settle = () => {
+        settled = true;
+        resolve();
+      };
+    });
+  };
   let exited = Promise.resolve();
   const report = reporter(options);
   const send = async (id, dialogId) => {
@@ -12835,15 +12850,11 @@ function startDialogHolder(platform2, options) {
       current = { id: event.dialogId, armed: armed > 0 };
       if (current.armed) answer(current);
     } else if (event.event === "dialog-refused" && isId(event.dialogId)) {
-      current = {
-        id: event.dialogId,
-        armed: armed > 0,
-        problem: "playwright-cli refuses to answer it (protected, unverified or in a frame)"
-      };
+      current = { id: event.dialogId, armed: armed > 0, problem: REFUSED };
     } else if (event.event === "dialog-closed") {
       current = void 0;
     } else if (event.event === "stopped") {
-      isReady = false;
+      unready();
       current = void 0;
     }
   };
@@ -12851,16 +12862,11 @@ function startDialogHolder(platform2, options) {
     const argv = [options.playwrightCli];
     if (options.cdp) argv.push("--cdp", options.cdp);
     argv.push("dialog-hold", "--tab", options.tab);
-    waitedOut = false;
-    pending = new Promise((resolve) => {
-      settle = resolve;
-    });
     let child;
     try {
       child = await platform2.spawn({ argv, dieWithParent: true });
     } catch (err2) {
       report(`cannot start playwright-cli dialog-hold: ${err2.message}`);
-      settle();
       scheduleRestart();
       return;
     }
@@ -12869,7 +12875,6 @@ function startDialogHolder(platform2, options) {
         await child.stdin.getWriter().close();
       } catch {
       }
-      settle();
       return;
     }
     proc = child;
@@ -12882,10 +12887,9 @@ function startDialogHolder(platform2, options) {
     exited = Promise.all([out, err, child.wait()]).then(([, , result]) => {
       proc = void 0;
       writer = void 0;
-      isReady = false;
       current = void 0;
       reply?.resolve("holder-gone");
-      settle();
+      if (!stopped) unready();
       if (readyAt !== void 0 && Date.now() - readyAt >= HOLDER_STABLE_MS) {
         delay = HOLDER_RESTART_MIN_MS;
       }
@@ -12907,6 +12911,7 @@ function startDialogHolder(platform2, options) {
       if (!stopped) void spawn3();
     }, wait);
   };
+  unready();
   void spawn3();
   return {
     async ready() {
@@ -12931,6 +12936,7 @@ function startDialogHolder(platform2, options) {
     },
     async stop() {
       stopped = true;
+      settle();
       clearTimeout(restartTimer);
       const child = proc;
       const w = writer;
@@ -17743,7 +17749,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
 }
 async function run(platform2, version, args2) {
   try {
-    if (UPGRADE_VERBS.has(args2[0])) return await upgrade(platform2, version, args2);
+    const upgrading = upgradeArgs(args2);
+    if (upgrading) return await upgrade(platform2, version, upgrading);
     return await runInner(platform2, version, args2);
   } catch (err) {
     if (err.code === "EACCES") {
@@ -17759,6 +17766,53 @@ function wantsServeHelp(args2) {
   return parseArgs(args2).verb === "serve";
 }
 var UPGRADE_VERBS = /* @__PURE__ */ new Set(["upgrade", "update"]);
+var LEADING_STOPS = /* @__PURE__ */ new Set(["--", "--help", "-h", "--version", "-V"]);
+var GLOBAL_VALUE_FLAGS = /* @__PURE__ */ new Set([
+  "-H",
+  "--header",
+  "-d",
+  "--protocol-version",
+  "--budget",
+  "-e",
+  "-s",
+  "--server",
+  "-m",
+  "--timeout",
+  "--respond",
+  "--root",
+  "-o",
+  "--output",
+  "--memory"
+]);
+var GLOBAL_BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
+  "--schema",
+  "--ts",
+  "--json",
+  "--rank",
+  "-E",
+  "--allow-shell",
+  "-v",
+  "--verbose",
+  "--silent",
+  "--no-input",
+  "--no-validate"
+]);
+function upgradeArgs(args2) {
+  const at = args2.findIndex((arg) => UPGRADE_VERBS.has(arg));
+  if (at < 0) return void 0;
+  const own = [];
+  for (let i = 0; i < at; i++) {
+    const arg = args2[i];
+    if (LEADING_STOPS.has(arg) || !arg.startsWith("-")) return void 0;
+    if (GLOBAL_VALUE_FLAGS.has(arg)) {
+      if (i + 1 === at) return void 0;
+      i++;
+    } else if (!GLOBAL_BOOLEAN_FLAGS.has(arg)) {
+      own.push(arg);
+    }
+  }
+  return [args2[at], ...own, ...args2.slice(at + 1)];
+}
 async function upgrade(platform2, version, args2) {
   const command = args2[0];
   const parsed = parseUpgradeArgs(args2.slice(1));
@@ -18873,5 +18927,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.23.0", args);
+var code = await run(platform, "0.23.2", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -12360,6 +12360,7 @@ var DIALOG_ANSWER_MS = 7e3;
 var DIALOG_CLAIM_MS = 1e3;
 var DIALOG_MODES = ["report", "dismiss", "accept"];
 var LABEL2 = "mcpcat serve --webmcp";
+var REFUSED = "playwright-cli refuses to answer it (protected, unverified or in a frame)";
 function parseHoldEvent(line) {
   try {
     const value = JSON.parse(line);
@@ -12407,8 +12408,22 @@ function startDialogHolder(platform2, options) {
   let delay = HOLDER_RESTART_MIN_MS;
   let readyAt;
   let restartTimer;
-  let pending;
-  let settle;
+  let settled = true;
+  let pending = Promise.resolve();
+  let settle = () => {
+  };
+  const unready = () => {
+    isReady = false;
+    waitedOut = false;
+    if (!settled) return;
+    settled = false;
+    pending = new Promise((resolve2) => {
+      settle = () => {
+        settled = true;
+        resolve2();
+      };
+    });
+  };
   let exited = Promise.resolve();
   const report = reporter(options);
   const send = async (id, dialogId) => {
@@ -12456,15 +12471,11 @@ function startDialogHolder(platform2, options) {
       current = { id: event.dialogId, armed: armed > 0 };
       if (current.armed) answer(current);
     } else if (event.event === "dialog-refused" && isId(event.dialogId)) {
-      current = {
-        id: event.dialogId,
-        armed: armed > 0,
-        problem: "playwright-cli refuses to answer it (protected, unverified or in a frame)"
-      };
+      current = { id: event.dialogId, armed: armed > 0, problem: REFUSED };
     } else if (event.event === "dialog-closed") {
       current = void 0;
     } else if (event.event === "stopped") {
-      isReady = false;
+      unready();
       current = void 0;
     }
   };
@@ -12472,16 +12483,11 @@ function startDialogHolder(platform2, options) {
     const argv = [options.playwrightCli];
     if (options.cdp) argv.push("--cdp", options.cdp);
     argv.push("dialog-hold", "--tab", options.tab);
-    waitedOut = false;
-    pending = new Promise((resolve2) => {
-      settle = resolve2;
-    });
     let child;
     try {
       child = await platform2.spawn({ argv, dieWithParent: true });
     } catch (err2) {
       report(`cannot start playwright-cli dialog-hold: ${err2.message}`);
-      settle();
       scheduleRestart();
       return;
     }
@@ -12490,7 +12496,6 @@ function startDialogHolder(platform2, options) {
         await child.stdin.getWriter().close();
       } catch {
       }
-      settle();
       return;
     }
     proc = child;
@@ -12503,10 +12508,9 @@ function startDialogHolder(platform2, options) {
     exited = Promise.all([out, err, child.wait()]).then(([, , result]) => {
       proc = void 0;
       writer = void 0;
-      isReady = false;
       current = void 0;
       reply?.resolve("holder-gone");
-      settle();
+      if (!stopped) unready();
       if (readyAt !== void 0 && Date.now() - readyAt >= HOLDER_STABLE_MS) {
         delay = HOLDER_RESTART_MIN_MS;
       }
@@ -12528,6 +12532,7 @@ function startDialogHolder(platform2, options) {
       if (!stopped) void spawn2();
     }, wait);
   };
+  unready();
   void spawn2();
   return {
     async ready() {
@@ -12552,6 +12557,7 @@ function startDialogHolder(platform2, options) {
     },
     async stop() {
       stopped = true;
+      settle();
       clearTimeout(restartTimer);
       const child = proc;
       const w = writer;
@@ -17260,7 +17266,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
 }
 async function run(platform2, version, args) {
   try {
-    if (UPGRADE_VERBS.has(args[0])) return await upgrade(platform2, version, args);
+    const upgrading = upgradeArgs(args);
+    if (upgrading) return await upgrade(platform2, version, upgrading);
     return await runInner(platform2, version, args);
   } catch (err) {
     if (err.code === "EACCES") {
@@ -17276,6 +17283,53 @@ function wantsServeHelp(args) {
   return parseArgs(args).verb === "serve";
 }
 var UPGRADE_VERBS = /* @__PURE__ */ new Set(["upgrade", "update"]);
+var LEADING_STOPS = /* @__PURE__ */ new Set(["--", "--help", "-h", "--version", "-V"]);
+var GLOBAL_VALUE_FLAGS = /* @__PURE__ */ new Set([
+  "-H",
+  "--header",
+  "-d",
+  "--protocol-version",
+  "--budget",
+  "-e",
+  "-s",
+  "--server",
+  "-m",
+  "--timeout",
+  "--respond",
+  "--root",
+  "-o",
+  "--output",
+  "--memory"
+]);
+var GLOBAL_BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
+  "--schema",
+  "--ts",
+  "--json",
+  "--rank",
+  "-E",
+  "--allow-shell",
+  "-v",
+  "--verbose",
+  "--silent",
+  "--no-input",
+  "--no-validate"
+]);
+function upgradeArgs(args) {
+  const at = args.findIndex((arg) => UPGRADE_VERBS.has(arg));
+  if (at < 0) return void 0;
+  const own = [];
+  for (let i = 0; i < at; i++) {
+    const arg = args[i];
+    if (LEADING_STOPS.has(arg) || !arg.startsWith("-")) return void 0;
+    if (GLOBAL_VALUE_FLAGS.has(arg)) {
+      if (i + 1 === at) return void 0;
+      i++;
+    } else if (!GLOBAL_BOOLEAN_FLAGS.has(arg)) {
+      own.push(arg);
+    }
+  }
+  return [args[at], ...own, ...args.slice(at + 1)];
+}
 async function upgrade(platform2, version, args) {
   const command = args[0];
   const parsed = parseUpgradeArgs(args.slice(1));
@@ -18100,7 +18154,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.23.0", args);
+  return run(platform2, "0.23.2", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -58,7 +58,7 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-kernel": "1.151.1",
+    "@ai-ecoverse/slicc-kernel": "1.152.1",
     "@ai-ecoverse/slicc-shared-web": "2.11.3",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.3.0",