**Reads were bounded by entry count but not by total bytes.** A manifest can sit at exactly 512 entries and declare a gigabyte each, so round 9's cap still let a server dictate unbounded bandwidth and time after `size-limit-exceeded` had already been reported. `boundedManifest` caps on both interoperability limits now. Sizes are summed exactly as `totalSkillBytes` sums them, so the bound and the finding that reports the overage cannot disagree about the total. A read is skipped only when the running total would CROSS the limit, so a conforming skill — at most 16 MiB by definition — is never truncated; there is a test for that, because a bound that protected against a hostile server by giving a wrong answer about a good one would be a poor trade. The self-file fallback still applies, so the mandatory frontmatter check survives either cap. **The `vitest.shared.mts` pin rationale had gone stale.** It said `yaml` is reached only through `test-servers/src`, which this PR made untrue by importing it from `core/mcp/skillFile.ts`. That comment is what a future dependency-placement change would read before removing or reclassifying the pin, so it now names the `core/` path and the bundler `external` lists that follow from it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ND46Ci64DC3tzBy9aG81Nc Signed-off-by: cliffhall <cliff@futurescale.com>
201 lines
7.8 KiB
TypeScript
201 lines
7.8 KiB
TypeScript
/**
|
|
* Vitest/Vite resolve aliases shared between clients/web and node clients
|
|
* (cli, tui). Pass each client's directory so bare-module pins resolve against
|
|
* that client's node_modules.
|
|
*/
|
|
|
|
import path from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
export function vitestSharedPaths(clientDir: string) {
|
|
const dirname = path.resolve(clientDir);
|
|
const repoRoot = path.resolve(dirname, "../..");
|
|
|
|
const sharedAliases = {
|
|
"@inspector/core": path.resolve(repoRoot, "core"),
|
|
"@modelcontextprotocol/inspector-test-server": path.resolve(
|
|
repoRoot,
|
|
"test-servers/build/index.js",
|
|
),
|
|
};
|
|
|
|
const sharedDedupe = [
|
|
"react",
|
|
"react-dom",
|
|
"@modelcontextprotocol/client",
|
|
"@modelcontextprotocol/core",
|
|
// Every SDK schema is a zod type, so a second copy breaks `instanceof`
|
|
// across the whole surface. The alias below picks the install; this keeps
|
|
// it to one copy within it.
|
|
"zod",
|
|
];
|
|
|
|
const nodeModulesAliases = [
|
|
{
|
|
find: /^react$/,
|
|
replacement: path.resolve(dirname, "node_modules/react"),
|
|
},
|
|
{
|
|
find: /^react\/jsx-runtime$/,
|
|
replacement: path.resolve(dirname, "node_modules/react/jsx-runtime.js"),
|
|
},
|
|
{
|
|
find: /^react\/jsx-dev-runtime$/,
|
|
replacement: path.resolve(
|
|
dirname,
|
|
"node_modules/react/jsx-dev-runtime.js",
|
|
),
|
|
},
|
|
{
|
|
find: /^react-dom$/,
|
|
replacement: path.resolve(dirname, "node_modules/react-dom"),
|
|
},
|
|
{
|
|
find: /^react-dom\/client$/,
|
|
replacement: path.resolve(dirname, "node_modules/react-dom/client.js"),
|
|
},
|
|
// Everything below is **root-owned** and resolves from the repo root,
|
|
// unlike the `react` / `react-dom` pins above. What they have in common is
|
|
// that no client declares them, so the root install is the only place a
|
|
// client's resolution chain is guaranteed to find one — not that they are
|
|
// all root `dependencies`: `express` is test-only and sits in the root
|
|
// `devDependencies`. Nor is this the complete root runtime set; a package
|
|
// no client install carries a copy of (`ajv`, `commander`, `undici`)
|
|
// resolves to the root on its own and needs no pin. Absence from this list
|
|
// is a statement about the installed tree, not about the manifests — check
|
|
// the tree before adding or removing an entry.
|
|
//
|
|
// `express` is reached only through `test-servers/src` (the http/oauth
|
|
// servers), which is root-owned code with no manifest of its own.
|
|
//
|
|
// `yaml` was too — `load-config.ts` — but is now also a `core/` runtime
|
|
// import: `core/mcp/skillFile.ts` parses a served SKILL.md's frontmatter
|
|
// for the SEP-2640 cross-check (#2248). That matters to anyone revisiting
|
|
// this pin: it is no longer removable by retiring a test-server path, and
|
|
// as a dependency `core/` imports it is additionally named in all three
|
|
// bundler `external` lists.
|
|
//
|
|
// Pointing these at `<client>/node_modules` is what broke when the MCP
|
|
// packages moved to the root (#1970): express was never declared by a client
|
|
// at all, it arrived in `clients/cli` as a peer of `express-rate-limit`
|
|
// under `@modelcontextprotocol/server-legacy`, so removing that manifest
|
|
// entry took express with it and every cli test that spawns a test server
|
|
// failed to resolve it.
|
|
{
|
|
find: /^express$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/express"),
|
|
},
|
|
{
|
|
find: /^yaml$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/yaml"),
|
|
},
|
|
// Same reasoning, one layer in: `proper-lockfile` is reached only through
|
|
// `core/` (the secrets file's cross-process lock, #2082), which is the
|
|
// other root-owned tree with no manifest of its own. Resolution finds the
|
|
// root copy on its own today — nothing declares it in a client — and this
|
|
// pin is what keeps that from depending on nothing ever arriving as some
|
|
// client's transitive dependency, which would otherwise give a test two
|
|
// copies of a module whose whole job is a single registry of held locks.
|
|
{
|
|
find: /^proper-lockfile$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/proper-lockfile"),
|
|
},
|
|
// The rest of the root-owned aliases, consolidated into the root manifest
|
|
// by #2195. Mostly `core/`'s runtime dependencies, but not only —
|
|
// `@hono/node-server` is reached from web client code alone and is here for
|
|
// the same resolution reason rather than because `core/` imports it. Each
|
|
// used to be declared by the clients that reached it and was pinned to
|
|
// `<client>/node_modules` accordingly; once the declarations went away
|
|
// those paths stopped existing, so the pin has to follow the package to
|
|
// the root. Left un-repointed they would resolve
|
|
// to a directory that is not there — or, worse, to a transitive copy some
|
|
// unrelated dependency happened to drag in, which is the duplicate this
|
|
// whole pin list exists to prevent.
|
|
{
|
|
find: /^pino$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/pino"),
|
|
},
|
|
{
|
|
find: /^pino\/browser\.js$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/pino/browser.js"),
|
|
},
|
|
{
|
|
find: /^hono$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/hono/dist/index.js"),
|
|
},
|
|
{
|
|
find: /^hono\/streaming$/,
|
|
replacement: path.resolve(
|
|
repoRoot,
|
|
"node_modules/hono/dist/helper/streaming/index.js",
|
|
),
|
|
},
|
|
{
|
|
find: /^@hono\/node-server$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/@hono/node-server"),
|
|
},
|
|
{
|
|
find: /^atomically$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/atomically"),
|
|
},
|
|
{
|
|
find: /^chokidar$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/chokidar"),
|
|
},
|
|
{
|
|
find: /^@napi-rs\/keyring$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/@napi-rs/keyring"),
|
|
},
|
|
// `zod` and `open` are pinned for a different reason from everything above:
|
|
// they resolve *somewhere* without help, and the somewhere is wrong. Both
|
|
// still sit at the top level of `clients/web/node_modules` as transitive
|
|
// copies — zod under `eslint-plugin-react-hooks`, open under Storybook —
|
|
// so an unpinned bare import from a web test resolves the client copy while
|
|
// `core/` and the SDK packages resolve the root's (Copilot).
|
|
//
|
|
// For `open` that is merely wasteful. For `zod` it is the hazard this file
|
|
// exists for: two copies in one process means a schema built by one and an
|
|
// `instanceof` check made by the other, across the entire
|
|
// `@modelcontextprotocol/*` surface. The versions are identical today and
|
|
// `verify:dep-lockstep` is what keeps them that way, but identical is not
|
|
// the same as single, and only a pin makes it single.
|
|
//
|
|
// `zod/v4` needs its own entry — first-party code imports both specifiers,
|
|
// and pinning only the bare one would split the package across two installs
|
|
// rather than collapse it.
|
|
{ find: /^zod$/, replacement: path.resolve(repoRoot, "node_modules/zod") },
|
|
{
|
|
find: /^zod\/v4$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/zod/v4/index.js"),
|
|
},
|
|
{
|
|
find: /^open$/,
|
|
replacement: path.resolve(repoRoot, "node_modules/open"),
|
|
},
|
|
];
|
|
|
|
const projectResolve = {
|
|
alias: [
|
|
...Object.entries(sharedAliases).map(([find, replacement]) => ({
|
|
find,
|
|
replacement,
|
|
})),
|
|
...nodeModulesAliases,
|
|
],
|
|
dedupe: sharedDedupe,
|
|
};
|
|
|
|
return {
|
|
repoRoot,
|
|
sharedAliases,
|
|
sharedDedupe,
|
|
nodeModulesAliases,
|
|
projectResolve,
|
|
};
|
|
}
|
|
|
|
/** Convenience for importers that only have import.meta.url. */
|
|
export function vitestSharedPathsFromMetaUrl(metaUrl: string) {
|
|
const clientDir = path.dirname(fileURLToPath(metaUrl));
|
|
return vitestSharedPaths(clientDir);
|
|
}
|