@evantahler/mcpcli 0.2.4 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evantahler/mcpcli",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "A command-line interface for MCP servers. curl for MCP.",
   "type": "module",
   "bin": {

package/src/client/oauth.ts

@@ -1,6 +1,10 @@
 import { exec } from "child_process";
 import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
-import { auth, refreshAuthorization } from "@modelcontextprotocol/sdk/client/auth.js";
+import {
+  auth,
+  discoverOAuthServerInfo,
+  refreshAuthorization,
+} from "@modelcontextprotocol/sdk/client/auth.js";
 import type {
   OAuthClientMetadata,
   OAuthClientInformationMixed,
@@ -8,6 +12,8 @@ import type {
 } from "@modelcontextprotocol/sdk/shared/auth.js";
 import type { AuthFile } from "../config/schemas.ts";
 import { saveAuth } from "../config/loader.ts";
+import type { FormatOptions } from "../output/formatter.ts";
+import { startSpinner } from "../output/spinner.ts";
 
 export class McpOAuthProvider implements OAuthClientProvider {
   private serverName: string;
@@ -243,6 +249,37 @@ export function startCallbackServer(): {
   return { server, authCodePromise };
 }
 
+/** Probe for OAuth support and run the auth flow if the server supports it.
+ * Returns true if auth ran, false if server doesn't support OAuth (silent skip). */
+export async function tryOAuthIfSupported(
+  serverName: string,
+  serverUrl: string,
+  configDir: string,
+  auth: AuthFile,
+  formatOptions: FormatOptions,
+): Promise<boolean> {
+  let oauthSupported: boolean;
+  try {
+    const info = await discoverOAuthServerInfo(serverUrl);
+    oauthSupported = info.authorizationServerMetadata !== undefined;
+  } catch {
+    return false;
+  }
+
+  if (!oauthSupported) return false;
+
+  const provider = new McpOAuthProvider({ serverName, configDir, auth });
+  const spinner = startSpinner(`Authenticating with "${serverName}"…`, formatOptions);
+  try {
+    await runOAuthFlow(serverUrl, provider);
+    spinner.success(`Authenticated with "${serverName}"`);
+    return true;
+  } catch (err) {
+    spinner.error(`Authentication failed: ${err instanceof Error ? err.message : err}`);
+    throw err;
+  }
+}
+
 /** Run a full OAuth authorization flow for an HTTP MCP server */
 export async function runOAuthFlow(serverUrl: string, provider: McpOAuthProvider): Promise<void> {
   // Clear any leftover state from a previously cancelled auth flow

package/src/commands/add.ts

@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import type { ServerConfig } from "../config/schemas.ts";
-import { loadRawServers, saveServers } from "../config/loader.ts";
+import { loadRawAuth, loadRawServers, saveServers } from "../config/loader.ts";
+import { tryOAuthIfSupported } from "../client/oauth.ts";
 import { runIndex } from "./index.ts";
 
 export function registerAddCommand(program: Command) {
@@ -16,6 +17,7 @@ export function registerAddCommand(program: Command) {
     .option("--allowed-tools <tools>", "comma-separated list of allowed tools")
     .option("--disabled-tools <tools>", "comma-separated list of disabled tools")
     .option("-f, --force", "overwrite if server already exists")
+    .option("--no-auth", "skip automatic OAuth authentication after adding an HTTP server")
     .option("--no-index", "skip rebuilding the search index after adding")
     .action(
       async (
@@ -30,6 +32,7 @@ export function registerAddCommand(program: Command) {
           allowedTools?: string;
           disabledTools?: string;
           force?: boolean;
+          auth?: boolean;
           index?: boolean;
         },
       ) => {
@@ -73,6 +76,21 @@ export function registerAddCommand(program: Command) {
         await saveServers(configDir, servers);
         console.log(`Added server "${name}" to ${configDir}/servers.json`);
 
+        // Auto-auth: probe for OAuth support and run the flow if supported
+        if (hasUrl && options.auth !== false) {
+          const auth = await loadRawAuth(configDir);
+          const formatOptions = {
+            json: !!program.opts().json,
+            verbose: !!program.opts().verbose,
+            showSecrets: false,
+          };
+          try {
+            await tryOAuthIfSupported(name, options.url!, configDir, auth, formatOptions);
+          } catch {
+            console.error(`Warning: OAuth authentication failed. Run: mcpcli auth ${name}`);
+          }
+        }
+
         // Commander treats --no-index as index=false (default true)
         if (options.index !== false) {
           await runIndex(program);