@ai-ecoverse/mcpcat 0.23.1 → 0.23.3

package/dist/host/mcpcat.mjs

@@ -12737,6 +12737,7 @@ function startHolder(platform2, options) {
 var DIALOG_HOLD_MIN_VERSION = "1.39.0";
 var DIALOG_ANSWER_MS = 7e3;
 var DIALOG_CLAIM_MS = 1e3;
+var DIALOG_FAIL_FAST = 2;
 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)";
@@ -12770,6 +12771,26 @@ function reporter(options) {
 function answerProblem(event, answerMs) {
   return event === "timeout" ? `playwright-cli dialog-hold did not answer within ${Math.round(answerMs / 1e3)}s` : `playwright-cli dialog-hold replied ${event}`;
 }
+function latch() {
+  let shut = false;
+  let wait = Promise.resolve();
+  let release = () => {
+  };
+  return {
+    close() {
+      if (shut) return;
+      shut = true;
+      wait = new Promise((resolve) => {
+        release = () => {
+          shut = false;
+          resolve();
+        };
+      });
+    },
+    open: () => release(),
+    wait: () => wait
+  };
+}
 var isId = (value) => Number.isSafeInteger(value) && Number(value) >= 0;
 function startDialogHolder(platform2, options) {
   const verb = options.accept ? "dialog-accept" : "dialog-dismiss";
@@ -12779,6 +12800,8 @@ function startDialogHolder(platform2, options) {
   let stopped = false;
   let isReady = false;
   let waitedOut = false;
+  let failing = false;
+  let failures = 0;
   let armed = 0;
   let current;
   let nextId2 = 1;
@@ -12787,21 +12810,11 @@ function startDialogHolder(platform2, options) {
   let delay = HOLDER_RESTART_MIN_MS;
   let readyAt;
   let restartTimer;
-  let settled = true;
-  let pending = Promise.resolve();
-  let settle = () => {
-  };
+  const gate = latch();
   const unready = () => {
     isReady = false;
     waitedOut = false;
-    if (!settled) return;
-    settled = false;
-    pending = new Promise((resolve) => {
-      settle = () => {
-        settled = true;
-        resolve();
-      };
-    });
+    gate.close();
   };
   let exited = Promise.resolve();
   const report = reporter(options);
@@ -12844,8 +12857,9 @@ function startDialogHolder(platform2, options) {
     }
     if (event.event === "ready") {
       isReady = true;
+      failing = false;
       readyAt = Date.now();
-      settle();
+      gate.open();
     } else if (event.event === "dialog-opened" && isId(event.dialogId)) {
       current = { id: event.dialogId, armed: armed > 0 };
       if (current.armed) answer(current);
@@ -12867,7 +12881,7 @@ function startDialogHolder(platform2, options) {
       child = await platform2.spawn({ argv, dieWithParent: true });
     } catch (err2) {
       report(`cannot start playwright-cli dialog-hold: ${err2.message}`);
-      scheduleRestart();
+      scheduleRestart(false);
       return;
     }
     if (stopped) {
@@ -12890,22 +12904,24 @@ function startDialogHolder(platform2, options) {
       current = void 0;
       reply?.resolve("holder-gone");
       if (!stopped) unready();
-      if (readyAt !== void 0 && Date.now() - readyAt >= HOLDER_STABLE_MS) {
-        delay = HOLDER_RESTART_MIN_MS;
-      }
+      const reached = readyAt !== void 0;
+      if (reached && Date.now() - readyAt >= HOLDER_STABLE_MS) delay = HOLDER_RESTART_MIN_MS;
       readyAt = void 0;
       if (stopped) return;
       const why = lastError ?? `exited ${result.status}`;
       report(
         `the dialog holder for tab ${options.tab} stopped (playwright-cli dialog-hold: ${why}); restarting in ${Math.ceil(delay / 1e3)}s`
       );
-      scheduleRestart();
+      scheduleRestart(reached);
     });
   };
-  const scheduleRestart = () => {
+  const scheduleRestart = (reached) => {
     if (stopped) return;
     const wait = delay;
     delay = Math.min(delay * 2, HOLDER_RESTART_MAX_MS);
+    failures = reached ? 0 : failures + 1;
+    failing = failures >= DIALOG_FAIL_FAST || wait >= options.readyTimeoutMs;
+    if (failing) gate.open();
     restartTimer = setTimeout(() => {
       restartTimer = void 0;
       if (!stopped) void spawn3();
@@ -12915,8 +12931,8 @@ function startDialogHolder(platform2, options) {
   void spawn3();
   return {
     async ready() {
-      if (waitedOut || isReady) return;
-      if (!await within(pending, options.readyTimeoutMs)) waitedOut = true;
+      if (failing || waitedOut || isReady) return;
+      if (!await within(gate.wait(), options.readyTimeoutMs)) waitedOut = true;
     },
     attached: () => isReady,
     open: () => current !== void 0,
@@ -12936,7 +12952,7 @@ function startDialogHolder(platform2, options) {
     },
     async stop() {
       stopped = true;
-      settle();
+      gate.open();
       clearTimeout(restartTimer);
       const child = proc;
       const w = writer;
@@ -17749,7 +17765,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") {
@@ -17765,6 +17782,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));
@@ -18879,5 +18943,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.23.1", args);
+var code = await run(platform, "0.23.3", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -12358,6 +12358,7 @@ function startHolder(platform2, options) {
 var DIALOG_HOLD_MIN_VERSION = "1.39.0";
 var DIALOG_ANSWER_MS = 7e3;
 var DIALOG_CLAIM_MS = 1e3;
+var DIALOG_FAIL_FAST = 2;
 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)";
@@ -12391,6 +12392,26 @@ function reporter(options) {
 function answerProblem(event, answerMs) {
   return event === "timeout" ? `playwright-cli dialog-hold did not answer within ${Math.round(answerMs / 1e3)}s` : `playwright-cli dialog-hold replied ${event}`;
 }
+function latch() {
+  let shut = false;
+  let wait = Promise.resolve();
+  let release = () => {
+  };
+  return {
+    close() {
+      if (shut) return;
+      shut = true;
+      wait = new Promise((resolve2) => {
+        release = () => {
+          shut = false;
+          resolve2();
+        };
+      });
+    },
+    open: () => release(),
+    wait: () => wait
+  };
+}
 var isId = (value) => Number.isSafeInteger(value) && Number(value) >= 0;
 function startDialogHolder(platform2, options) {
   const verb = options.accept ? "dialog-accept" : "dialog-dismiss";
@@ -12400,6 +12421,8 @@ function startDialogHolder(platform2, options) {
   let stopped = false;
   let isReady = false;
   let waitedOut = false;
+  let failing = false;
+  let failures = 0;
   let armed = 0;
   let current;
   let nextId2 = 1;
@@ -12408,21 +12431,11 @@ function startDialogHolder(platform2, options) {
   let delay = HOLDER_RESTART_MIN_MS;
   let readyAt;
   let restartTimer;
-  let settled = true;
-  let pending = Promise.resolve();
-  let settle = () => {
-  };
+  const gate = latch();
   const unready = () => {
     isReady = false;
     waitedOut = false;
-    if (!settled) return;
-    settled = false;
-    pending = new Promise((resolve2) => {
-      settle = () => {
-        settled = true;
-        resolve2();
-      };
-    });
+    gate.close();
   };
   let exited = Promise.resolve();
   const report = reporter(options);
@@ -12465,8 +12478,9 @@ function startDialogHolder(platform2, options) {
     }
     if (event.event === "ready") {
       isReady = true;
+      failing = false;
       readyAt = Date.now();
-      settle();
+      gate.open();
     } else if (event.event === "dialog-opened" && isId(event.dialogId)) {
       current = { id: event.dialogId, armed: armed > 0 };
       if (current.armed) answer(current);
@@ -12488,7 +12502,7 @@ function startDialogHolder(platform2, options) {
       child = await platform2.spawn({ argv, dieWithParent: true });
     } catch (err2) {
       report(`cannot start playwright-cli dialog-hold: ${err2.message}`);
-      scheduleRestart();
+      scheduleRestart(false);
       return;
     }
     if (stopped) {
@@ -12511,22 +12525,24 @@ function startDialogHolder(platform2, options) {
       current = void 0;
       reply?.resolve("holder-gone");
       if (!stopped) unready();
-      if (readyAt !== void 0 && Date.now() - readyAt >= HOLDER_STABLE_MS) {
-        delay = HOLDER_RESTART_MIN_MS;
-      }
+      const reached = readyAt !== void 0;
+      if (reached && Date.now() - readyAt >= HOLDER_STABLE_MS) delay = HOLDER_RESTART_MIN_MS;
       readyAt = void 0;
       if (stopped) return;
       const why = lastError ?? `exited ${result.status}`;
       report(
         `the dialog holder for tab ${options.tab} stopped (playwright-cli dialog-hold: ${why}); restarting in ${Math.ceil(delay / 1e3)}s`
       );
-      scheduleRestart();
+      scheduleRestart(reached);
     });
   };
-  const scheduleRestart = () => {
+  const scheduleRestart = (reached) => {
     if (stopped) return;
     const wait = delay;
     delay = Math.min(delay * 2, HOLDER_RESTART_MAX_MS);
+    failures = reached ? 0 : failures + 1;
+    failing = failures >= DIALOG_FAIL_FAST || wait >= options.readyTimeoutMs;
+    if (failing) gate.open();
     restartTimer = setTimeout(() => {
       restartTimer = void 0;
       if (!stopped) void spawn2();
@@ -12536,8 +12552,8 @@ function startDialogHolder(platform2, options) {
   void spawn2();
   return {
     async ready() {
-      if (waitedOut || isReady) return;
-      if (!await within(pending, options.readyTimeoutMs)) waitedOut = true;
+      if (failing || waitedOut || isReady) return;
+      if (!await within(gate.wait(), options.readyTimeoutMs)) waitedOut = true;
     },
     attached: () => isReady,
     open: () => current !== void 0,
@@ -12557,7 +12573,7 @@ function startDialogHolder(platform2, options) {
     },
     async stop() {
       stopped = true;
-      settle();
+      gate.open();
       clearTimeout(restartTimer);
       const child = proc;
       const w = writer;
@@ -17266,7 +17282,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") {
@@ -17282,6 +17299,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));
@@ -18106,7 +18170,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.23.1", args);
+  return run(platform2, "0.23.3", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "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",