@mcp-s/cli 0.0.15 → 0.0.17

package/SKILL.md

@@ -17,6 +17,17 @@ Access a single MCP server through the command line. MCP enables interaction wit
 | `mcp-s-cli call <tool>`          | Call tool (reads JSON from stdin if no args)      |
 | `mcp-s-cli call <tool> '<json>'` | Call tool with arguments                          |
 
+## Auth Preflight
+
+Before the first use of mcp-s-cli in a session, check auth state — this is instant (local file read, no network):
+
+```bash
+mcp-s-cli check-auth
+```
+
+- **Exit 0**: logged in and token is valid → you may proceed
+- **Exit 4**: not logged in or token expired → run `mcp-s-cli login` before any other use of mcp-s-cli
+
 ## Workflow
 
 1. **Discover**: `mcp-s-cli grep <query>` → find tools by keyword; fall back to `mcp-s-cli` only when you need a full inventory

package/dist/SKILL.md

@@ -17,6 +17,17 @@ Access a single MCP server through the command line. MCP enables interaction wit
 | `mcp-s-cli call <tool>`          | Call tool (reads JSON from stdin if no args)      |
 | `mcp-s-cli call <tool> '<json>'` | Call tool with arguments                          |
 
+## Auth Preflight
+
+Before the first use of mcp-s-cli in a session, check auth state — this is instant (local file read, no network):
+
+```bash
+mcp-s-cli check-auth
+```
+
+- **Exit 0**: logged in and token is valid → you may proceed
+- **Exit 4**: not logged in or token expired → run `mcp-s-cli login` before any other use of mcp-s-cli
+
 ## Workflow
 
 1. **Discover**: `mcp-s-cli grep <query>` → find tools by keyword; fall back to `mcp-s-cli` only when you need a full inventory

package/dist/daemon.js

