* feat(web): catalog vs read-only session launch model + apply --header (#1481, #1483) Per specification/v2_catalog_launch_config.md, `mcp-inspector --web` now selects the backend's server-list source and a session-wide writability, instead of seeding an inert `initialMcpConfig` the UI never read: - `--catalog <path>` (and `MCP_CATALOG_PATH`) → active WRITABLE catalog (seed/CRUD/watch), like the default catalog. - `--config <path>` → READ-ONLY session file: served in the UI but never written, seeded, or plaintext-secret-migrated — safe to point at a foreign config (e.g. claude_desktop_config.json). - ad-hoc `--server-url`/command (+ `--header`) → one server held IN MEMORY (no file written); `--header` is lifted onto the entry so the seeded connection actually uses it (closes the #1483 warn-only no-op). - nothing → default catalog (writable), unchanged. Backend (`createRemoteApp`): new `writable` + `initialServers` options. GET /api/servers branches three ways (in-memory / read-only file with no seed+no migrate / writable catalog); the four mutating routes return 403 when read-only; `/api/config` carries `writable`; the file watcher is skipped for in-memory sessions. `--catalog`/`--config` are mutually exclusive and neither combines with an ad-hoc target or `--header`; `--header` requires an ad-hoc HTTP/SSE server (clear errors otherwise — no silent no-op). UI: `useServerListWritable` reads `writable` from /api/config; the Servers screen hides add/edit/clone/remove/reorder/settings and shows a read-only banner when false. All new props default to writable=true (back-compatible). Docs: spec gaps G2/G3/G4 updated; launcher README documents the flags. Verified end-to-end against the built launcher: --config (writable:false, file byte-stable, mutations 403), ad-hoc --header (in-memory, header lifted), and --catalog (writable:true, POST persists). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor(web): address review — Mantine <Code> in read-only banner, clarify watcher comment - Replace raw <code> with Mantine <Code> in the read-only-session Alert (repo convention: prefer Mantine primitives over raw HTML). - Add a comment near `watchable` clarifying that a read-only `--config` file is still watched on purpose (read-only blocks UI writes, not external observation; `writable` does not gate watching). Deferred (per reviewer): consolidating useSandboxUrl + useServerListWritable into one useConfig hook to avoid the duplicate /api/config fetch — optional follow-up. The redundant ad-hoc header type-guard is kept as defensive. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
262 lines
8.2 KiB
TypeScript
262 lines
8.2 KiB
TypeScript
/**
|
|
* Config object for the web server (dev and prod). Passed in-process; no env handoff.
|
|
*/
|
|
|
|
import pino from "pino";
|
|
import type { Logger } from "pino";
|
|
import type { MCPConfig, MCPServerConfig } from "../../../core/mcp/types.ts";
|
|
// Import directly from the leaf module — not the `core/mcp/remote/index.ts`
|
|
// barrel — so Vite's config-time module graph doesn't pull in `createRemoteLogger`
|
|
// (which references `pino/browser.js`) or other browser-side re-exports that
|
|
// have no business showing up in this Node-only file's import chain.
|
|
import {
|
|
API_SERVER_ENV_VARS,
|
|
LEGACY_AUTH_TOKEN_ENV,
|
|
} from "../../../core/mcp/remote/constants.ts";
|
|
import type { InitialConfigPayload } from "../../../core/mcp/remote/node/server.ts";
|
|
import { resolveSandboxPort } from "./sandbox-controller.js";
|
|
|
|
export interface WebServerConfig {
|
|
port: number;
|
|
hostname: string;
|
|
authToken: string;
|
|
dangerouslyOmitAuth: boolean;
|
|
/** Single initial MCP server config, or null when no server specified. */
|
|
initialMcpConfig: MCPServerConfig | null;
|
|
/**
|
|
* Absolute path to the `mcp.json` file the backend reads (and writes/watches
|
|
* when {@link writable}). When undefined the backend falls back to the
|
|
* default catalog (`~/.mcp-inspector/mcp.json`). Set by the launcher for
|
|
* `--catalog <path>` (writable) or `--config <path>` (read-only session).
|
|
* Mutually exclusive with {@link initialServers} (#1481).
|
|
*/
|
|
mcpConfigPath: string | undefined;
|
|
/**
|
|
* When false, the server list is read-only for the session: the backend
|
|
* rejects `/api/servers` mutations and never seeds/migrates the file, and
|
|
* the web UI hides catalog CRUD. True for the default catalog and
|
|
* `--catalog`; false for `--config` and ad-hoc launches (#1481).
|
|
*/
|
|
writable: boolean;
|
|
/**
|
|
* In-memory server list served by the backend instead of reading a file —
|
|
* set by the launcher to seed an ad-hoc `--server-url` / command target
|
|
* (with `--header`) without writing any file. Implies `writable: false`.
|
|
* Mutually exclusive with {@link mcpConfigPath} (#1481/#1483).
|
|
*/
|
|
initialServers: MCPConfig | null;
|
|
storageDir: string | undefined;
|
|
allowedOrigins: string[];
|
|
/** Sandbox port (0 = dynamic). */
|
|
sandboxPort: number;
|
|
sandboxHost: string;
|
|
logger: Logger | undefined;
|
|
/** When true, open browser after server starts. */
|
|
autoOpen: boolean;
|
|
/** Root directory for static files (index.html, assets). When runner starts server in-process, pass path to dist/. */
|
|
staticRoot?: string;
|
|
}
|
|
|
|
function defaultEnvironmentFromProcess(
|
|
extra?: Record<string, string>,
|
|
): Record<string, string> {
|
|
const keys =
|
|
process.platform === "win32"
|
|
? [
|
|
"APPDATA",
|
|
"HOMEDRIVE",
|
|
"HOMEPATH",
|
|
"LOCALAPPDATA",
|
|
"PATH",
|
|
"PROCESSOR_ARCHITECTURE",
|
|
"SYSTEMDRIVE",
|
|
"SYSTEMROOT",
|
|
"TEMP",
|
|
"USERNAME",
|
|
"USERPROFILE",
|
|
"PROGRAMFILES",
|
|
]
|
|
: ["HOME", "LOGNAME", "PATH", "SHELL", "TERM", "USER"];
|
|
|
|
const out: Record<string, string> = {};
|
|
for (const key of keys) {
|
|
const value = process.env[key];
|
|
if (value && !value.startsWith("()")) {
|
|
out[key] = value;
|
|
}
|
|
}
|
|
if (extra) {
|
|
Object.assign(out, extra);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
/**
|
|
* Convert WebServerConfig.initialMcpConfig to the shape expected by GET /api/config.
|
|
*/
|
|
export function webServerConfigToInitialPayload(
|
|
config: WebServerConfig,
|
|
): InitialConfigPayload {
|
|
const mc = config.initialMcpConfig;
|
|
const defaultEnvironment = defaultEnvironmentFromProcess(
|
|
mc && "env" in mc && mc.env ? mc.env : undefined,
|
|
);
|
|
|
|
if (!mc) {
|
|
return { defaultEnvironment };
|
|
}
|
|
|
|
if (mc.type === "stdio" || mc.type === undefined) {
|
|
return {
|
|
defaultCommand: mc.command,
|
|
defaultArgs: mc.args ?? [],
|
|
defaultTransport: "stdio",
|
|
defaultCwd: mc.cwd,
|
|
defaultEnvironment,
|
|
};
|
|
}
|
|
if (mc.type === "sse") {
|
|
return {
|
|
defaultTransport: "sse",
|
|
defaultServerUrl: mc.url,
|
|
defaultEnvironment,
|
|
};
|
|
}
|
|
if (mc.type === "streamable-http") {
|
|
return {
|
|
defaultTransport: "streamable-http",
|
|
defaultServerUrl: mc.url,
|
|
defaultEnvironment,
|
|
};
|
|
}
|
|
// Forward-compat fallback: if a future SDK ships a new transport type the
|
|
// launcher hasn't taught us about yet, prefer streamable-http (the most
|
|
// permissive shape with `url`) over throwing. Worst case the UI shows the
|
|
// URL the user supplied; throwing here would deny the user a hint at
|
|
// startup. Add a real branch above once the type is known.
|
|
const c = mc as unknown as { url: string };
|
|
return {
|
|
defaultTransport: "streamable-http",
|
|
defaultServerUrl: c.url,
|
|
defaultEnvironment,
|
|
};
|
|
}
|
|
|
|
export function printServerBanner(
|
|
config: WebServerConfig,
|
|
actualPort: number,
|
|
resolvedToken: string,
|
|
sandboxUrl: string | undefined,
|
|
): string {
|
|
const baseUrl = `http://${config.hostname}:${actualPort}`;
|
|
const url =
|
|
config.dangerouslyOmitAuth || !resolvedToken
|
|
? baseUrl
|
|
: `${baseUrl}?${API_SERVER_ENV_VARS.AUTH_TOKEN}=${resolvedToken}`;
|
|
|
|
console.log(`\nMCP Inspector Web is up and running at:\n ${url}\n`);
|
|
if (sandboxUrl) {
|
|
console.log(` Sandbox (MCP Apps): ${sandboxUrl}\n`);
|
|
}
|
|
if (config.dangerouslyOmitAuth) {
|
|
console.log(" Auth: disabled (DANGEROUSLY_OMIT_AUTH)\n");
|
|
} else {
|
|
console.log(` Auth token: ${resolvedToken}\n`);
|
|
}
|
|
|
|
if (config.autoOpen) {
|
|
console.log("Opening browser...");
|
|
}
|
|
|
|
return url;
|
|
}
|
|
|
|
export interface BuildWebServerConfigOptions {
|
|
initialMcpConfig?: MCPServerConfig | null;
|
|
/** Catalog/session file the backend should serve; see {@link WebServerConfig.mcpConfigPath}. */
|
|
mcpConfigPath?: string;
|
|
/** Read-only when false; see {@link WebServerConfig.writable}. Defaults to true. */
|
|
writable?: boolean;
|
|
/** In-memory ad-hoc list; see {@link WebServerConfig.initialServers}. */
|
|
initialServers?: MCPConfig | null;
|
|
}
|
|
|
|
/**
|
|
* Build WebServerConfig from process.env and optional initial MCP server config.
|
|
* Used by the launcher runner, Vite dev (`buildWebServerConfigFromEnv`), and prod standalone.
|
|
*/
|
|
export function buildWebServerConfig(
|
|
options: BuildWebServerConfigOptions = {},
|
|
): WebServerConfig {
|
|
const {
|
|
initialMcpConfig = null,
|
|
mcpConfigPath,
|
|
writable = true,
|
|
initialServers = null,
|
|
} = options;
|
|
const port = parseInt(process.env.CLIENT_PORT ?? "6274", 10);
|
|
const hostname = process.env.HOST ?? "localhost";
|
|
const baseUrl = `http://${hostname}:${port}`;
|
|
const dangerouslyOmitAuth = !!process.env.DANGEROUSLY_OMIT_AUTH;
|
|
const authToken = dangerouslyOmitAuth
|
|
? ""
|
|
: ((process.env[API_SERVER_ENV_VARS.AUTH_TOKEN] as string | undefined) ??
|
|
(process.env[LEGACY_AUTH_TOKEN_ENV] as string | undefined) ??
|
|
"");
|
|
|
|
const sandboxPort = resolveSandboxPort();
|
|
|
|
let logger: Logger | undefined;
|
|
if (process.env.MCP_LOG_FILE) {
|
|
logger = pino(
|
|
{ level: "info" },
|
|
pino.destination({
|
|
dest: process.env.MCP_LOG_FILE,
|
|
append: true,
|
|
mkdir: true,
|
|
}),
|
|
);
|
|
}
|
|
|
|
return {
|
|
port,
|
|
hostname,
|
|
authToken,
|
|
dangerouslyOmitAuth,
|
|
initialMcpConfig,
|
|
mcpConfigPath,
|
|
writable,
|
|
initialServers,
|
|
storageDir: process.env.MCP_STORAGE_DIR,
|
|
allowedOrigins: process.env.ALLOWED_ORIGINS?.split(",").filter(Boolean) ?? [
|
|
baseUrl,
|
|
],
|
|
sandboxPort,
|
|
sandboxHost: hostname,
|
|
logger,
|
|
autoOpen: resolveAutoOpen(),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Build WebServerConfig from process.env only. Used by `vite dev` (the Hono dev plugin reads env, not argv).
|
|
*/
|
|
export function buildWebServerConfigFromEnv(): WebServerConfig {
|
|
return buildWebServerConfig({ initialMcpConfig: null });
|
|
}
|
|
|
|
/**
|
|
* Three-way resolution for `autoOpen`:
|
|
* - explicit `MCP_AUTO_OPEN_ENABLED=true` → always open (overrides VITEST)
|
|
* - explicit `MCP_AUTO_OPEN_ENABLED=false` → never open
|
|
* - anything else → open by default UNLESS Vitest
|
|
* is running (Vitest sets `VITEST=true`; vite.config.ts is shared with
|
|
* vitest projects and the Hono plugin would otherwise shell out to
|
|
* `open()` on every test invocation).
|
|
*/
|
|
function resolveAutoOpen(): boolean {
|
|
const flag = process.env.MCP_AUTO_OPEN_ENABLED;
|
|
if (flag === "true") return true;
|
|
if (flag === "false") return false;
|
|
return !process.env.VITEST;
|
|
}
|