@goke/mcp 0.0.12 → 0.1.0

package/src/auth.ts

@@ -29,8 +29,10 @@ async function openBrowser(url: string): Promise<void> {
 
 /**
  * Start the OAuth flow for an MCP server.
- * This is an internal function - consumers should not call this directly.
- * It is automatically triggered by addMcpCommands when a 401 error occurs.
+ *
+ * Used internally by addMcpCommands on 401 errors, but also available
+ * for CLIs that need explicit control over the auth flow (e.g. a login
+ * command that runs the flow in a background daemon).
  *
  * This function:
  * 1. Starts a local callback server on a random port

package/src/index.ts

@@ -9,7 +9,6 @@
  *
  * - **Auto-discovery**: Fetches all tools from the MCP server and creates CLI commands
  * - **Caching**: Tools are cached for 1 hour to avoid reconnecting on every invocation
- * - **Session reuse**: MCP session IDs are cached to skip initialization handshake
  * - **Type-aware parsing**: Handles string, number, boolean, object, and array arguments
  * - **JSON schema support**: Generates CLI options from tool input schemas
  * - **OAuth support**: Automatic OAuth authentication on 401 errors (lazy auth)
@@ -48,13 +47,14 @@ import { wrapJsonSchema } from "goke";
 import yaml from "js-yaml";
 import { FileOAuthProvider } from "./oauth-provider.js";
 import { startOAuthFlow, isAuthRequiredError } from "./auth.js";
+export { startOAuthFlow } from "./auth.js";
 import type { McpOAuthConfig, McpOAuthState } from "./types.js";
 export { addCliToolsToMcp, createMcpAction } from "./cli-to-mcp.js";
 export type { AddCliToolsToMcpOptions, CreateMcpActionOptions } from "./cli-to-mcp.js";
 
-// Public exports - only types that consumers need
+// Public exports
 export type { Transport };
-export type { McpOAuthConfig, McpOAuthState } from "./types.js";
+export type { McpOAuthConfig, McpOAuthState, StartOAuthFlowOptions, OAuthFlowResult } from "./types.js";
 
 export interface CachedMcpTools {
   tools: Array<{
@@ -63,7 +63,6 @@ export interface CachedMcpTools {
     inputSchema?: unknown;
   }>;
   timestamp: number;
-  sessionId?: string;
 }
 
 const CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
@@ -90,12 +89,15 @@ export interface AddMcpCommandsOptions {
 
   /**
    * Returns a transport to connect to the MCP server, or null if not configured.
-   * If null is returned, no MCP tool commands will be registered.
-   * @param sessionId - Optional session ID from cache to reuse existing session
-   *
-   * @deprecated Use getMcpUrl + oauth instead for simpler setup
+   * Use this for stdio servers or any setup `getMcpUrl` cannot express.
    */
-  getMcpTransport?: (sessionId?: string) => Transport | null | Promise<Transport | null>;
+  getMcpTransport?: () => Transport | null | Promise<Transport | null>;
+
+  /**
+   * Argv used to decide whether to skip live discovery.
+   * Defaults to `process.argv.slice(2)`.
+   */
+  argv?: string[];
 
   /**
    * Extra headers for MCP HTTP requests (for example `Authorization`).
@@ -236,13 +238,26 @@ function isHelpOrMetaArgv(argv: string[]) {
   return argv.some((arg) => arg === "--help" || arg === "-h" || arg === "--version" || arg === "-v");
 }
 
-function createTransportWithAuth(
-  url: URL,
-  sessionId: string | undefined,
-  oauthState: McpOAuthState | undefined,
-  oauth: McpOAuthConfig | undefined,
-  headers?: Record<string, string>,
-): StreamableHTTPClientTransport {
+function matchesRegisteredCommand({ argv, cli }: { argv: string[]; cli: Goke }) {
+  const parts = argv.filter((arg) => !arg.startsWith("-"));
+  return cli.commands.some((cmd) => {
+    if (!cmd.name) return false;
+    const nameParts = cmd.name.split(" ");
+    return nameParts.every((part, i) => parts[i] === part);
+  });
+}
+
+function createTransportWithAuth({
+  url,
+  oauthState,
+  oauth,
+  headers,
+}: {
+  url: URL
+  oauthState?: McpOAuthState
+  oauth?: McpOAuthConfig
+  headers?: Record<string, string>
+}): StreamableHTTPClientTransport {
   let authProvider: FileOAuthProvider | undefined;
 
   if (oauth && oauthState?.tokens) {
@@ -261,7 +276,6 @@ function createTransportWithAuth(
 
   const hasHeaders = headers && Object.keys(headers).length > 0;
   return new StreamableHTTPClientTransport(url, {
-    sessionId,
     authProvider,
     requestInit: hasHeaders ? { headers } : undefined,
   });
@@ -273,7 +287,6 @@ function createTransportWithAuth(
  * Adds MCP tool commands to a goke CLI instance.
  *
  * Tools are cached for 1 hour to avoid connecting on every CLI invocation.
- * Session ID is also cached to skip MCP initialization handshake.
  *
  * OAuth is lazy - authentication only happens when a 401 error occurs.
  * After successful auth, the operation is automatically retried.
@@ -289,11 +302,10 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
     oauth,
     loadCache,
     saveCache,
+    argv = process.argv.slice(2),
   } = options;
 
-  // Helper to get transport - supports both old and new API
-  const getTransport = async (sessionId?: string): Promise<Transport | null> => {
-    // New API: getMcpUrl + oauth
+  const getTransport = async (): Promise<Transport | null> => {
     if (getMcpUrl) {
       const mcpUrl = getMcpUrl();
       if (!mcpUrl) {
@@ -303,12 +315,16 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
       const url = new URL(mcpUrl);
       const oauthState = oauth?.load();
 
-      return createTransportWithAuth(url, sessionId, oauthState, oauth, getHeaders?.());
+      return createTransportWithAuth({
+        url,
+        oauthState,
+        oauth,
+        headers: getHeaders?.(),
+      });
     }
 
-    // Legacy API: getMcpTransport
     if (getMcpTransport) {
-      return getMcpTransport(sessionId);
+      return getMcpTransport();
     }
 
     return null;
@@ -346,14 +362,17 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
   // Try to use cached tools first (fast path - no network)
   const cachedTools = loadCache();
   const isCacheValid = cachedTools && (Date.now() - cachedTools.timestamp) < CACHE_TTL_MS;
-  const helpOrMeta = isHelpOrMetaArgv(process.argv.slice(2));
+  const skipLiveDiscovery =
+    isHelpOrMetaArgv(argv) || matchesRegisteredCommand({ argv, cli });
 
   let tools: CachedMcpTools["tools"] | undefined;
-  let cachedSessionId: string | undefined;
 
   if (isCacheValid && cachedTools) {
     tools = cachedTools.tools;
-    cachedSessionId = cachedTools.sessionId;
+  } else if (skipLiveDiscovery) {
+    if (cachedTools) {
+      tools = cachedTools.tools;
+    }
   } else {
     const transport = await getTransport();
     if (transport) {
@@ -363,8 +382,6 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
         const result = await client.listTools();
         tools = result.tools;
 
-        const sessionId = (transport as { sessionId?: string }).sessionId;
-
         saveCache({
           tools: tools.map((t) => ({
             name: t.name,
@@ -372,11 +389,9 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
             inputSchema: t.inputSchema,
           })),
           timestamp: Date.now(),
-          sessionId,
         });
-        cachedSessionId = sessionId;
       } catch (err) {
-        const shouldAuth = isAuthRequiredError(err) && oauth && getMcpUrl && !helpOrMeta;
+        const shouldAuth = isAuthRequiredError(err) && oauth && getMcpUrl && !skipLiveDiscovery;
         if (shouldAuth) {
           const mcpUrl = getMcpUrl();
           if (mcpUrl) {
@@ -386,7 +401,7 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
             }
           }
         }
-        if (!helpOrMeta) {
+        if (!skipLiveDiscovery) {
           console.error(`Failed to connect to MCP server: ${err instanceof Error ? err.message : err}`);
         }
       } finally {
@@ -396,7 +411,6 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
 
     if (!tools && cachedTools) {
       tools = cachedTools.tools;
-      cachedSessionId = cachedTools.sessionId;
     }
   }
 
@@ -450,7 +464,7 @@ export async function addMcpCommands(options: AddMcpCommandsOptions): Promise<vo
       const parsedArgs = extractToolArguments(cliOptions, inputSchema);
 
       const executeWithRetry = async (isRetry = false): Promise<void> => {
-        const transport = await getTransport(isRetry ? undefined : cachedSessionId);
+        const transport = await getTransport();
         if (!transport) {
           console.error("MCP transport not available. Run login command first.");
           process.exit(1);