@@ -303,10 +303,23 @@ async function performOAuthFlow(authServerUrl, resourceUrl) {
   if (open) {
     try {
       const { spawn: spawn2 } = await import("child_process");
-      spawn2(open, [authUrl.toString()], {
-        detached: true,
-        stdio: "ignore"
-      }).unref();
+      const urlStr = authUrl.toString();
+      let child;
+      if (process.platform === "win32") {
+        const escapedUrl = urlStr.replace(/&/g, "^&");
+        child = spawn2("cmd", ["/c", "start", '""', escapedUrl], {
+          detached: true,
+          stdio: "ignore"
+        });
+      } else {
+        child = spawn2(open, [urlStr], {
+          detached: true,
+          stdio: "ignore"
+        });
+      }
+      child.on("error", () => {
+      });
+      child.unref();
     } catch {
       console.error("Could not open browser automatically.");
     }
@@ -414,7 +427,7 @@ import { join as join2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/version.ts
-var VERSION = "0.0.15";
+var VERSION = "0.0.17";
 
 // src/client.ts
 function getRetryConfig(settings) {

package/dist/index.js

@@ -2,8 +2,8 @@
 
 // src/index.ts
 import { appendFileSync, mkdirSync as mkdirSync6 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join8 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join9 } from "path";
 
 // src/client.ts
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -299,10 +299,23 @@ async function performOAuthFlow(authServerUrl, resourceUrl) {
   if (open) {
     try {
       const { spawn: spawn2 } = await import("child_process");
-      spawn2(open, [authUrl.toString()], {
-        detached: true,
-        stdio: "ignore"
-      }).unref();
+      const urlStr = authUrl.toString();
+      let child;
+      if (process.platform === "win32") {
+        const escapedUrl = urlStr.replace(/&/g, "^&");
+        child = spawn2("cmd", ["/c", "start", '""', escapedUrl], {
+          detached: true,
+          stdio: "ignore"
+        });
+      } else {
+        child = spawn2(open, [urlStr], {
+          detached: true,
+          stdio: "ignore"
+        });
+      }
+      child.on("error", () => {
+      });
+      child.unref();
     } catch {
       console.error("Could not open browser automatically.");
     }
@@ -1300,7 +1313,7 @@ async function cleanupOrphanedDaemons() {
 }
 
 // src/version.ts
-var VERSION = "0.0.15";
+var VERSION = "0.0.17";
 
 // src/client.ts
 function getRetryConfig(settings) {
@@ -1906,17 +1919,90 @@ async function callCommand(options) {
   }
 }
 
-// src/commands/clear.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "fs";
+// src/commands/check-auth.ts
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir2 } from "os";
-import { dirname as dirname2, join as join3 } from "path";
-var GLOBAL_CONFIG_PATH = join3(
-  homedir2(),
+import { join as join3 } from "path";
+var EXPIRY_MARGIN_MS = 15 * 60 * 1e3;
+async function checkAuthCommand(options) {
+  const { configPath } = options;
+  let serverConfig;
+  let raw;
+  try {
+    const loaded = await loadConfig(configPath);
+    serverConfig = loaded.serverConfig;
+    raw = loaded.raw;
+  } catch (err) {
+    console.error(`Not configured: ${err.message}`);
+    process.exit(4 /* AUTH_ERROR */);
+  }
+  if (!isHttpServer(serverConfig)) {
+    console.log("stdio server \u2014 no auth required");
+    process.exit(0);
+  }
+  if (raw.token) {
+    console.log("Authenticated (static token)");
+    process.exit(0);
+  }
+  const authFilePath = join3(homedir2(), ".config", "mcp-s-cli", "auth.json");
+  if (!existsSync4(authFilePath)) {
+    console.error("Not logged in (no auth file found). Run: mcp-s-cli login");
+    process.exit(4 /* AUTH_ERROR */);
+  }
+  let data;
+  try {
+    data = JSON.parse(readFileSync3(authFilePath, "utf-8"));
+  } catch {
+    console.error("Not logged in (auth file unreadable). Run: mcp-s-cli login");
+    process.exit(4 /* AUTH_ERROR */);
+  }
+  const tokens = data.tokens ?? {};
+  const serverOrigin = new URL(serverConfig.url).origin;
+  const matchingKey = Object.keys(tokens).find((key) => {
+    try {
+      return new URL(key).origin === serverOrigin;
+    } catch {
+      return key === serverOrigin || key.startsWith(serverOrigin);
+    }
+  });
+  if (!matchingKey || !tokens[matchingKey]?.access_token) {
+    console.error(`Not logged in to ${serverOrigin}. Run: mcp-s-cli login`);
+    process.exit(4 /* AUTH_ERROR */);
+  }
+  const token = tokens[matchingKey];
+  const expiredAt = token.access_token_expired_at;
+  if (expiredAt) {
+    const remaining = expiredAt - Date.now();
+    if (remaining <= EXPIRY_MARGIN_MS) {
+      const reason = remaining <= 0 ? "token expired" : "token expires in < 15 min";
+      console.error(
+        `Not logged in to ${serverOrigin} (${reason}). Run: mcp-s-cli login`
+      );
+      process.exit(4 /* AUTH_ERROR */);
+    }
+    const hours = Math.floor(remaining / (60 * 60 * 1e3));
+    const minutes = Math.floor(remaining % (60 * 60 * 1e3) / 6e4);
+    const display = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`;
+    console.log(
+      `Logged in to ${serverOrigin} (token valid, expires in ${display})`
+    );
+  } else {
+    console.log(`Logged in to ${serverOrigin} (token present, no expiry info)`);
+  }
+  process.exit(0);
+}
+
+// src/commands/clear.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname2, join as join4 } from "path";
+var GLOBAL_CONFIG_PATH = join4(
+  homedir3(),
   ".config",
   "mcp-s-cli",
   "config.json"
 );
-var AUTH_PATH = join3(homedir2(), ".config", "mcp-s-cli", "auth.json");
+var AUTH_PATH = join4(homedir3(), ".config", "mcp-s-cli", "auth.json");
 async function clearCommand() {
   mkdirSync2(dirname2(GLOBAL_CONFIG_PATH), { recursive: true });
   writeFileSync2(
@@ -1933,9 +2019,9 @@ async function clearAuthCommand() {
 `, "utf-8");
   console.log(`Cleared auth data from ${AUTH_PATH}`);
 }
-var HISTORY_PATH = join3(homedir2(), ".config", "mcp-s-cli", "history.jsonl");
+var HISTORY_PATH = join4(homedir3(), ".config", "mcp-s-cli", "history.jsonl");
 function clearHistoryCommand() {
-  if (!existsSync4(HISTORY_PATH)) {
+  if (!existsSync5(HISTORY_PATH)) {
     console.log("No history file found.");
     return;
   }
@@ -1944,9 +2030,9 @@ function clearHistoryCommand() {
 }
 
 // src/commands/config.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir3 } from "os";
-import { dirname as dirname3, join as join4, resolve as resolve2 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { dirname as dirname3, join as join5, resolve as resolve2 } from "path";
 var TOP_LEVEL_KEYS = [
   "enabled",
   "org",
@@ -1969,7 +2055,7 @@ var SETTINGS_KEYS = [
 ];
 var ALL_KNOWN_KEYS = [...TOP_LEVEL_KEYS, ...SETTINGS_KEYS];
 function getDefaultConfigPath() {
-  return join4(homedir3(), ".config", "mcp-s-cli", "config.json");
+  return join5(homedir4(), ".config", "mcp-s-cli", "config.json");
 }
 function resolveConfigPath(explicitPath) {
   if (explicitPath) return resolve2(explicitPath);
@@ -1978,8 +2064,8 @@ function resolveConfigPath(explicitPath) {
   return getDefaultConfigPath();
 }
 function readConfigFile(configPath) {
-  if (!existsSync5(configPath)) return {};
-  const content = readFileSync3(configPath, "utf-8").trim();
+  if (!existsSync6(configPath)) return {};
+  const content = readFileSync4(configPath, "utf-8").trim();
   if (!content) return {};
   try {
     const parsed = JSON.parse(content);
@@ -2060,7 +2146,7 @@ function configGetCommand(opts) {
   const { key, configPath: explicitPath } = opts;
   validateKey(key);
   const configPath = resolveConfigPath(explicitPath);
-  if (!existsSync5(configPath)) {
+  if (!existsSync6(configPath)) {
     console.error(
       formatCliError({
         code: 1 /* CLIENT_ERROR */,
@@ -2089,7 +2175,7 @@ function configGetCommand(opts) {
 }
 function configShowCommand(opts) {
   const configPath = resolveConfigPath(opts.configPath);
-  if (!existsSync5(configPath)) {
+  if (!existsSync6(configPath)) {
     console.error(
       formatCliError({
         code: 1 /* CLIENT_ERROR */,
@@ -2288,78 +2374,78 @@ async function infoCommand(options) {
 }
 
 // src/commands/init.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir5 } from "os";
-import { dirname as dirname5, join as join6 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir6 } from "os";
+import { dirname as dirname5, join as join7 } from "path";
 import * as readline from "readline";
 
 // src/commands/install-skill.ts
 import {
-  existsSync as existsSync6,
+  existsSync as existsSync7,
   lstatSync,
   mkdirSync as mkdirSync4,
-  readFileSync as readFileSync4,
+  readFileSync as readFileSync5,
   readlinkSync,
   rmSync as rmSync2,
   symlinkSync,
   writeFileSync as writeFileSync4
 } from "fs";
-import { homedir as homedir4, platform } from "os";
-import { dirname as dirname4, join as join5, normalize, relative, resolve as resolve3, sep } from "path";
+import { homedir as homedir5, platform } from "os";
+import { dirname as dirname4, join as join6, normalize, relative, resolve as resolve3, sep } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-var home = homedir4();
+var home = homedir5();
 var AGENTS = {
   cursor: {
     displayName: "Cursor",
-    globalSkillsDir: join5(home, ".cursor", "skills"),
-    detect: () => existsSync6(join5(home, ".cursor"))
+    globalSkillsDir: join6(home, ".cursor", "skills"),
+    detect: () => existsSync7(join6(home, ".cursor"))
   },
   codex: {
     displayName: "Codex",
-    globalSkillsDir: join5(
-      process.env.CODEX_HOME?.trim() || join5(home, ".codex"),
+    globalSkillsDir: join6(
+      process.env.CODEX_HOME?.trim() || join6(home, ".codex"),
       "skills"
     ),
-    detect: () => existsSync6(process.env.CODEX_HOME?.trim() || join5(home, ".codex")) || existsSync6("/etc/codex")
+    detect: () => existsSync7(process.env.CODEX_HOME?.trim() || join6(home, ".codex")) || existsSync7("/etc/codex")
   },
   "claude-code": {
     displayName: "Claude Code",
-    globalSkillsDir: join5(
-      process.env.CLAUDE_CONFIG_DIR?.trim() || join5(home, ".claude"),
+    globalSkillsDir: join6(
+      process.env.CLAUDE_CONFIG_DIR?.trim() || join6(home, ".claude"),
       "skills"
     ),
-    detect: () => existsSync6(
-      process.env.CLAUDE_CONFIG_DIR?.trim() || join5(home, ".claude")
+    detect: () => existsSync7(
+      process.env.CLAUDE_CONFIG_DIR?.trim() || join6(home, ".claude")
     )
   },
   windsurf: {
     displayName: "Windsurf",
-    globalSkillsDir: join5(home, ".codeium", "windsurf", "skills"),
-    detect: () => existsSync6(join5(home, ".codeium", "windsurf"))
+    globalSkillsDir: join6(home, ".codeium", "windsurf", "skills"),
+    detect: () => existsSync7(join6(home, ".codeium", "windsurf"))
   },
   "github-copilot": {
     displayName: "GitHub Copilot",
-    globalSkillsDir: join5(home, ".copilot", "skills"),
-    detect: () => existsSync6(join5(home, ".copilot"))
+    globalSkillsDir: join6(home, ".copilot", "skills"),
+    detect: () => existsSync7(join6(home, ".copilot"))
   },
   cline: {
     displayName: "Cline",
-    globalSkillsDir: join5(home, ".cline", "skills"),
-    detect: () => existsSync6(join5(home, ".cline"))
+    globalSkillsDir: join6(home, ".cline", "skills"),
+    detect: () => existsSync7(join6(home, ".cline"))
   },
   roo: {
     displayName: "Roo Code",
-    globalSkillsDir: join5(home, ".roo", "skills"),
-    detect: () => existsSync6(join5(home, ".roo"))
+    globalSkillsDir: join6(home, ".roo", "skills"),
+    detect: () => existsSync7(join6(home, ".roo"))
   },
   continue: {
     displayName: "Continue",
-    globalSkillsDir: join5(home, ".continue", "skills"),
-    detect: () => existsSync6(join5(home, ".continue")) || existsSync6(join5(process.cwd(), ".continue"))
+    globalSkillsDir: join6(home, ".continue", "skills"),
+    detect: () => existsSync7(join6(home, ".continue")) || existsSync7(join6(process.cwd(), ".continue"))
   }
 };
 function getCanonicalSkillDir(skillName) {
-  return join5(home, ".agents", "skills", skillName);
+  return join6(home, ".agents", "skills", skillName);
 }
 function getCanonicalSkillPath() {
   return getCanonicalSkillDir(SKILL_NAME);
@@ -2410,13 +2496,13 @@ function getSkillMdContent() {
   const __filename = fileURLToPath2(import.meta.url);
   const __dirname = dirname4(__filename);
   const candidates = [
-    join5(__dirname, "SKILL.md"),
-    join5(__dirname, "..", "SKILL.md"),
-    join5(__dirname, "..", "..", "SKILL.md")
+    join6(__dirname, "SKILL.md"),
+    join6(__dirname, "..", "SKILL.md"),
+    join6(__dirname, "..", "..", "SKILL.md")
   ];
   for (const candidate of candidates) {
-    if (existsSync6(candidate)) {
-      return readFileSync4(candidate, "utf-8");
+    if (existsSync7(candidate)) {
+      return readFileSync5(candidate, "utf-8");
     }
   }
   throw new Error(
@@ -2426,12 +2512,12 @@ function getSkillMdContent() {
 function installSkill() {
   const content = getSkillMdContent();
   const canonicalDir = getCanonicalSkillDir(SKILL_NAME);
-  if (!isPathSafe(join5(home, ".agents", "skills"), canonicalDir)) {
+  if (!isPathSafe(join6(home, ".agents", "skills"), canonicalDir)) {
     throw new Error("Invalid skill name: potential path traversal detected");
   }
   rmSync2(canonicalDir, { recursive: true, force: true });
   mkdirSync4(canonicalDir, { recursive: true });
-  writeFileSync4(join5(canonicalDir, "SKILL.md"), content, "utf-8");
+  writeFileSync4(join6(canonicalDir, "SKILL.md"), content, "utf-8");
   const result = {
     installed: [],
     skipped: [],
@@ -2443,7 +2529,7 @@ function installSkill() {
       result.skipped.push(agentName);
       continue;
     }
-    const agentSkillDir = join5(agent.globalSkillsDir, SKILL_NAME);
+    const agentSkillDir = join6(agent.globalSkillsDir, SKILL_NAME);
     if (!isPathSafe(agent.globalSkillsDir, agentSkillDir)) {
       result.failed.push({
         agent: agentName,
@@ -2456,7 +2542,7 @@ function installSkill() {
       if (!symlinkOk) {
         rmSync2(agentSkillDir, { recursive: true, force: true });
         mkdirSync4(agentSkillDir, { recursive: true });
-        writeFileSync4(join5(agentSkillDir, "SKILL.md"), content, "utf-8");
+        writeFileSync4(join6(agentSkillDir, "SKILL.md"), content, "utf-8");
       }
       result.installed.push(agentName);
     } catch (err) {
@@ -2476,8 +2562,8 @@ function clearSkill() {
     canonicalRemoved: false
   };
   for (const [agentName, agent] of Object.entries(AGENTS)) {
-    const agentSkillDir = join5(agent.globalSkillsDir, SKILL_NAME);
-    if (!existsSync6(agentSkillDir)) {
+    const agentSkillDir = join6(agent.globalSkillsDir, SKILL_NAME);
+    if (!existsSync7(agentSkillDir)) {
       result.skipped.push(agentName);
       continue;
     }
@@ -2492,7 +2578,7 @@ function clearSkill() {
     }
   }
   const canonicalDir = getCanonicalSkillDir(SKILL_NAME);
-  if (existsSync6(canonicalDir)) {
+  if (existsSync7(canonicalDir)) {
     try {
       rmSync2(canonicalDir, { recursive: true, force: true });
       result.canonicalRemoved = true;
@@ -2503,12 +2589,12 @@ function clearSkill() {
 }
 function getSkillInstallInfo() {
   return Object.entries(AGENTS).filter(([, agent]) => agent.detect()).map(([agentName, agent]) => {
-    const agentSkillDir = join5(agent.globalSkillsDir, SKILL_NAME);
+    const agentSkillDir = join6(agent.globalSkillsDir, SKILL_NAME);
     return {
       agent: agentName,
       displayName: agent.displayName,
       path: agentSkillDir,
-      installed: existsSync6(join5(agentSkillDir, "SKILL.md"))
+      installed: existsSync7(join6(agentSkillDir, "SKILL.md"))
     };
   });
 }
@@ -2708,16 +2794,16 @@ ${BAR}  ${c(A.cyan, "\u25C6")} `
   }
 }
 var p = { intro, outro, cancel, isCancel, select, text };
-var GLOBAL_CONFIG_PATH2 = join6(
-  homedir5(),
+var GLOBAL_CONFIG_PATH2 = join7(
+  homedir6(),
   ".config",
   "mcp-s-cli",
   "config.json"
 );
 function readExistingConfig() {
   try {
-    if (existsSync7(GLOBAL_CONFIG_PATH2)) {
-      return JSON.parse(readFileSync5(GLOBAL_CONFIG_PATH2, "utf-8"));
+    if (existsSync8(GLOBAL_CONFIG_PATH2)) {
+      return JSON.parse(readFileSync6(GLOBAL_CONFIG_PATH2, "utf-8"));
     }
   } catch {
   }
@@ -2846,10 +2932,10 @@ async function initInteractive() {
 }
 
 // src/commands/kill-daemon.ts
-import { existsSync as existsSync8, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync2 } from "fs";
 function killDaemonCommand() {
   const socketDir = getSocketDir();
-  if (!existsSync8(socketDir)) {
+  if (!existsSync9(socketDir)) {
     console.log("No daemons running.");
     return;
   }
@@ -2948,9 +3034,9 @@ async function logoutCommand(options) {
 }
 
 // src/commands/whoami.ts
-import { existsSync as existsSync9, readFileSync as readFileSync6, statSync } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join7, resolve as resolve4 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync7, statSync } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join8, resolve as resolve4 } from "path";
 function getResolvedConfigPath(explicitPath) {
   if (explicitPath) {
     return resolve4(explicitPath);
@@ -2958,8 +3044,8 @@ function getResolvedConfigPath(explicitPath) {
   if (process.env.MCP_S_CLI_CONFIG_PATH) {
     return resolve4(process.env.MCP_S_CLI_CONFIG_PATH);
   }
-  const defaultPath = join7(homedir6(), ".config", "mcp-s-cli", "config.json");
-  if (existsSync9(defaultPath)) {
+  const defaultPath = join8(homedir7(), ".config", "mcp-s-cli", "config.json");
+  if (existsSync10(defaultPath)) {
     return defaultPath;
   }
   return null;
@@ -2987,15 +3073,15 @@ async function whoamiCommand(options) {
     console.log(`  Error loading config: ${err.message}`);
     return;
   }
-  const authFilePath = join7(homedir6(), ".config", "mcp-s-cli", "auth.json");
+  const authFilePath = join8(homedir7(), ".config", "mcp-s-cli", "auth.json");
   console.log("");
   console.log("OAuth Tokens");
   console.log(`  Path: ${authFilePath}`);
-  if (!existsSync9(authFilePath)) {
+  if (!existsSync10(authFilePath)) {
     console.log("  (no tokens stored)");
   } else {
     try {
-      const raw2 = readFileSync6(authFilePath, "utf-8");
+      const raw2 = readFileSync7(authFilePath, "utf-8");
       const data = JSON.parse(raw2);
       const tokenEntries = Object.entries(data.tokens ?? {});
       if (tokenEntries.length === 0) {
@@ -3005,9 +3091,9 @@ async function whoamiCommand(options) {
       console.log("  (could not read auth file)");
     }
   }
-  const historyPath = join7(homedir6(), ".config", "mcp-s-cli", "history.jsonl");
-  if (existsSync9(historyPath)) {
-    const lines = readFileSync6(historyPath, "utf-8").split("\n").filter(Boolean);
+  const historyPath = join8(homedir7(), ".config", "mcp-s-cli", "history.jsonl");
+  if (existsSync10(historyPath)) {
+    const lines = readFileSync7(historyPath, "utf-8").split("\n").filter(Boolean);
     const size = statSync(historyPath).size;
     const sizeStr = size >= 1024 * 1024 ? `${(size / (1024 * 1024)).toFixed(1)} MB` : size >= 1024 ? `${(size / 1024).toFixed(1)} KB` : `${size} B`;
     console.log("");
@@ -3216,6 +3302,10 @@ function parseArgs2(args) {
     result.command = "logout";
     return result;
   }
+  if (firstArg === "check-auth") {
+    result.command = "check-auth";
+    return result;
+  }
   if (firstArg === "clear") {
     result.command = "clear";
     return result;
@@ -3307,6 +3397,7 @@ Usage:
   mcp-s-cli whoami                           Show config location and auth state
   mcp-s-cli login                            Log in to the configured server via OAuth
   mcp-s-cli logout                           Log out (remove stored OAuth tokens)
+  mcp-s-cli check-auth                       Check auth state offline (no network); exits 0=ok, 4=needs login
   mcp-s-cli config set <key> <value>         Set a value in config.json
   mcp-s-cli config get <key>                 Get a value from config.json
   mcp-s-cli config show                      Print full config.json
@@ -3348,6 +3439,7 @@ Examples:
   mcp-s-cli whoami                           # Show config and auth state
   mcp-s-cli login                            # Authenticate via OAuth
   mcp-s-cli logout                           # Remove stored OAuth tokens
+  mcp-s-cli check-auth                       # Check auth state offline (fast preflight)
   mcp-s-cli config set settings.timeout 30   # Set request timeout to 30s
   mcp-s-cli clear                            # Reset server config
   mcp-s-cli clear-auth                       # Clear stored auth data
@@ -3371,10 +3463,10 @@ Config File:
 function appendHistory(argv, history) {
   if (!history) return;
   try {
-    const dir = join8(homedir7(), ".config", "mcp-s-cli");
+    const dir = join9(homedir8(), ".config", "mcp-s-cli");
     mkdirSync6(dir, { recursive: true });
     const entry = JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), args: argv });
-    appendFileSync(join8(dir, "history.jsonl"), `${entry}
+    appendFileSync(join9(dir, "history.jsonl"), `${entry}
 `, "utf8");
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -3473,6 +3565,9 @@ async function main() {
     case "logout":
       await logoutCommand({ configPath: args.configPath });
       break;
+    case "check-auth":
+      await checkAuthCommand({ configPath: args.configPath });
+      break;
     case "clear":
       await clearCommand();
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-s/cli",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A lightweight CLI for connecting AI agents to the Webrix MCP Gateway",
   "type": "module",
   "main": "dist/index.js",