@ai-ecoverse/mcpcat 0.15.2 → 0.15.4

package/dist/host/mcpcat.mjs

@@ -6477,7 +6477,26 @@ var McpOAuthProvider = class {
 // src/auth/jerk-token-source.ts
 var MIN_VERSION = [0, 14, 1];
 var VERSION_TIMEOUT_MS = 2e3;
+var JERK_TIMEOUT_MS = 15e3;
 var cachedAvailable;
+var cachedKnown;
+async function listMcpProviders(platform2) {
+  const known = /* @__PURE__ */ new Set();
+  try {
+    const result = await runJerk(platform2, ["jerk", "list", "--json"], VERSION_TIMEOUT_MS);
+    if (result.status !== 0) return known;
+    const providers = JSON.parse(result.stdout);
+    for (const p of providers) {
+      if (p?.source === "mcp.json" && typeof p.provider === "string") known.add(p.provider);
+    }
+  } catch {
+  }
+  return known;
+}
+async function jerkKnows(platform2, id) {
+  cachedKnown ??= listMcpProviders(platform2);
+  return (await cachedKnown).has(id);
+}
 function parseVersion(raw) {
   const match = raw.trim().match(/(\d+)\.(\d+)\.(\d+)/);
   if (!match) return void 0;
@@ -6523,23 +6542,39 @@ async function jerkAvailable(platform2) {
     return false;
   }
   try {
-    const proc = await platform2.spawn({ argv: ["jerk", "--version"] });
-    const timeout = new Promise((_, reject) => {
-      setTimeout(() => reject(new Error("timeout")), VERSION_TIMEOUT_MS);
-    });
-    const work = Promise.all([readAll(proc.stdout), proc.wait()]).then(([out, result]) => {
-      proc.stderr.cancel().catch(() => {
-      });
-      if (result.status !== 0) return false;
-      const ver = parseVersion(out);
-      return ver !== void 0 && versionSatisfied(ver);
-    });
-    cachedAvailable = await Promise.race([work, timeout]);
+    const result = await runJerk(platform2, ["jerk", "--version"], VERSION_TIMEOUT_MS);
+    const ver = result.status === 0 ? parseVersion(result.stdout) : void 0;
+    cachedAvailable = ver !== void 0 && versionSatisfied(ver);
   } catch {
     cachedAvailable = false;
   }
   return cachedAvailable;
 }
+var JerkTimeoutError = class extends Error {
+  command;
+  constructor(argv) {
+    const command = argv.slice(0, 3).join(" ");
+    super(`jerk did not answer; run \`${command}\` yourself`);
+    this.name = "JerkTimeoutError";
+    this.command = command;
+  }
+};
+async function runJerk(platform2, argv, timeoutMs) {
+  const proc = await platform2.spawn({ argv, stdin: "ignore" });
+  let timer;
+  const expired = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), timeoutMs);
+  });
+  const work = Promise.all([readAll(proc.stdout), readAll(proc.stderr), proc.wait()]);
+  const outcome = await Promise.race([work, expired]);
+  clearTimeout(timer);
+  if (outcome === "timeout") {
+    await proc.kill("SIGKILL");
+    throw new JerkTimeoutError(argv);
+  }
+  const [stdout, stderr, result] = outcome;
+  return { status: result.status, stdout, stderr };
+}
 function jerkId(name) {
   if (name.startsWith("mcp:")) return name;
   if (name.startsWith("url:")) return `mcp:${name}`;
@@ -6560,8 +6595,10 @@ var JerkSignInRequiredError = class extends Error {
 };
 var JerkTokenSource = class {
   platform;
-  constructor(platform2) {
+  timeoutMs;
+  constructor(platform2, timeoutMs = JERK_TIMEOUT_MS) {
     this.platform = platform2;
+    this.timeoutMs = timeoutMs;
   }
   async getToken(name, serverUrl, scope) {
     const id = jerkId(name);
@@ -6569,12 +6606,7 @@ var JerkTokenSource = class {
     if (scope) {
       argv.push("--scope", scope);
     }
-    const proc = await this.platform.spawn({ argv });
-    const [outRaw, , result] = await Promise.all([
-      readAll(proc.stdout),
-      readAll(proc.stderr),
-      proc.wait()
-    ]);
+    const result = await runJerk(this.platform, argv, this.timeoutMs);
     if (result.status === JERK_EXIT_SIGN_IN) {
       throw new JerkSignInRequiredError(id, scope);
     }
@@ -6584,7 +6616,7 @@ var JerkTokenSource = class {
     if (result.status !== 0) {
       return void 0;
     }
-    const parsed = JSON.parse(outRaw.trim());
+    const parsed = JSON.parse(result.stdout.trim());
     if (!parsed.token) return void 0;
     return {
       accessToken: parsed.token,
@@ -8571,7 +8603,7 @@ async function createStatelessConnection(options) {
         token
       });
     } catch (authErr) {
-      if (authErr instanceof AuthStepUpError) throw authErr;
+      if (authErr instanceof AuthStepUpError || authErr instanceof JerkTimeoutError) throw authErr;
       throw new McpAuthError(err.response.status, url);
     }
   }
@@ -11498,15 +11530,15 @@ function readMcpCommand(value) {
 }
 function readMcpPositionals(value) {
   if (!Array.isArray(value)) return [];
-  const positionals = [];
+  const positionals2 = [];
   for (const entry of value) {
     if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
     const name = ownString(entry, "name");
     if (!name) continue;
     const required = Object.getOwnPropertyDescriptor(entry, "required")?.value;
-    positionals.push({ name, required: required !== false, description: "" });
+    positionals2.push({ name, required: required !== false, description: "" });
   }
-  return positionals;
+  return positionals2;
 }
 function readMcpFlags(value) {
   if (!Array.isArray(value)) return [];
@@ -12940,7 +12972,14 @@ async function runServe(platform2, options, version) {
     generatedBearer
   );
 }
-async function publishBearer(platform2, token, port, listenUrl, json) {
+function serveAddress(platform2, host, port) {
+  if (platform2.kind !== "kernel") return { url: `http://${host}:${port}/mcp` };
+  return {
+    url: `http://${port}.kernel.localhost/mcp`,
+    loopbackUrl: `http://127.0.0.1:${port}/mcp`
+  };
+}
+async function publishBearer(platform2, token, port, address, json) {
   if (!json && platform2.isatty(2)) {
     await platform2.write(2, `mcpcat serve: bearer ${token}
 `);
@@ -12957,7 +12996,7 @@ async function publishBearer(platform2, token, port, listenUrl, json) {
   await platform2.write(2, `mcpcat serve: bearer saved to ${tokenPath}
 `);
   if (json) {
-    await platform2.write(1, `${JSON.stringify({ url: listenUrl, bearerFile: tokenPath })}
+    await platform2.write(1, `${JSON.stringify({ ...address, bearerFile: tokenPath })}
 `);
   }
   return tokenPath;
@@ -13136,19 +13175,20 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -13331,19 +13371,20 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -13507,19 +13548,20 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -13846,16 +13888,20 @@ async function signIn(options) {
 }
 
 // src/cli/auth-verbs.ts
-var resolvedSource;
-async function createTokenSource(platform2) {
-  if (isKernel(platform2)) return new PiFileTokenSource(platform2);
-  if (resolvedSource) return resolvedSource;
-  if (await jerkAvailable(platform2)) {
-    resolvedSource = new JerkTokenSource(platform2);
-  } else {
-    resolvedSource = new PiFileTokenSource(platform2);
+async function createTokenSource(platform2, name, timeoutMs = JERK_TIMEOUT_MS) {
+  if (!isKernel(platform2) && !name.startsWith("url:") && await jerkAvailable(platform2) && await jerkKnows(platform2, jerkMcpId(name))) {
+    return new JerkTokenSource(platform2, timeoutMs);
   }
-  return resolvedSource;
+  return new PiFileTokenSource(platform2);
+}
+var VALUE_FLAGS = /* @__PURE__ */ new Set(["--scope", "-m", "--timeout"]);
+function positionals(args2) {
+  const out = [];
+  for (let i = 0; i < args2.length; i++) {
+    if (VALUE_FLAGS.has(args2[i])) i++;
+    else if (!args2[i].startsWith("-")) out.push(args2[i]);
+  }
+  return out;
 }
 function resolveServerName(target) {
   try {
@@ -13907,8 +13953,7 @@ async function readStream2(stream) {
   }
   return new TextDecoder().decode(buf);
 }
-async function jerkLogin(platform2, target, args2) {
-  const resolved = await resolveLoginTarget(platform2, target);
+async function jerkLogin(platform2, target, resolved, args2) {
   const id = jerkMcpId(resolved.name);
   const argv = ["jerk", id, "create"];
   const scopeIdx = args2.indexOf("--scope");
@@ -13937,18 +13982,9 @@ async function jerkLogin(platform2, target, args2) {
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
 }
-async function jerkLogout(platform2, target) {
-  const resolved = await resolveLoginTarget(platform2, target);
+async function jerkLogout(platform2, target, resolved, source) {
   const id = jerkMcpId(resolved.name);
-  const argv = ["jerk", id, "drop", "--yes"];
-  const proc = await platform2.spawn({ argv });
-  proc.stdin.close().catch(() => {
-  });
-  const [, , result] = await Promise.all([
-    readStream2(proc.stdout),
-    readStream2(proc.stderr),
-    proc.wait()
-  ]);
+  const result = await runJerk(platform2, ["jerk", id, "drop", "--yes"], source.timeoutMs);
   if (result.status === 0) {
     await platform2.write(1, `Signed out of ${target}
 `);
@@ -13958,7 +13994,7 @@ async function jerkLogout(platform2, target) {
   }
   return 0;
 }
-async function runLogin(platform2, args2, source) {
+async function runLogin(platform2, args2, timeoutMs) {
   if (isKernel(platform2)) {
     await platform2.write(
       2,
@@ -13966,15 +14002,24 @@ async function runLogin(platform2, args2, source) {
     );
     return 4;
   }
-  const positional = args2.filter((a) => !a.startsWith("-"));
+  const positional = positionals(args2);
   if (positional.length === 0) {
     await platform2.write(2, "mcpcat: login requires a target\n");
     return 2;
   }
   const target = positional[0];
+  let resolved;
+  try {
+    resolved = await resolveLoginTarget(platform2, target);
+  } catch (err) {
+    await platform2.write(2, `mcpcat: ${err.message}
+`);
+    return 2;
+  }
+  const source = await createTokenSource(platform2, resolved.name, timeoutMs);
   if (source instanceof JerkTokenSource) {
     try {
-      return await jerkLogin(platform2, target, args2);
+      return await jerkLogin(platform2, target, resolved, args2);
     } catch (err) {
       await platform2.write(2, `mcpcat: login failed: ${err.message}
 `);
@@ -13982,14 +14027,6 @@ async function runLogin(platform2, args2, source) {
     }
   }
   const noBrowser = args2.includes("--no-browser");
-  let resolved;
-  try {
-    resolved = await resolveLoginTarget(platform2, target);
-  } catch (err) {
-    await platform2.write(2, `mcpcat: ${err.message}
-`);
-    return 2;
-  }
   try {
     await signIn({
       name: resolved.name,
@@ -14052,26 +14089,17 @@ ${url.href}
     return 4;
   }
 }
-async function runLogout(platform2, args2, source) {
+async function runLogout(platform2, args2, timeoutMs) {
   if (isKernel(platform2)) {
     await platform2.write(2, "mcpcat: logout is not available in seven.\n");
     return 4;
   }
-  const positional = args2.filter((a) => !a.startsWith("-"));
+  const positional = positionals(args2);
   if (positional.length === 0) {
     await platform2.write(2, "mcpcat: logout requires a target\n");
     return 2;
   }
   const target = positional[0];
-  if (source instanceof JerkTokenSource) {
-    try {
-      return await jerkLogout(platform2, target);
-    } catch (err) {
-      await platform2.write(2, `mcpcat: logout failed: ${err.message}
-`);
-      return 1;
-    }
-  }
   let resolved;
   try {
     resolved = await resolveLoginTarget(platform2, target);
@@ -14080,6 +14108,21 @@ async function runLogout(platform2, args2, source) {
 `);
     return 2;
   }
+  const source = await createTokenSource(platform2, resolved.name, timeoutMs);
+  if (source instanceof JerkTokenSource) {
+    try {
+      return await jerkLogout(platform2, target, resolved, source);
+    } catch (err) {
+      if (err instanceof JerkTimeoutError) {
+        await platform2.write(2, `mcpcat: ${err.message}
+`);
+        return 4;
+      }
+      await platform2.write(2, `mcpcat: logout failed: ${err.message}
+`);
+      return 1;
+    }
+  }
   const removed = await source.remove(resolved.name, resolved.serverUrl);
   if (removed) {
     await platform2.write(1, `Signed out of ${target}
@@ -15225,6 +15268,10 @@ var VERBS_WITH_TARGET = /* @__PURE__ */ new Set([
   "prompts",
   "prompt"
 ]);
+function withoutVerb(args2, verb) {
+  const at = args2.indexOf(verb);
+  return [...args2.slice(0, at), ...args2.slice(at + 1)];
+}
 function resolveMaxPositional(positional) {
   if (positional.length === 0) return 3;
   const first = positional[0];
@@ -16052,12 +16099,10 @@ async function runInner(platform2, version, args2) {
   const discResult = await dispatchDiscoveryVerb(platform2, parsed, args2);
   if (discResult !== void 0) return discResult;
   if (parsed.verb === "login") {
-    const source = await createTokenSource(platform2);
-    return runLogin(platform2, args2.slice(1), source);
+    return runLogin(platform2, withoutVerb(args2, "login"), parsed.timeoutMs);
   }
   if (parsed.verb === "logout") {
-    const source = await createTokenSource(platform2);
-    return runLogout(platform2, args2.slice(1), source);
+    return runLogout(platform2, withoutVerb(args2, "logout"), parsed.timeoutMs);
   }
   if (UNIMPLEMENTED_VERBS.has(parsed.verb)) {
     await platform2.write(2, `mcpcat: '${parsed.verb}' is not implemented yet
@@ -16124,7 +16169,7 @@ function classifyError(err) {
   if (err instanceof McpAuthError) {
     return { code: EXIT_AUTH, kind: "auth", msg: err.message };
   }
-  if (err instanceof JerkSignInRequiredError) {
+  if (err instanceof JerkSignInRequiredError || err instanceof JerkTimeoutError) {
     return { code: EXIT_AUTH, kind: "auth", msg: err.message };
   }
   if (err instanceof AuthStepUpError) {
@@ -16148,12 +16193,12 @@ function classifyError(err) {
   }
   return { code: EXIT_RPC_ERROR, kind: "rpc_error", msg };
 }
-async function resolveAuthProvider(platform2, hasAuthHeader, url, target, config, onCredentialObtained) {
+async function resolveAuthProvider(platform2, hasAuthHeader, url, target, config, timeoutMs, onCredentialObtained) {
   if (hasAuthHeader || !url) return void 0;
-  const source = await createTokenSource(platform2);
   const entry = config.entry(target);
   const oauth = entry && "url" in entry.config ? entry.config.oauth : void 0;
   const name = entry ? target : `url:${new URL(url).origin}${new URL(url).pathname}`;
+  const source = await createTokenSource(platform2, name, timeoutMs);
   const provider = createMcpAuthProvider({
     name,
     serverUrl: url,
@@ -16182,7 +16227,7 @@ function classifyConnectionError(err, target, interrupted) {
       msg: `${err.reason} (${hint})`
     };
   }
-  if (err instanceof McpAuthError || err instanceof AuthStepUpError || err instanceof JerkSignInRequiredError) {
+  if (err instanceof McpAuthError || err instanceof AuthStepUpError || err instanceof JerkSignInRequiredError || err instanceof JerkTimeoutError) {
     return classifyError(err);
   }
   if (err.name === "McpOAuthAuthorizationRequiredError" || err.name === "McpAuthRequiredError") {
@@ -16330,6 +16375,7 @@ async function runClientVerb(platform2, version, parsed) {
     resolved.url,
     target,
     config,
+    timeoutMs,
     (secret) => {
       allSecrets.add(secret);
       verbose.secrets.add(secret);
@@ -16466,10 +16512,11 @@ var USE_PROCESS_GROUPS2 = process.platform !== "win32";
 function nodeSpawn(options) {
   return new Promise((resolve, reject) => {
     let rejected = false;
+    const ignoreStdin = options.stdin === "ignore";
     const child = cpSpawn(options.argv[0], options.argv.slice(1), {
       env: options.env ?? process.env,
       cwd: options.cwd,
-      stdio: ["pipe", "pipe", "pipe"],
+      stdio: [ignoreStdin ? "ignore" : "pipe", "pipe", "pipe"],
       detached: USE_PROCESS_GROUPS2
     });
     child.on("error", (err) => {
@@ -16480,7 +16527,7 @@ function nodeSpawn(options) {
     });
     const stdout = Readable.toWeb(child.stdout);
     const stderr = Readable.toWeb(child.stderr);
-    const stdin = Writable.toWeb(child.stdin);
+    const stdin = ignoreStdin ? new WritableStream() : Writable.toWeb(child.stdin);
     const closePromise = new Promise((res) => {
       child.on("close", (code2, signal) => {
         res({
@@ -16687,5 +16734,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.15.2", args);
+var code = await run(platform, "0.15.4", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -6098,7 +6098,26 @@ var McpOAuthProvider = class {
 // src/auth/jerk-token-source.ts
 var MIN_VERSION = [0, 14, 1];
 var VERSION_TIMEOUT_MS = 2e3;
+var JERK_TIMEOUT_MS = 15e3;
 var cachedAvailable;
+var cachedKnown;
+async function listMcpProviders(platform2) {
+  const known = /* @__PURE__ */ new Set();
+  try {
+    const result = await runJerk(platform2, ["jerk", "list", "--json"], VERSION_TIMEOUT_MS);
+    if (result.status !== 0) return known;
+    const providers = JSON.parse(result.stdout);
+    for (const p of providers) {
+      if (p?.source === "mcp.json" && typeof p.provider === "string") known.add(p.provider);
+    }
+  } catch {
+  }
+  return known;
+}
+async function jerkKnows(platform2, id) {
+  cachedKnown ??= listMcpProviders(platform2);
+  return (await cachedKnown).has(id);
+}
 function parseVersion(raw) {
   const match = raw.trim().match(/(\d+)\.(\d+)\.(\d+)/);
   if (!match) return void 0;
@@ -6144,23 +6163,39 @@ async function jerkAvailable(platform2) {
     return false;
   }
   try {
-    const proc = await platform2.spawn({ argv: ["jerk", "--version"] });
-    const timeout = new Promise((_, reject) => {
-      setTimeout(() => reject(new Error("timeout")), VERSION_TIMEOUT_MS);
-    });
-    const work = Promise.all([readAll(proc.stdout), proc.wait()]).then(([out, result]) => {
-      proc.stderr.cancel().catch(() => {
-      });
-      if (result.status !== 0) return false;
-      const ver = parseVersion(out);
-      return ver !== void 0 && versionSatisfied(ver);
-    });
-    cachedAvailable = await Promise.race([work, timeout]);
+    const result = await runJerk(platform2, ["jerk", "--version"], VERSION_TIMEOUT_MS);
+    const ver = result.status === 0 ? parseVersion(result.stdout) : void 0;
+    cachedAvailable = ver !== void 0 && versionSatisfied(ver);
   } catch {
     cachedAvailable = false;
   }
   return cachedAvailable;
 }
+var JerkTimeoutError = class extends Error {
+  command;
+  constructor(argv) {
+    const command = argv.slice(0, 3).join(" ");
+    super(`jerk did not answer; run \`${command}\` yourself`);
+    this.name = "JerkTimeoutError";
+    this.command = command;
+  }
+};
+async function runJerk(platform2, argv, timeoutMs) {
+  const proc = await platform2.spawn({ argv, stdin: "ignore" });
+  let timer;
+  const expired = new Promise((resolve2) => {
+    timer = setTimeout(() => resolve2("timeout"), timeoutMs);
+  });
+  const work = Promise.all([readAll(proc.stdout), readAll(proc.stderr), proc.wait()]);
+  const outcome = await Promise.race([work, expired]);
+  clearTimeout(timer);
+  if (outcome === "timeout") {
+    await proc.kill("SIGKILL");
+    throw new JerkTimeoutError(argv);
+  }
+  const [stdout, stderr, result] = outcome;
+  return { status: result.status, stdout, stderr };
+}
 function jerkId(name) {
   if (name.startsWith("mcp:")) return name;
   if (name.startsWith("url:")) return `mcp:${name}`;
@@ -6181,8 +6216,10 @@ var JerkSignInRequiredError = class extends Error {
 };
 var JerkTokenSource = class {
   platform;
-  constructor(platform2) {
+  timeoutMs;
+  constructor(platform2, timeoutMs = JERK_TIMEOUT_MS) {
     this.platform = platform2;
+    this.timeoutMs = timeoutMs;
   }
   async getToken(name, serverUrl, scope) {
     const id = jerkId(name);
@@ -6190,12 +6227,7 @@ var JerkTokenSource = class {
     if (scope) {
       argv.push("--scope", scope);
     }
-    const proc = await this.platform.spawn({ argv });
-    const [outRaw, , result] = await Promise.all([
-      readAll(proc.stdout),
-      readAll(proc.stderr),
-      proc.wait()
-    ]);
+    const result = await runJerk(this.platform, argv, this.timeoutMs);
     if (result.status === JERK_EXIT_SIGN_IN) {
       throw new JerkSignInRequiredError(id, scope);
     }
@@ -6205,7 +6237,7 @@ var JerkTokenSource = class {
     if (result.status !== 0) {
       return void 0;
     }
-    const parsed = JSON.parse(outRaw.trim());
+    const parsed = JSON.parse(result.stdout.trim());
     if (!parsed.token) return void 0;
     return {
       accessToken: parsed.token,
@@ -8192,7 +8224,7 @@ async function createStatelessConnection(options) {
         token
       });
     } catch (authErr) {
-      if (authErr instanceof AuthStepUpError) throw authErr;
+      if (authErr instanceof AuthStepUpError || authErr instanceof JerkTimeoutError) throw authErr;
       throw new McpAuthError(err.response.status, url);
     }
   }
@@ -11119,15 +11151,15 @@ function readMcpCommand(value) {
 }
 function readMcpPositionals(value) {
   if (!Array.isArray(value)) return [];
-  const positionals = [];
+  const positionals2 = [];
   for (const entry of value) {
     if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
     const name = ownString(entry, "name");
     if (!name) continue;
     const required = Object.getOwnPropertyDescriptor(entry, "required")?.value;
-    positionals.push({ name, required: required !== false, description: "" });
+    positionals2.push({ name, required: required !== false, description: "" });
   }
-  return positionals;
+  return positionals2;
 }
 function readMcpFlags(value) {
   if (!Array.isArray(value)) return [];
@@ -12561,7 +12593,14 @@ async function runServe(platform2, options, version) {
     generatedBearer
   );
 }
-async function publishBearer(platform2, token, port, listenUrl, json) {
+function serveAddress(platform2, host, port) {
+  if (platform2.kind !== "kernel") return { url: `http://${host}:${port}/mcp` };
+  return {
+    url: `http://${port}.kernel.localhost/mcp`,
+    loopbackUrl: `http://127.0.0.1:${port}/mcp`
+  };
+}
+async function publishBearer(platform2, token, port, address, json) {
   if (!json && platform2.isatty(2)) {
     await platform2.write(2, `mcpcat serve: bearer ${token}
 `);
@@ -12578,7 +12617,7 @@ async function publishBearer(platform2, token, port, listenUrl, json) {
   await platform2.write(2, `mcpcat serve: bearer saved to ${tokenPath}
 `);
   if (json) {
-    await platform2.write(1, `${JSON.stringify({ url: listenUrl, bearerFile: tokenPath })}
+    await platform2.write(1, `${JSON.stringify({ ...address, bearerFile: tokenPath })}
 `);
   }
   return tokenPath;
@@ -12757,19 +12796,20 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -12952,19 +12992,20 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -13128,19 +13169,20 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const actualPort = listener.port;
   const serverOrigins = buildServerOrigins(options.host, actualPort);
   const allowedHosts = buildAllowedHosts(options.host, actualPort, options.allowHosts);
-  const listenUrl = `http://${options.host}:${actualPort}/mcp`;
+  const address = serveAddress(platform2, options.host, actualPort);
+  const listenUrl = address.url;
   let tokenFilePath;
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
       resolvedBearer,
       actualPort,
-      listenUrl,
+      address,
       options.json
     );
   } else {
     if (options.json) {
-      await platform2.write(1, `${JSON.stringify({ url: listenUrl })}
+      await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
@@ -13467,16 +13509,20 @@ async function signIn(options) {
 }
 
 // src/cli/auth-verbs.ts
-var resolvedSource;
-async function createTokenSource(platform2) {
-  if (isKernel(platform2)) return new PiFileTokenSource(platform2);
-  if (resolvedSource) return resolvedSource;
-  if (await jerkAvailable(platform2)) {
-    resolvedSource = new JerkTokenSource(platform2);
-  } else {
-    resolvedSource = new PiFileTokenSource(platform2);
+async function createTokenSource(platform2, name, timeoutMs = JERK_TIMEOUT_MS) {
+  if (!isKernel(platform2) && !name.startsWith("url:") && await jerkAvailable(platform2) && await jerkKnows(platform2, jerkMcpId(name))) {
+    return new JerkTokenSource(platform2, timeoutMs);
+  }
+  return new PiFileTokenSource(platform2);
+}
+var VALUE_FLAGS = /* @__PURE__ */ new Set(["--scope", "-m", "--timeout"]);
+function positionals(args) {
+  const out = [];
+  for (let i = 0; i < args.length; i++) {
+    if (VALUE_FLAGS.has(args[i])) i++;
+    else if (!args[i].startsWith("-")) out.push(args[i]);
   }
-  return resolvedSource;
+  return out;
 }
 function resolveServerName(target) {
   try {
@@ -13528,8 +13574,7 @@ async function readStream2(stream) {
   }
   return new TextDecoder().decode(buf);
 }
-async function jerkLogin(platform2, target, args) {
-  const resolved = await resolveLoginTarget(platform2, target);
+async function jerkLogin(platform2, target, resolved, args) {
   const id = jerkMcpId(resolved.name);
   const argv = ["jerk", id, "create"];
   const scopeIdx = args.indexOf("--scope");
@@ -13558,18 +13603,9 @@ async function jerkLogin(platform2, target, args) {
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
 }
-async function jerkLogout(platform2, target) {
-  const resolved = await resolveLoginTarget(platform2, target);
+async function jerkLogout(platform2, target, resolved, source) {
   const id = jerkMcpId(resolved.name);
-  const argv = ["jerk", id, "drop", "--yes"];
-  const proc = await platform2.spawn({ argv });
-  proc.stdin.close().catch(() => {
-  });
-  const [, , result] = await Promise.all([
-    readStream2(proc.stdout),
-    readStream2(proc.stderr),
-    proc.wait()
-  ]);
+  const result = await runJerk(platform2, ["jerk", id, "drop", "--yes"], source.timeoutMs);
   if (result.status === 0) {
     await platform2.write(1, `Signed out of ${target}
 `);
@@ -13579,7 +13615,7 @@ async function jerkLogout(platform2, target) {
   }
   return 0;
 }
-async function runLogin(platform2, args, source) {
+async function runLogin(platform2, args, timeoutMs) {
   if (isKernel(platform2)) {
     await platform2.write(
       2,
@@ -13587,15 +13623,24 @@ async function runLogin(platform2, args, source) {
     );
     return 4;
   }
-  const positional = args.filter((a) => !a.startsWith("-"));
+  const positional = positionals(args);
   if (positional.length === 0) {
     await platform2.write(2, "mcpcat: login requires a target\n");
     return 2;
   }
   const target = positional[0];
+  let resolved;
+  try {
+    resolved = await resolveLoginTarget(platform2, target);
+  } catch (err) {
+    await platform2.write(2, `mcpcat: ${err.message}
+`);
+    return 2;
+  }
+  const source = await createTokenSource(platform2, resolved.name, timeoutMs);
   if (source instanceof JerkTokenSource) {
     try {
-      return await jerkLogin(platform2, target, args);
+      return await jerkLogin(platform2, target, resolved, args);
     } catch (err) {
       await platform2.write(2, `mcpcat: login failed: ${err.message}
 `);
@@ -13603,14 +13648,6 @@ async function runLogin(platform2, args, source) {
     }
   }
   const noBrowser = args.includes("--no-browser");
-  let resolved;
-  try {
-    resolved = await resolveLoginTarget(platform2, target);
-  } catch (err) {
-    await platform2.write(2, `mcpcat: ${err.message}
-`);
-    return 2;
-  }
   try {
     await signIn({
       name: resolved.name,
@@ -13673,26 +13710,17 @@ ${url.href}
     return 4;
   }
 }
-async function runLogout(platform2, args, source) {
+async function runLogout(platform2, args, timeoutMs) {
   if (isKernel(platform2)) {
     await platform2.write(2, "mcpcat: logout is not available in seven.\n");
     return 4;
   }
-  const positional = args.filter((a) => !a.startsWith("-"));
+  const positional = positionals(args);
   if (positional.length === 0) {
     await platform2.write(2, "mcpcat: logout requires a target\n");
     return 2;
   }
   const target = positional[0];
-  if (source instanceof JerkTokenSource) {
-    try {
-      return await jerkLogout(platform2, target);
-    } catch (err) {
-      await platform2.write(2, `mcpcat: logout failed: ${err.message}
-`);
-      return 1;
-    }
-  }
   let resolved;
   try {
     resolved = await resolveLoginTarget(platform2, target);
@@ -13701,6 +13729,21 @@ async function runLogout(platform2, args, source) {
 `);
     return 2;
   }
+  const source = await createTokenSource(platform2, resolved.name, timeoutMs);
+  if (source instanceof JerkTokenSource) {
+    try {
+      return await jerkLogout(platform2, target, resolved, source);
+    } catch (err) {
+      if (err instanceof JerkTimeoutError) {
+        await platform2.write(2, `mcpcat: ${err.message}
+`);
+        return 4;
+      }
+      await platform2.write(2, `mcpcat: logout failed: ${err.message}
+`);
+      return 1;
+    }
+  }
   const removed = await source.remove(resolved.name, resolved.serverUrl);
   if (removed) {
     await platform2.write(1, `Signed out of ${target}
@@ -14846,6 +14889,10 @@ var VERBS_WITH_TARGET = /* @__PURE__ */ new Set([
   "prompts",
   "prompt"
 ]);
+function withoutVerb(args, verb) {
+  const at = args.indexOf(verb);
+  return [...args.slice(0, at), ...args.slice(at + 1)];
+}
 function resolveMaxPositional(positional) {
   if (positional.length === 0) return 3;
   const first = positional[0];
@@ -15673,12 +15720,10 @@ async function runInner(platform2, version, args) {
   const discResult = await dispatchDiscoveryVerb(platform2, parsed, args);
   if (discResult !== void 0) return discResult;
   if (parsed.verb === "login") {
-    const source = await createTokenSource(platform2);
-    return runLogin(platform2, args.slice(1), source);
+    return runLogin(platform2, withoutVerb(args, "login"), parsed.timeoutMs);
   }
   if (parsed.verb === "logout") {
-    const source = await createTokenSource(platform2);
-    return runLogout(platform2, args.slice(1), source);
+    return runLogout(platform2, withoutVerb(args, "logout"), parsed.timeoutMs);
   }
   if (UNIMPLEMENTED_VERBS.has(parsed.verb)) {
     await platform2.write(2, `mcpcat: '${parsed.verb}' is not implemented yet
@@ -15745,7 +15790,7 @@ function classifyError(err) {
   if (err instanceof McpAuthError) {
     return { code: EXIT_AUTH, kind: "auth", msg: err.message };
   }
-  if (err instanceof JerkSignInRequiredError) {
+  if (err instanceof JerkSignInRequiredError || err instanceof JerkTimeoutError) {
     return { code: EXIT_AUTH, kind: "auth", msg: err.message };
   }
   if (err instanceof AuthStepUpError) {
@@ -15769,12 +15814,12 @@ function classifyError(err) {
   }
   return { code: EXIT_RPC_ERROR, kind: "rpc_error", msg };
 }
-async function resolveAuthProvider(platform2, hasAuthHeader, url, target, config, onCredentialObtained) {
+async function resolveAuthProvider(platform2, hasAuthHeader, url, target, config, timeoutMs, onCredentialObtained) {
   if (hasAuthHeader || !url) return void 0;
-  const source = await createTokenSource(platform2);
   const entry = config.entry(target);
   const oauth = entry && "url" in entry.config ? entry.config.oauth : void 0;
   const name = entry ? target : `url:${new URL(url).origin}${new URL(url).pathname}`;
+  const source = await createTokenSource(platform2, name, timeoutMs);
   const provider = createMcpAuthProvider({
     name,
     serverUrl: url,
@@ -15803,7 +15848,7 @@ function classifyConnectionError(err, target, interrupted) {
       msg: `${err.reason} (${hint})`
     };
   }
-  if (err instanceof McpAuthError || err instanceof AuthStepUpError || err instanceof JerkSignInRequiredError) {
+  if (err instanceof McpAuthError || err instanceof AuthStepUpError || err instanceof JerkSignInRequiredError || err instanceof JerkTimeoutError) {
     return classifyError(err);
   }
   if (err.name === "McpOAuthAuthorizationRequiredError" || err.name === "McpAuthRequiredError") {
@@ -15951,6 +15996,7 @@ async function runClientVerb(platform2, version, parsed) {
     resolved.url,
     target,
     config,
+    timeoutMs,
     (secret) => {
       allSecrets.add(secret);
       verbose.secrets.add(secret);
@@ -16108,7 +16154,7 @@ async function kernelSpawn(ctx, options) {
     argv: options.argv,
     env: options.env,
     cwd: options.cwd,
-    stdin: "pipe",
+    stdin: options.stdin === "ignore" ? "null" : "pipe",
     stdout: "pipe",
     stderr: "pipe",
     ...tryGroup ? { pgid: 0 } : {}
@@ -16137,7 +16183,7 @@ async function kernelSpawn(ctx, options) {
   }
   const useGroupKill = groupSpawnSupported;
   return {
-    stdin: result.stdin,
+    stdin: result.stdin ?? new WritableStream(),
     stdout: result.stdout,
     stderr: result.stderr,
     wait: () => result.wait(),
@@ -16190,11 +16236,21 @@ async function kernelListen(ctx, options) {
   };
 }
 var KERNEL_LOCALHOST_RE = /^(\d+)\.kernel\.localhost$/;
+var LOOPBACK_HOSTNAMES = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "[::1]"]);
 function extractLoopbackPort(url) {
   const m = KERNEL_LOCALHOST_RE.exec(url.hostname);
   if (m) return Number(m[1]);
   return null;
 }
+function extractPlainLoopbackPort(url) {
+  if (url.protocol !== "http:" || !LOOPBACK_HOSTNAMES.has(url.hostname)) return null;
+  return url.port ? Number(url.port) : 80;
+}
+function isConnectionRefused(err) {
+  const e = err;
+  if (e?.code === "ECONNREFUSED") return true;
+  return typeof e?.message === "string" && e.message.includes("ECONNREFUSED");
+}
 function collectHeaders(init) {
   const entries = [];
   if (!init?.headers) return entries;
@@ -16249,7 +16305,7 @@ function parseHttpResponse(buf, headerPos, bufLen) {
   const responseBody = dec.decode(buf.slice(headerEndByte, headerEndByte + contentLength));
   return { status, statusText, headers: respHeaders, body: responseBody };
 }
-async function kernelLoopbackFetch(ctx, url, port, init) {
+async function kernelLoopbackFetch(ctx, url, port, init, onRefused) {
   const method = (init?.method ?? "GET").toUpperCase();
   const enc = new TextEncoder();
   const dec = new TextDecoder();
@@ -16260,7 +16316,13 @@ async function kernelLoopbackFetch(ctx, url, port, init) {
   const bodyBytes = enc.encode(bodyStr);
   const headerEntries = collectHeaders(init);
   const reqBytes = buildHttpRequest(method, url, headerEntries, bodyBytes);
-  const conn = await ctx.net.connect({ host: "127.0.0.1", port });
+  let conn;
+  try {
+    conn = await ctx.net.connect({ host: "127.0.0.1", port });
+  } catch (err) {
+    if (onRefused && isConnectionRefused(err)) return onRefused();
+    throw err;
+  }
   const writer = conn.writable.getWriter();
   await writer.write(reqBytes);
   const reader = conn.readable.getReader();
@@ -16313,6 +16375,10 @@ function createKernelFetch(ctx) {
     }
     const port = extractLoopbackPort(url);
     if (port !== null) return kernelLoopbackFetch(ctx, url, port, init);
+    const plainPort = extractPlainLoopbackPort(url);
+    if (plainPort !== null) {
+      return kernelLoopbackFetch(ctx, url, plainPort, init, () => ctx.fetch(input, init));
+    }
     return ctx.fetch(input, init);
   };
 }
@@ -16369,7 +16435,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.15.2", args);
+  return run(platform2, "0.15.4", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -56,8 +56,8 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-kernel": "1.88.0",
-    "@ai-ecoverse/slicc-shared-web": "1.13.1",
+    "@ai-ecoverse/slicc-kernel": "1.88.1",
+    "@ai-ecoverse/slicc-shared-web": "1.14.0",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",