modelcontextprotocol/inspector
Watch
1
0
Fork
You've already forked inspector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "First pass at pulling the v1.5 CLI, TUI, and Launcher clients into v2."

Browse source 
This reverts commit 467b01edd6.
This commit is contained in:
Bob Dickinson 2026-06-09 21:56:38 -07:00
commit 62d442b073
3 changed files with 203 additions and 24043 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/mcp/inspectorClient.ts
View file

@ -119,7 +119,8 @@ import {
} from "./urlElicitation.js";
import type { AuthGuidedState, OAuthStep } from "../auth/types.js";
import type { OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.js";
import { silentLogger, type InspectorLogger } from "../logging/logger.js";
import type pino from "pino";
import { silentLogger } from "../logging/logger.js";
import { createFetchTracker } from "./fetchTracking.js";
import { OAuthManager, type OAuthManagerConfig } from "./oauthManager.js";
@ -196,7 +197,7 @@ export class InspectorClient extends InspectorClientEventTarget {
private receiverTaskRecords: Map<string, ReceiverTaskRecord> = new Map();
// OAuth support (config owned by oauthManager; client delegates and uses !!oauthManager for "is OAuth configured")
private oauthManager: OAuthManager | null = null;
private logger: InspectorLogger;
private logger: pino.Logger;
private transportClientFactory: CreateTransport;
private fetchFn?: typeof fetch;
private effectiveAuthFetch: typeof fetch;

25
core/mcp/node/config.ts
View file

@ -1,6 +1,5 @@
import { existsSync, readFileSync } from "fs";
import { resolve } from "path";
import { getDefaultMcpConfigPath } from "../../storage/store-io.js";
import type {
MCPConfig,
MCPServerConfig,
@ -212,24 +211,6 @@ function applyOverrides(
export type ResolveServerConfigsMode = "single" | "multi";
export function hasAdHocServerOptions(options: ServerConfigOptions): boolean {
return (
(options.target != null && options.target.length > 0) ||
Boolean(options.transport) ||
Boolean(options.serverUrl?.trim())
);
}
/** When no --config and no ad-hoc target, use ~/.mcp-inspector/mcp.json (same as web). */
export function withDefaultConfigPath(
options: ServerConfigOptions,
): ServerConfigOptions {
if (options.configPath?.trim() || hasAdHocServerOptions(options)) {
return options;
}
return { ...options, configPath: getDefaultMcpConfigPath() };
}
/**
* Resolves server config(s) from options and mode. Used by all runners.
* Single mode: one config (from file + overrides, or from args).
@ -239,9 +220,11 @@ export function resolveServerConfigs(
options: ServerConfigOptions,
mode: ResolveServerConfigsMode,
): MCPServerConfig[] {
options = withDefaultConfigPath(options);
const hasConfigPath = Boolean(options.configPath?.trim());
const hasAdHoc = hasAdHocServerOptions(options);
const hasAdHoc =
(options.target && options.target.length > 0) ||
Boolean(options.transport) ||
Boolean(options.serverUrl);
if (mode === "single") {
if (hasConfigPath && options.serverName) {

4
core/mcp/types.ts
View file

@ -21,7 +21,7 @@ import type {
import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
import type { InspectorLogger } from "../logging/logger.js";
import type pino from "pino";
import type { JsonValue } from "../json/jsonUtils.js";
import type {
OAuthNavigation,
@ -524,7 +524,7 @@ export interface InspectorClientEnvironment {
* - Node: pino file logger
* - Browser: createRemoteLogger
*/
logger?: InspectorLogger;
logger?: pino.Logger;
/**
* OAuth environment components