@evantahler/mcpcli 0.2.4 → 0.3.2

package/package.json

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

package/skills/mcpcli.md

@@ -17,10 +17,10 @@ mcpcli search "<what you want to do>"
 ## 2. Inspect the tool schema
 
 ```bash
-mcpcli call <server> <tool>
+mcpcli info <server>/<tool>
 ```
 
-This shows parameters, types, required fields, and an example payload.
+This shows parameters, types, required fields, and the full JSON Schema.
 
 ## 3. Call the tool
 
@@ -34,7 +34,6 @@ mcpcli call <server> <tool> '<json args>'
 - Always inspect the schema before calling — validate you have the right arguments
 - Use `mcpcli search -k` for exact name matching
 - Pipe results through `jq` when you need to extract specific fields
-- Tool call results are always JSON with nested JSON strings auto-parsed
 - Use `-v` for verbose HTTP debugging if a call fails unexpectedly
 
 ## Examples
@@ -44,14 +43,14 @@ mcpcli call <server> <tool> '<json args>'
 mcpcli search "send a message"
 
 # See what parameters Slack_SendMessage needs
-mcpcli call arcade Slack_SendMessage
+mcpcli info arcade/Slack_SendMessage
 
 # Send a message
 mcpcli call arcade Slack_SendMessage '{"channel":"#general","message":"hello"}'
 
 # Chain commands — search repos and read the first result
 mcpcli call github search_repositories '{"query":"mcp"}' \
-  | jq -r '.content[0].text.items[0].full_name' \
+  | jq -r '.content[0].text | fromjson | .items[0].full_name' \
   | xargs -I {} mcpcli call github get_file_contents '{"owner":"{}","path":"README.md"}'
 
 # Read args from stdin
@@ -64,22 +63,30 @@ Some HTTP servers require OAuth. If you see an "Not authenticated" error:
 
 ```bash
 mcpcli auth <server>        # authenticate via browser
-mcpcli auth <server> -s        # check token status
+mcpcli auth <server> -s     # check token status and TTL
+mcpcli auth <server> -r     # force token refresh
 mcpcli deauth <server>      # remove stored auth
 ```
 
 ## Available commands
 
-| Command                                | Purpose                            |
-| -------------------------------------- | ---------------------------------- |
-| `mcpcli`                               | List all servers and tools         |
-| `mcpcli -d`                            | List with descriptions             |
-| `mcpcli call <server>`                 | List tools for a server            |
-| `mcpcli call <server> <tool>`          | Show tool help and example payload |
-| `mcpcli call <server> <tool> '<json>'` | Execute a tool                     |
-| `mcpcli info <server>/<tool>`          | Show tool schema                   |
-| `mcpcli search "<query>"`              | Search tools                       |
-| `mcpcli search -k "<pattern>"`         | Keyword/glob search only           |
-| `mcpcli search -q "<query>"`           | Semantic search only               |
-| `mcpcli index`                         | Build/rebuild search index         |
-| `mcpcli auth <server>`                 | Authenticate with OAuth            |
+| Command                                | Purpose                           |
+| -------------------------------------- | --------------------------------- |
+| `mcpcli`                               | List all servers and tools        |
+| `mcpcli -d`                            | List with descriptions            |
+| `mcpcli info <server>`                 | Show tools for a server           |
+| `mcpcli info <server>/<tool>`          | Show tool schema                  |
+| `mcpcli call <server>`                 | List tools for a server           |
+| `mcpcli call <server> <tool> '<json>'` | Execute a tool                    |
+| `mcpcli search "<query>"`              | Search tools (keyword + semantic) |
+| `mcpcli search -k "<pattern>"`         | Keyword/glob search only          |
+| `mcpcli search -q "<query>"`           | Semantic search only              |
+| `mcpcli index`                         | Build/rebuild search index        |
+| `mcpcli index -i`                      | Show index status                 |
+| `mcpcli auth <server>`                 | Authenticate with OAuth           |
+| `mcpcli auth <server> -s`              | Check token status and TTL        |
+| `mcpcli auth <server> -r`              | Force token refresh               |
+| `mcpcli deauth <server>`               | Remove stored authentication      |
+| `mcpcli add <name> --command <cmd>`    | Add a stdio MCP server            |
+| `mcpcli add <name> --url <url>`        | Add an HTTP MCP server            |
+| `mcpcli remove <name>`                 | Remove an MCP server              |

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);

package/src/commands/call.ts

@@ -4,7 +4,6 @@ import {
   formatCallResult,
   formatError,
   formatServerTools,
-  formatToolHelp,
   formatValidationErrors,
 } from "../output/formatter.ts";
 import { startSpinner } from "../output/spinner.ts";
@@ -30,18 +29,6 @@ export function registerCallCommand(program: Command) {
         return;
       }
       try {
-        // No args + interactive terminal → show tool help with example payload
-        const hasArgs = !!argsStr;
-        const hasStdin = !process.stdin.isTTY;
-        if (!hasArgs && !hasStdin) {
-          const toolSchema = await manager.getToolSchema(server, tool);
-          if (toolSchema) {
-            console.log(formatToolHelp(server, toolSchema, formatOptions));
-            await manager.close();
-            return;
-          }
-        }
-
         // Parse args from argument, stdin, or empty
         let args: Record<string, unknown> = {};