mcpcost 0.3.0 → 0.3.1

package/README.md

@@ -11,7 +11,7 @@ Every MCP server you configure hands your agent its tool definitions at the star
 ```
 $ npx mcpcost --config .mcp.json --tools 3
 
-mcpcost 0.3.0 · tool definitions your agent loads before the first prompt
+mcpcost 0.3.1 · tool definitions your agent loads before the first prompt
   .mcp.json
 
   server      source     result               tools  tokens  of 200k

package/dist/auth-cli.d.ts

@@ -1 +1,3 @@
+/** The default callback port. Fixed, because the registered client's redirect URI carries it; a random port would need a new registration every time. */
+export declare const DEFAULT_CALLBACK_PORT = 41379;
 export declare function authCommand(argv: string[]): Promise<number>;

package/dist/auth-cli.js

@@ -20,8 +20,9 @@ Usage
 Options
   --credentials <file>   the credentials file (default ~/.mcpcost/credentials.json, or $MCPCOST_CREDENTIALS)
   --scope <scope>        scope to ask for in the OAuth flow
+  --port <n>             local port for the callback (default 41379; the registered client is bound to it)
   --no-open              print the authorization URL, do not open the browser
-  --timeout <ms>         how long to wait for the consent (default 300000)
+  --timeout <ms>         how long to wait for the consent (default 600000)
 
 After the consent the server is measured once with the new credentials, so you see that it works.
 The daily board uses the same file through its MCPCOST credentials table; see the README.`;
@@ -36,8 +37,10 @@ function openBrowser(url) {
         // The URL is printed too.
     }
 }
+/** The default callback port. Fixed, because the registered client's redirect URI carries it; a random port would need a new registration every time. */
+export const DEFAULT_CALLBACK_PORT = 41379;
 /** Waits for one GET /callback?code=…&state=… on a local port. */
-function callbackServer(expectedState, timeoutMs) {
+function callbackServer(expectedState, timeoutMs, port) {
     return new Promise((resolveServer, rejectServer) => {
         let resolveCode = () => undefined;
         let rejectCode = () => undefined;
@@ -70,10 +73,12 @@ function callbackServer(expectedState, timeoutMs) {
         });
         const timer = setTimeout(() => rejectCode(new Error(`no callback within ${Math.round(timeoutMs / 1000)} s`)), timeoutMs);
         timer.unref();
-        server.on('error', rejectServer);
-        server.listen(0, '127.0.0.1', () => {
-            const port = server.address().port;
-            resolveServer({ redirectUrl: `http://127.0.0.1:${port}/callback`, code, close: () => { clearTimeout(timer); server.close(); } });
+        server.on('error', (err) => {
+            rejectServer(err.code === 'EADDRINUSE' ? new Error(`port ${port} is in use; pass --port <n> (the registered client is bound to the port)`) : err);
+        });
+        server.listen(port, '127.0.0.1', () => {
+            const bound = server.address().port;
+            resolveServer({ redirectUrl: `http://127.0.0.1:${bound}/callback`, code, close: () => { clearTimeout(timer); server.close(); } });
         });
     });
 }
@@ -86,8 +91,9 @@ export async function authCommand(argv) {
             list: { type: 'boolean', default: false },
             remove: { type: 'boolean', default: false },
             scope: { type: 'string' },
+            port: { type: 'string' },
             'no-open': { type: 'boolean', default: false },
-            timeout: { type: 'string', default: '300000' },
+            timeout: { type: 'string', default: '600000' },
             help: { type: 'boolean', default: false }
         },
         allowPositionals: true
@@ -145,8 +151,8 @@ export async function authCommand(argv) {
         return verify(store, key);
     }
     // The OAuth flow: discovery, registration, the consent in the browser, the token.
-    const timeoutMs = Number(values.timeout) || 300_000;
-    const cb = await callbackServer(() => provider.lastState, timeoutMs);
+    const timeoutMs = Number(values.timeout) || 600_000;
+    const cb = await callbackServer(() => provider.lastState, timeoutMs, Number(values.port) || DEFAULT_CALLBACK_PORT);
     const provider = createProvider(store, key, {
         redirectUrl: cb.redirectUrl,
         scope: values.scope,
@@ -154,7 +160,7 @@ export async function authCommand(argv) {
             console.log(`\nOpen this URL and allow the access:\n  ${url}\n`);
             if (!values['no-open'])
                 openBrowser(url.toString());
-            console.log('Waiting for the consent…');
+            console.log(`Waiting for the consent, up to ${Math.round(timeoutMs / 60_000)} minutes…`);
         }
     });
     try {

package/dist/core.d.ts

@@ -1,8 +1,8 @@
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
 import type { ProbeResult, ProbeStatus, RemoteTransport } from './types.js';
-export declare const VERSION = "0.3.0";
-export declare const USER_AGENT = "mcpcost/0.3.0 (mcpcost; +https://github.com/ondraulehla/mcpcost)";
+export declare const VERSION = "0.3.1";
+export declare const USER_AGENT = "mcpcost/0.3.1 (mcpcost; +https://github.com/ondraulehla/mcpcost)";
 export interface RawTool {
     name: string;
     description?: string;

package/dist/core.js

@@ -6,7 +6,7 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-export const VERSION = '0.3.0';
+export const VERSION = '0.3.1';
 export const USER_AGENT = `mcpcost/${VERSION} (mcpcost; +https://github.com/ondraulehla/mcpcost)`;
 export function emptyResult(url, transport) {
     return { url, transport, probedAt: new Date().toISOString(), status: 'error', latencyMs: {} };

package/dist/credentials.js

@@ -69,6 +69,14 @@ export function createProvider(store, url, options = {}) {
         oauth.scope = options.scope;
     const redirectUrl = options.redirectUrl ?? 'http://127.0.0.1/callback';
     let changed = false;
+    // A client registered for another redirect URI (an earlier port) cannot be used; register again.
+    if (options.onRedirect && oauth.clientInformation && !oauth.tokens) {
+        const uris = oauth.clientInformation.redirect_uris;
+        if (uris && !uris.includes(redirectUrl)) {
+            delete oauth.clientInformation;
+            changed = true;
+        }
+    }
     let verifier;
     let state;
     const touched = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcpcost",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "What do your MCP servers cost in context tokens? Measures every server in your config, exact counts for Claude, a budget for CI.",
   "keywords": [
     "mcp",