@ai-ecoverse/mcpcat 0.15.1 → 0.15.3

package/README.md

@@ -22,7 +22,7 @@ Or via npm:
 npm install -g @ai-ecoverse/mcpcat
 ```
 
-mcpcat runs natively on macOS, Linux and Windows (Node ≥ 24), and inside Sliccy Seven as a kernel program, with the same flags, the same output and the same config file in both places. Orphan-free shutdown of stdio server trees in the kernel needs slicc-kernel ≥ 1.74.0; on older kernels only the direct child is signalled. When the kernel sends SIGKILL to mcpcat's process group, no handler can run and the server tree survives; a kernel "parent death signal" spawn option (like Linux `PR_SET_PDEATHSIG`) would cover that case.
+mcpcat runs natively on macOS, Linux and Windows (Node ≥ 24), and inside Sliccy Seven as a kernel program, with the same flags, the same output and the same config file in both places. Orphan-free shutdown of stdio server trees in the kernel needs slicc-kernel ≥ 1.74.0; on older kernels only the direct child is signalled. A SIGKILLed mcpcat runs no handler. On slicc-kernel ≥ 1.88.0, mcpcat spawns stdio servers and served commands with a parent death signal (like Linux `PR_SET_PDEATHSIG`), so the kernel SIGKILLs each server's process group when mcpcat dies. On older kernels, and on the host, where there is no portable equivalent, servers that exit on stdin EOF (most MCP servers) still stop, but servers that ignore it keep running.
 
 ## Quick start
 

package/dist/host/mcpcat.mjs

@@ -6477,6 +6477,7 @@ 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;
 function parseVersion(raw) {
   const match = raw.trim().match(/(\d+)\.(\d+)\.(\d+)/);
@@ -6523,23 +6524,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 +6577,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 +6588,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 +6598,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,
@@ -8177,7 +8191,8 @@ var PlatformStdioTransport = class {
       this.process = await this.options.platform.spawn({
         argv: [this.options.command, ...this.options.args ?? []],
         env,
-        cwd: this.options.cwd
+        cwd: this.options.cwd,
+        dieWithParent: true
       });
       trackStdio(this.process);
     }
@@ -8570,7 +8585,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);
     }
   }
@@ -8911,7 +8926,8 @@ async function probeStdioStateless(options) {
   const proc = await options.platform.spawn({
     argv: [options.command, ...options.args ?? []],
     env: inheritedEnv,
-    cwd: options.cwd
+    cwd: options.cwd,
+    dieWithParent: true
   });
   trackStdio(proc);
   const rpc = createStdioJsonRpc(proc, options.platform, {
@@ -11496,15 +11512,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 [];
@@ -12529,7 +12545,8 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
     proc = await platform2.spawn({
       argv: [cmdPath, ...argv],
       env: childEnv,
-      cwd
+      cwd,
+      dieWithParent: true
     });
   } catch (err) {
     return { stdout: "", stderr: `spawn failed: ${err.message}`, exitCode: 127 };
@@ -13844,16 +13861,25 @@ async function signIn(options) {
 
 // src/cli/auth-verbs.ts
 var resolvedSource;
-async function createTokenSource(platform2) {
+async function createTokenSource(platform2, timeoutMs = JERK_TIMEOUT_MS) {
   if (isKernel(platform2)) return new PiFileTokenSource(platform2);
   if (resolvedSource) return resolvedSource;
   if (await jerkAvailable(platform2)) {
-    resolvedSource = new JerkTokenSource(platform2);
+    resolvedSource = new JerkTokenSource(platform2, timeoutMs);
   } else {
     resolvedSource = new PiFileTokenSource(platform2);
   }
   return resolvedSource;
 }
+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 {
     const u = new URL(target.startsWith("http") ? target : `https://${target}`);
@@ -13934,18 +13960,10 @@ async function jerkLogin(platform2, target, args2) {
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
 }
