Integrate progress notification support with PR modelcontextprotocol#373 timeout configuration

Merged with feat-cli-server-request-configs branch and refactored to use
the existing RequestOptions from the SDK instead of custom timeout types.

Changes:
- Use SDK RequestOptions type instead of custom TimeoutOptions interface
- Pass mcpRequestOptions from CLI args through to callTool()
- Add onprogress callback when resetTimeoutOnProgress is enabled
- Remove duplicate CLI option definitions (already in PR modelcontextprotocol#373)
- Remove debug logging

This completes the implementation of progress notification capture and
timeout reset functionality for CLI mode, building on the timeout flag
support added in PR modelcontextprotocol#373.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: olaservo

cli/src/client/tools.ts

@@ -1,6 +1,7 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import type { Progress } from "@modelcontextprotocol/sdk/types.js";
 import { CallToolResultSchema, Tool } from "@modelcontextprotocol/sdk/types.js";
+import { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import { McpResponse } from "./types.js";
 
 // JSON value type matching the client utils
@@ -79,17 +80,11 @@ function convertParameters(
   return result;
 }
 
-export interface TimeoutOptions {
-  requestTimeout?: number;
-  resetTimeoutOnProgress?: boolean;
-  maxTotalTimeout?: number;
-}
-
 export async function callTool(
   client: Client,
   name: string,
   args: Record<string, JsonValue>,
-  timeoutOptions?: TimeoutOptions,
+  requestOptions?: RequestOptions,
 ): Promise<McpResponse> {
   try {
     const toolsResponse = await listTools(client);
@@ -114,31 +109,15 @@ export async function callTool(
       }
     }
 
-    // Prepare SDK request options with timeout configuration
-    const requestOptions: {
-      timeout?: number;
-      resetTimeoutOnProgress?: boolean;
-      maxTotalTimeout?: number;
-      onprogress?: (params: Progress) => void;
-    } = {};
-
-    if (timeoutOptions?.requestTimeout !== undefined) {
-      requestOptions.timeout = timeoutOptions.requestTimeout;
-    }
-
-    if (timeoutOptions?.resetTimeoutOnProgress !== undefined) {
-      requestOptions.resetTimeoutOnProgress =
-        timeoutOptions.resetTimeoutOnProgress;
-    }
-
-    if (timeoutOptions?.maxTotalTimeout !== undefined) {
-      requestOptions.maxTotalTimeout = timeoutOptions.maxTotalTimeout;
-    }
+    // Prepare SDK request options with timeout configuration and progress callback
+    const options: RequestOptions = {
+      ...requestOptions,
+    };
 
     // If progress notifications are enabled, add an onprogress hook
     // This is required by SDK to reset the timeout on progress notifications
-    if (requestOptions.resetTimeoutOnProgress) {
-      requestOptions.onprogress = (params: Progress) => {
+    if (options.resetTimeoutOnProgress) {
+      options.onprogress = (params: Progress) => {
         // Display progress notification to stderr (so it doesn't interfere with JSON output on stdout)
         const progressInfo = {
           method: "notifications/progress",
@@ -159,7 +138,7 @@ export async function callTool(
         },
       },
       CallToolResultSchema,
-      requestOptions,
+      options,
     );
     return response;
   } catch (error) {

cli/src/index.ts

@@ -47,9 +47,6 @@ type Args = {
   maxTotalTimeout?: number;
   transport?: "sse" | "stdio" | "http";
   headers?: Record<string, string>;
-  requestTimeout?: number;
-  resetTimeoutOnProgress?: boolean;
-  maxTotalTimeout?: number;
 };
 
 function createTransportOptions(
@@ -150,11 +147,12 @@ async function callMethod(args: Args): Promise<void> {
         );
       }
 
-      result = await callTool(client, args.toolName, args.toolArg || {}, {
-        requestTimeout: args.requestTimeout,
-        resetTimeoutOnProgress: args.resetTimeoutOnProgress,
-        maxTotalTimeout: args.maxTotalTimeout,
-      });
+      result = await callTool(
+        client,
+        args.toolName,
+        args.toolArg || {},
+        mcpRequestOptions,
+      );
     }
     // Resources methods
     else if (args.method === "resources/list") {
@@ -378,47 +376,6 @@ function parseArgs(): Args {
       'HTTP headers as "HeaderName: Value" pairs (for HTTP/SSE transports)',
       parseHeaderPair,
       {},
-    )
-    //
-    // Request timeout options
-    //
-    .option(
-      "--request-timeout <milliseconds>",
-      "Timeout for individual MCP requests in milliseconds",
-      (value: string) => {
-        const timeout = parseInt(value, 10);
-        if (isNaN(timeout) || timeout <= 0) {
-          throw new Error(
-            `Invalid request timeout: ${value}. Must be a positive integer.`,
-          );
-        }
-        return timeout;
-      },
-    )
-    .option(
-      "--reset-timeout-on-progress <boolean>",
-      "Reset request timeout when progress notifications are received (true/false)",
-      (value: string) => {
-        if (value !== "true" && value !== "false") {
-          throw new Error(
-            `Invalid reset-timeout-on-progress value: ${value}. Must be 'true' or 'false'.`,
-          );
-        }
-        return value === "true";
-      },
-    )
-    .option(
-      "--max-total-timeout <milliseconds>",
-      "Maximum total timeout for requests including progress resets in milliseconds",
-      (value: string) => {
-        const timeout = parseInt(value, 10);
-        if (isNaN(timeout) || timeout <= 0) {
-          throw new Error(
-            `Invalid max total timeout: ${value}. Must be a positive integer.`,
-          );
-        }
-        return timeout;
-      },
     );
 
   // Parse only the arguments before --