-async function jerkLogout(platform2, target) {
+async function jerkLogout(platform2, target, source) {
   const resolved = await resolveLoginTarget(platform2, target);
   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}
 `);
@@ -13963,7 +13981,7 @@ 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;
@@ -14054,7 +14072,7 @@ async function runLogout(platform2, args2, source) {
     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;
@@ -14062,8 +14080,13 @@ async function runLogout(platform2, args2, source) {
   const target = positional[0];
   if (source instanceof JerkTokenSource) {
     try {
-      return await jerkLogout(platform2, target);
+      return await jerkLogout(platform2, target, 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;
@@ -15222,6 +15245,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];
@@ -16049,12 +16076,12 @@ 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);
+    const source = await createTokenSource(platform2, parsed.timeoutMs);
+    return runLogin(platform2, withoutVerb(args2, "login"), source);
   }
   if (parsed.verb === "logout") {
-    const source = await createTokenSource(platform2);
-    return runLogout(platform2, args2.slice(1), source);
+    const source = await createTokenSource(platform2, parsed.timeoutMs);
+    return runLogout(platform2, withoutVerb(args2, "logout"), source);
   }
   if (UNIMPLEMENTED_VERBS.has(parsed.verb)) {
     await platform2.write(2, `mcpcat: '${parsed.verb}' is not implemented yet
@@ -16121,7 +16148,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) {
@@ -16145,9 +16172,9 @@ 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 source = await createTokenSource(platform2, timeoutMs);
   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}`;
@@ -16179,7 +16206,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") {
@@ -16327,6 +16354,7 @@ async function runClientVerb(platform2, version, parsed) {
     resolved.url,
     target,
     config,
+    timeoutMs,
     (secret) => {
       allSecrets.add(secret);
       verbose.secrets.add(secret);
@@ -16463,10 +16491,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) => {
@@ -16477,7 +16506,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({
@@ -16684,5 +16713,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.15.1", args);
+var code = await run(platform, "0.15.3", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -6098,6 +6098,7 @@ 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;
 function parseVersion(raw) {
   const match = raw.trim().match(/(\d+)\.(\d+)\.(\d+)/);
@@ -6144,23 +6145,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 +6198,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 +6209,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 +6219,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,
@@ -7798,7 +7812,8 @@ var PlatformStdioTransport = class {
       this.process = await this.options.platform.spawn({
         argv: [this.options.command, ...this.options.args ?? []],
         env: env2,
-        cwd: this.options.cwd
+        cwd: this.options.cwd,
+        dieWithParent: true
       });
       trackStdio(this.process);
     }
@@ -8191,7 +8206,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);
     }
   }
@@ -8532,7 +8547,8 @@ async function probeStdioStateless(options) {
   const proc = await options.platform.spawn({
     argv: [options.command, ...options.args ?? []],
     env: inheritedEnv,
-    cwd: options.cwd
+    cwd: options.cwd,
+    dieWithParent: true
   });
   trackStdio(proc);
   const rpc = createStdioJsonRpc(proc, options.platform, {
@@ -11117,15 +11133,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 [];
@@ -12150,7 +12166,8 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
     proc = await platform2.spawn({
       argv: [cmdPath, ...argv],
       env: childEnv,
-      cwd
+      cwd,
+      dieWithParent: true
     });
   } catch (err) {
     return { stdout: "", stderr: `spawn failed: ${err.message}`, exitCode: 127 };
@@ -13465,16 +13482,25 @@ async function signIn(options) {
 
 // src/cli/auth-verbs.ts
 var resolvedSource;
-async function createTokenSource(platform2) {
+async function createTokenSource(platform2, timeoutMs = JERK_TIMEOUT_MS) {
   if (isKernel(platform2)) return new PiFileTokenSource(platform2);
   if (resolvedSource) return resolvedSource;
   if (await jerkAvailable(platform2)) {
-    resolvedSource = new JerkTokenSource(platform2);
+    resolvedSource = new JerkTokenSource(platform2, timeoutMs);
   } else {
     resolvedSource = new PiFileTokenSource(platform2);
   }
   return resolvedSource;
 }
+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 out;
+}
 function resolveServerName(target) {
   try {
     const u = new URL(target.startsWith("http") ? target : `https://${target}`);
@@ -13555,18 +13581,10 @@ async function jerkLogin(platform2, target, args) {
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
 }
-async function jerkLogout(platform2, target) {
+async function jerkLogout(platform2, target, source) {
   const resolved = await resolveLoginTarget(platform2, target);
   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}
 `);
@@ -13584,7 +13602,7 @@ 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;
@@ -13675,7 +13693,7 @@ async function runLogout(platform2, args, source) {
     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;
@@ -13683,8 +13701,13 @@ async function runLogout(platform2, args, source) {
   const target = positional[0];
   if (source instanceof JerkTokenSource) {
     try {
-      return await jerkLogout(platform2, target);
+      return await jerkLogout(platform2, target, 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;
@@ -14843,6 +14866,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];
@@ -15670,12 +15697,12 @@ 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);
+    const source = await createTokenSource(platform2, parsed.timeoutMs);
+    return runLogin(platform2, withoutVerb(args, "login"), source);
   }
   if (parsed.verb === "logout") {
-    const source = await createTokenSource(platform2);
-    return runLogout(platform2, args.slice(1), source);
+    const source = await createTokenSource(platform2, parsed.timeoutMs);
+    return runLogout(platform2, withoutVerb(args, "logout"), source);
   }
   if (UNIMPLEMENTED_VERBS.has(parsed.verb)) {
     await platform2.write(2, `mcpcat: '${parsed.verb}' is not implemented yet
@@ -15742,7 +15769,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) {
@@ -15766,9 +15793,9 @@ 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 source = await createTokenSource(platform2, timeoutMs);
   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}`;
@@ -15800,7 +15827,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") {
@@ -15948,6 +15975,7 @@ async function runClientVerb(platform2, version, parsed) {
     resolved.url,
     target,
     config,
+    timeoutMs,
     (secret) => {
       allSecrets.add(secret);
       verbose.secrets.add(secret);
@@ -16094,17 +16122,35 @@ function kernelFs(ctx) {
   };
 }
 var groupSpawnSupported;
+var deathSignalSupported;
+var PARENT_DEATH_SIGNAL = "SIGKILL";
+function isInvalid(err) {
+  return err?.code === "EINVAL";
+}
 async function kernelSpawn(ctx, options) {
   const tryGroup = groupSpawnSupported !== false;
-  const result = await ctx.spawn({
+  const base = {
     argv: options.argv,
     env: options.env,
     cwd: options.cwd,
-    stdin: "pipe",
+    stdin: options.stdin === "ignore" ? "null" : "pipe",
     stdout: "pipe",
     stderr: "pipe",
     ...tryGroup ? { pgid: 0 } : {}
-  });
+  };
+  const tryDeath = options.dieWithParent === true && deathSignalSupported !== false;
+  let result;
+  if (tryDeath) {
+    try {
+      result = await ctx.spawn({ ...base, parentDeathSignal: PARENT_DEATH_SIGNAL });
+    } catch (err) {
+      if (!isInvalid(err)) throw err;
+      deathSignalSupported = false;
+      result = await ctx.spawn(base);
+    }
+  } else {
+    result = await ctx.spawn(base);
+  }
   const childPid = result.pid;
   if (groupSpawnSupported === void 0) {
     try {
@@ -16116,7 +16162,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(),
@@ -16348,7 +16394,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.15.1", args);
+  return run(platform2, "0.15.3", args);
 }
 export {
   main as default

package/package.json

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