@procedures/mcp-server 0.8.0 → 0.9.0

package/dist/host.d.ts

@@ -0,0 +1,168 @@
+/**
+ * The MCP host: one factory for each MCP server of procedures (CLI-10).
+ *
+ * Before, each MCP server built the same parts by hand. The parts are the redirect of
+ * `console.log`, the tool surface, the read-only narrowing and the host policy. The options of
+ * `ProcedureServer` and the `McpServerTransport` are parts too. The dev-tools server (`mark mcp`), `mcp.serve` and the Graph host each had a
+ * copy. `createMcpHost()` builds them from one set of options:
+ *
+ * - The procedures: a registry, modules, or both.
+ * - The tools: a surface (namespaces less some keys), a list of keys or patterns, or a function.
+ * - `readOnly`: the tools are only the procedures that change nothing, and each call has that
+ *   capability.
+ * - The host policy (`hostPolicy()` of the core): the call policy (strict by default), the time
+ *   limit, the interceptors and the capability. The host does not build the options of
+ *   `ProcedureServer` by hand.
+ * - The faces: stdio, Streamable HTTP, and SDK transports. The stdio face stops the host when its
+ *   input ends.
+ * - What each tool call gets: the questions to the person (elicitation, with the consents of the
+ *   operator), the progress, the envelopes of untrusted text, and the instructions of the server.
+ */
+import type { Transport as SdkTransport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { ProcedureServer, type ElicitationPolicy, type HostPolicy, type HostPolicyOptions, type Interceptor, type ProcedureModule, type ProcedurePath, type ProcedureRegistry, type ProcedureServerOptions, type Duration } from "@procedures/client";
+import { type McpTool, type McpToolFilter } from "@procedures/mcp";
+import { McpServerTransport } from "./transport/mcp-transport.js";
+import type { HttpTransportOptions, McpServerTransportState, McpToolContentHook, StdioTransportOptions } from "./types.js";
+import type { UntrustedContentOptions } from "./untrusted.js";
+/** The stdio face of a host. */
+export interface McpStdioFace extends Omit<StdioTransportOptions, "onEnd"> {
+    /** True (the default): the host stops when the input ends. */
+    stopOnEnd?: boolean | undefined;
+    /** True (the default): `console.log` writes to stderr from `start()` on, so stdout carries only the protocol. */
+    redirectConsole?: boolean | undefined;
+}
+/** The faces of a host. Each face is one `McpServerTransport` on the same server. */
+export interface McpHostFaces {
+    /** The face over the standard input and output. `true`: `process.stdin` and `process.stdout`. */
+    stdio?: boolean | McpStdioFace | undefined;
+    /**
+     * The face over Streamable HTTP. Without a token of its own, it takes the token of the policy,
+     * and without origins of its own, the permitted origins of the policy.
+     */
+    http?: HttpTransportOptions | undefined;
+    /** SDK transports to connect: the in-memory transport of a test, or an embedding. */
+    sdk?: SdkTransport | readonly SdkTransport[] | undefined;
+}
+/** The options of `ProcedureServer` that the host policy does not give. */
+export type McpHostServerOptions = Omit<ProcedureServerOptions, "registry" | "expose" | "strictCalls" | "interceptors" | "capability" | "clearanceOrder" | "resources" | "admitItem" | "token" | "principalOf" | "events">;
+/** What a function of interceptors gets: the registry and the expose rule of the host. */
+export interface McpHostParts {
+    readonly registry: ProcedureRegistry;
+    readonly expose: ((path: ProcedurePath) => boolean) | undefined;
+}
+/** The options of `createMcpHost()`. */
+export interface McpHostOptions {
+    /** The registry of the procedures. Without it: a new registry of `modules`, or the global registry. */
+    registry?: ProcedureRegistry | undefined;
+    /** Modules of procedures. With `registry`, the host registers them in it. */
+    modules?: readonly ProcedureModule[] | undefined;
+    /**
+     * The tools: a surface (namespaces less some keys), keys and patterns (`git.status`, `git.*`,
+     * `*`), or a function of the path. Without it: each procedure of the registry.
+     */
+    surface?: HostPolicyOptions["expose"];
+    /** Keys that are not tools, also when the surface matches them. */
+    exclude?: readonly string[] | undefined;
+    /**
+     * True: the tools are only the procedures that change nothing (`effects.writes` is empty), and
+     * each call has that capability (`narrowCapability`).
+     */
+    readOnly?: boolean | undefined;
+    /**
+     * More of the host policy: `strictCalls`, `timeout`, `interceptors`, `capability`, `resources`,
+     * `token`, `browser`. Strict calls are the safe default of an MCP host: a procedure of code
+     * without `metadata.calls` calls only tools. To turn them off, give `strictCalls: false`.
+     */
+    policy?: Omit<HostPolicyOptions, "expose" | "exclude" | "readOnly"> | undefined;
+    /**
+     * Interceptors that need the parts of the host: a list, or a function of the registry and the
+     * expose rule (the check of a program before it starts). They come after `policy.interceptors`.
+     */
+    interceptors?: readonly Interceptor[] | ((parts: McpHostParts) => readonly Interceptor[]) | undefined;
+    /** The options of `ProcedureServer` that the policy does not give: `autoRegister`, `collections`, `idempotency`. */
+    serverOptions?: McpHostServerOptions | undefined;
+    /** The name of the server for the MCP client. The default is `"procedure-server"`. */
+    name?: string | undefined;
+    /** The version of the server for the MCP client. The default is `"1.0.0"`. */
+    version?: string | undefined;
+    /** The instructions of the server: the MCP client gives them to the model. */
+    instructions?: string | undefined;
+    /** The faces of the host. The default is `{ stdio: true }`. */
+    faces?: McpHostFaces | undefined;
+    /** The rules of the questions to the person (CLI-12): `ask`, `operatorConsent`, `timeout`. */
+    elicitation?: ElicitationPolicy | undefined;
+    /** The envelopes of the output fields with text from outside the host (`metadata.untrusted`). */
+    untrusted?: UntrustedContentOptions | undefined;
+    /** The content hook: other text blocks for a successful result that is a value. */
+    content?: McpToolContentHook | undefined;
+    /** The JSON of the default text blocks: `"pretty"` (the default) or `"compact"` on one line. */
+    json?: "pretty" | "compact" | undefined;
+    /** More filters of the tools: tags, internal procedures. The surface gives the main rule. */
+    toolFilter?: Omit<McpToolFilter, "include"> | undefined;
+    /** The name of the tool of a procedure, for example `(path) => path.join("_")`. The default is `git.status`. */
+    toolName?: ((path: readonly string[]) => string) | undefined;
+    /** The limits of a stream that can continue without an end. */
+    streamLimits?: {
+        items?: number;
+        time?: Duration;
+    } | undefined;
+    /** True: debug lines go to stderr. */
+    debug?: boolean | undefined;
+}
+/** The state of a host: if it operates, and the state of each face. */
+export interface McpHostState {
+    readonly running: boolean;
+    readonly faces: readonly McpServerTransportState[];
+}
+/** An MCP host: its registry, its policy, its server and its faces. */
+export interface McpHost {
+    readonly registry: ProcedureRegistry;
+    readonly policy: HostPolicy;
+    readonly server: ProcedureServer;
+    /** The expose rule of the host: the procedures that are tools. Undefined: each procedure. */
+    readonly expose: ((path: ProcedurePath) => boolean) | undefined;
+    /** The MCP transports of the faces, in the order stdio, Streamable HTTP, SDK transports. */
+    readonly transports: readonly McpServerTransport[];
+    /** A promise that resolves when the host stopped: by `stop()`, or at the end of the stdio input. */
+    readonly closed: Promise<void>;
+    /** This function starts each face. */
+    start(): Promise<void>;
+    /** This function stops the server and each face. The calls in flight get the grace time. */
+    stop(options?: {
+        grace?: Duration | undefined;
+    }): Promise<void>;
+    /** The tools of the host at this time, from the registry and the expose rule. */
+    tools(): McpTool[];
+    /** The state of the host and of its faces. */
+    state(): McpHostState;
+}
+/**
+ * This function sends `console.log` to stderr. Over stdio, stdout carries the protocol: a stray
+ * `console.log` of a procedure or a dependency corrupts it. The MCP SDK writes with
+ * `process.stdout.write`, so it is not affected. A second call changes nothing.
+ */
+export declare function redirectConsoleToStderr(): void;
+/**
+ * The expose rule of a host: the surface less the excluded keys, and with `readOnly` only the
+ * procedures that the read-only capability permits. The rule reads the registry at each call,
+ * so a procedure that is registered later gets the same rule.
+ */
+export declare function mcpExposeRule(registry: ProcedureRegistry, options: Pick<McpHostOptions, "surface" | "exclude" | "readOnly">): ((path: ProcedurePath) => boolean) | undefined;
+/**
+ * This function builds an MCP host. It starts nothing: `start()` starts the faces. A host
+ * stops one time.
+ *
+ * @example
+ * ```typescript
+ * const host = createMcpHost({
+ *   registry: createRegistry(graphModule),
+ *   surface: { namespaces: ["graph"] },
+ *   readOnly: process.argv.includes("--read-only"),
+ *   name: "graph",
+ *   version: "0.1.0",
+ * });
+ * await host.start();
+ * ```
+ */
+export declare function createMcpHost(options?: McpHostOptions): McpHost;
+//# sourceMappingURL=host.d.ts.map

package/dist/host.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../src/host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAEL,eAAe,EAOf,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAwB,KAAK,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAc,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EACV,oBAAoB,EAEpB,uBAAuB,EACvB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAE9D,gCAAgC;AAChC,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxE,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,iHAAiH;IACjH,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,qFAAqF;AACrF,MAAM,WAAW,YAAY;IAC3B,iGAAiG;IACjG,KAAK,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CAAC;IAC3C;;;OAGG;IACH,IAAI,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxC,qFAAqF;IACrF,GAAG,CAAC,EAAE,YAAY,GAAG,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;CAC1D;AAED,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,sBAAsB,EACpB,UAAU,GACV,QAAQ,GACR,aAAa,GACb,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,WAAW,GACX,WAAW,GACX,OAAO,GACP,aAAa,GACb,QAAQ,CACX,CAAC;AAEF,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;CACjE;AAED,wCAAwC;AACxC,MAAM,WAAW,cAAc;IAC7B,uGAAuG;IACvG,QAAQ,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,GAAG,SAAS,CAAC;IACjD;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACtC,mEAAmE;IACnE,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC,GAAG,SAAS,CAAC;IAChF;;;OAGG;IACH,YAAY,CAAC,EAAE,SAAS,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,SAAS,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACtG,oHAAoH;IACpH,aAAa,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACjD,sFAAsF;IACtF,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,+DAA+D;IAC/D,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,8FAA8F;IAC9F,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,iGAAiG;IACjG,SAAS,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAChD,mFAAmF;IACnF,OAAO,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACzC,gGAAgG;IAChG,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IACxC,6FAA6F;IAC7F,UAAU,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;IACxD,gHAAgH;IAChH,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAC7D,+DAA+D;IAC/D,YAAY,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;KAAE,GAAG,SAAS,CAAC;IAC/D,sCAAsC;IACtC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B;AAED,uEAAuE;AACvE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,uBAAuB,EAAE,CAAC;CACpD;AAED,uEAAuE;AACvE,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,6FAA6F;IAC7F,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;IAChE,4FAA4F;IAC5F,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACnD,oGAAoG;IACpG,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,sCAAsC;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,4FAA4F;IAC5F,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,iFAAiF;IACjF,KAAK,IAAI,OAAO,EAAE,CAAC;IACnB,8CAA8C;IAC9C,KAAK,IAAI,YAAY,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAQ9C;AAUD;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC,GAChE,CAAC,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,SAAS,CAYhD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAyGnE"}

package/dist/host.js

@@ -0,0 +1,182 @@
+/**
+ * The MCP host: one factory for each MCP server of procedures (CLI-10).
+ *
+ * Before, each MCP server built the same parts by hand. The parts are the redirect of
+ * `console.log`, the tool surface, the read-only narrowing and the host policy. The options of
+ * `ProcedureServer` and the `McpServerTransport` are parts too. The dev-tools server (`mark mcp`), `mcp.serve` and the Graph host each had a
+ * copy. `createMcpHost()` builds them from one set of options:
+ *
+ * - The procedures: a registry, modules, or both.
+ * - The tools: a surface (namespaces less some keys), a list of keys or patterns, or a function.
+ * - `readOnly`: the tools are only the procedures that change nothing, and each call has that
+ *   capability.
+ * - The host policy (`hostPolicy()` of the core): the call policy (strict by default), the time
+ *   limit, the interceptors and the capability. The host does not build the options of
+ *   `ProcedureServer` by hand.
+ * - The faces: stdio, Streamable HTTP, and SDK transports. The stdio face stops the host when its
+ *   input ends.
+ * - What each tool call gets: the questions to the person (elicitation, with the consents of the
+ *   operator), the progress, the envelopes of untrusted text, and the instructions of the server.
+ */
+import { PROCEDURE_REGISTRY, ProcedureServer, capabilityRefusal, createRegistry, hostPolicy, narrowCapability, procedureServerOptions, registerModules, } from "@procedures/client";
+import { proceduresToMcpTools } from "@procedures/mcp";
+import { McpServerTransport, namedTools } from "./transport/mcp-transport.js";
+/**
+ * This function sends `console.log` to stderr. Over stdio, stdout carries the protocol: a stray
+ * `console.log` of a procedure or a dependency corrupts it. The MCP SDK writes with
+ * `process.stdout.write`, so it is not affected. A second call changes nothing.
+ */
+export function redirectConsoleToStderr() {
+    const marked = console.log;
+    if (marked.mcpRedirected)
+        return;
+    const log = (...args) => {
+        console.error(...args);
+    };
+    log.mcpRedirected = true;
+    console.log = log;
+}
+/** True when the SDK option of the faces is a list of transports. */
+function isTransportList(value) {
+    return Array.isArray(value);
+}
+/** The read-only capability of a host: no effect can write. */
+const READ_ONLY_REQUEST = { effects: { writes: [] } };
+/**
+ * The expose rule of a host: the surface less the excluded keys, and with `readOnly` only the
+ * procedures that the read-only capability permits. The rule reads the registry at each call,
+ * so a procedure that is registered later gets the same rule.
+ */
+export function mcpExposeRule(registry, options) {
+    const base = hostPolicy({
+        ...(options.surface !== undefined ? { expose: options.surface } : {}),
+        ...(options.exclude !== undefined ? { exclude: options.exclude } : {}),
+    }).expose;
+    if (options.readOnly !== true)
+        return base;
+    const capability = narrowCapability(undefined, READ_ONLY_REQUEST);
+    return (path) => {
+        if (base && !base(path))
+            return false;
+        const procedure = registry.get(path);
+        return procedure !== undefined && capabilityRefusal(procedure, capability) === undefined;
+    };
+}
+/**
+ * This function builds an MCP host. It starts nothing: `start()` starts the faces. A host
+ * stops one time.
+ *
+ * @example
+ * ```typescript
+ * const host = createMcpHost({
+ *   registry: createRegistry(graphModule),
+ *   surface: { namespaces: ["graph"] },
+ *   readOnly: process.argv.includes("--read-only"),
+ *   name: "graph",
+ *   version: "0.1.0",
+ * });
+ * await host.start();
+ * ```
+ */
+export function createMcpHost(options = {}) {
+    const registry = options.registry ?? (options.modules ? createRegistry(...options.modules) : PROCEDURE_REGISTRY);
+    if (options.registry && options.modules)
+        registerModules(registry, [...options.modules]);
+    const expose = mcpExposeRule(registry, options);
+    const parts = { registry, expose };
+    const hostInterceptors = typeof options.interceptors === "function" ? options.interceptors(parts) : (options.interceptors ?? []);
+    const interceptors = [...(options.policy?.interceptors ?? []), ...hostInterceptors];
+    const policy = hostPolicy({
+        strictCalls: true,
+        ...options.policy,
+        ...(expose ? { expose } : {}),
+        ...(options.readOnly === true ? { readOnly: true } : {}),
+        ...(interceptors.length > 0 ? { interceptors } : {}),
+    });
+    const server = new ProcedureServer({ ...procedureServerOptions(policy, registry), ...options.serverOptions });
+    let resolveClosed = () => undefined;
+    const closed = new Promise((resolve) => {
+        resolveClosed = resolve;
+    });
+    let stopping;
+    let running = false;
+    const stop = (stopOptions = {}) => {
+        stopping ??= server
+            .stop(stopOptions.grace !== undefined ? { grace: stopOptions.grace } : {})
+            .finally(() => {
+            running = false;
+            resolveClosed();
+        });
+        return stopping;
+    };
+    // What each face shares: the tools, the server info and what each call gets
+    const toolFilter = { ...options.toolFilter, ...(policy.expose ? { include: policy.expose } : {}) };
+    const common = {
+        registry,
+        serverInfo: { name: options.name ?? "procedure-server", version: options.version ?? "1.0.0" },
+        toolFilter,
+        ...(options.toolName ? { toolName: options.toolName } : {}),
+        ...(options.instructions !== undefined ? { instructions: options.instructions } : {}),
+        ...(options.elicitation ? { elicitation: options.elicitation } : {}),
+        ...(options.untrusted ? { untrusted: options.untrusted } : {}),
+        ...(options.content ? { content: options.content } : {}),
+        ...(options.json ? { json: options.json } : {}),
+        ...(options.streamLimits ? { streamLimits: options.streamLimits } : {}),
+        ...(options.debug !== undefined ? { debug: options.debug } : {}),
+    };
+    const faces = options.faces ?? { stdio: true };
+    const transports = [];
+    const stdio = faces.stdio === true ? {} : faces.stdio === false ? undefined : faces.stdio;
+    if (stdio) {
+        transports.push(new McpServerTransport(server, {
+            ...common,
+            transport: "stdio",
+            stdio: {
+                ...(stdio.stdin ? { stdin: stdio.stdin } : {}),
+                ...(stdio.stdout ? { stdout: stdio.stdout } : {}),
+                ...(stdio.stopOnEnd !== false ? { onEnd: () => void stop() } : {}),
+            },
+        }));
+    }
+    if (faces.http) {
+        // The HTTP face keeps the token and the origins of the policy (CLI-11 moves the checks to the host)
+        const policyOrigins = policy.browser.allowedOrigins;
+        const allowedOrigins = faces.http.allowedOrigins ?? (Array.isArray(policyOrigins) ? policyOrigins : undefined);
+        const token = faces.http.token ?? policy.token;
+        transports.push(new McpServerTransport(server, {
+            ...common,
+            transport: "http",
+            httpOptions: {
+                ...faces.http,
+                ...(token !== undefined ? { token } : {}),
+                ...(allowedOrigins ? { allowedOrigins: [...allowedOrigins] } : {}),
+            },
+        }));
+    }
+    const sdkTransports = faces.sdk === undefined ? [] : isTransportList(faces.sdk) ? faces.sdk : [faces.sdk];
+    for (const sdkTransport of sdkTransports) {
+        transports.push(new McpServerTransport(server, { ...common, sdkTransport }));
+    }
+    for (const transport of transports)
+        server.addTransport(transport);
+    return {
+        registry,
+        policy,
+        server,
+        expose: policy.expose,
+        transports,
+        closed,
+        async start() {
+            if (stopping)
+                throw new Error("This MCP host stopped. A host stops one time: create a new host.");
+            if (stdio && stdio.redirectConsole !== false)
+                redirectConsoleToStderr();
+            await server.start();
+            running = true;
+        },
+        stop,
+        tools: () => namedTools(proceduresToMcpTools(registry.getAll(), toolFilter), options.toolName),
+        state: () => ({ running, faces: transports.map((transport) => transport.getState()) }),
+    };
+}
+//# sourceMappingURL=host.js.map

package/dist/host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../src/host.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -11,7 +11,12 @@ export * from "./module.js";
 export { McpServerTransport } from "./transport/mcp-transport.js";
 export { createStdioTransport } from "./transport/stdio.js";
 export { createSseTransport } from "./transport/sse.js";
-export type { McpServerTransportOptions, McpServerTransportState, SseTransportOptions, } from "./types.js";
+export { createMcpHost, mcpExposeRule, redirectConsoleToStderr } from "./host.js";
+export type { McpHost, McpHostOptions, McpHostFaces, McpStdioFace, McpHostServerOptions, McpHostParts, McpHostState } from "./host.js";
+export { DEFAULT_ELICIT_TIMEOUT_MS } from "./transport/mcp-transport.js";
+export { createUntrustedEnvelopes, defaultUntrustedNotice, DEFAULT_UNTRUSTED_TAG } from "./untrusted.js";
+export type { UntrustedContentOptions, UntrustedWrapContext, UntrustedEnvelopes } from "./untrusted.js";
+export type { McpServerTransportOptions, McpServerTransportState, SseTransportOptions, HttpTransportOptions, StdioTransportOptions, McpTextBlock, McpToolContent, McpToolContentInput, McpToolContentHook, } from "./types.js";
 export { mcpServeProcedure, prepareServe, DEFAULT_SERVE_BUNDLE } from "./procedures/mcp/serve.js";
 export type { ServeOptions, ServeSetup } from "./procedures/mcp/serve.js";
 export { exposeRule, mergeSurfaces, importBundles, resolveBundleRegister } from "./surface.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,cAAc,aAAa,CAAC;AAG5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,YAAY,EACV,yBAAyB,EACzB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAClG,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC/F,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,YAAY,EACV,OAAO,EACP,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,UAAU,GACX,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,cAAc,aAAa,CAAC;AAG5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAClF,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACvI,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACzG,YAAY,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGxG,YAAY,EACV,yBAAyB,EACzB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAClG,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC/F,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,YAAY,EACV,OAAO,EACP,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,UAAU,GACX,MAAM,iBAAiB,CAAC"}

package/dist/index.js

@@ -12,6 +12,11 @@ export * from "./module.js";
 export { McpServerTransport } from "./transport/mcp-transport.js";
 export { createStdioTransport } from "./transport/stdio.js";
 export { createSseTransport } from "./transport/sse.js";
+// The host factory (CLI-10): one MCP host for each server of procedures
+export { createMcpHost, mcpExposeRule, redirectConsoleToStderr } from "./host.js";
+export { DEFAULT_ELICIT_TIMEOUT_MS } from "./transport/mcp-transport.js";
+// The envelopes of the text from outside the host (CLI-10)
+export { createUntrustedEnvelopes, defaultUntrustedNotice, DEFAULT_UNTRUSTED_TAG } from "./untrusted.js";
 // Procedures
 export { mcpServeProcedure, prepareServe, DEFAULT_SERVE_BUNDLE } from "./procedures/mcp/serve.js";
 export { exposeRule, mergeSurfaces, importBundles, resolveBundleRegister } from "./surface.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,cAAc,aAAa,CAAC;AAE5B,YAAY;AACZ,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AASxD,aAAa;AACb,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAElG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAWvE,8BAA8B;AAC9B,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,UAAU,GACX,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,cAAc,aAAa,CAAC;AAE5B,YAAY;AACZ,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,wEAAwE;AACxE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,2DAA2D;AAC3D,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAgBzG,aAAa;AACb,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAElG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAWvE,8BAA8B;AAC9B,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,EACV,UAAU,GACX,MAAM,iBAAiB,CAAC"}

package/dist/procedures/mcp/serve.d.ts

@@ -9,8 +9,12 @@
  * (default: `@procedures/bundle-mcp`, resolved from the current folder). Without a list,
  * nothing is exposed. The nested calls follow the call policy (`strictCalls`), and each tool call
  * has a time limit.
+ *
+ * The server comes from `createMcpHost()` (CLI-10), so its options come from `hostPolicy()` of the
+ * core, as for the dev-tools server. Before, `mcp.serve` built them by hand.
  */
 import { ProcedureServer, ProcedureRegistry, type AnyProcedure, type ProcedurePath } from "@procedures/client";
+import { type McpHost, type McpHostFaces } from "../../host.js";
 /** The default bundle of the tool surface. */
 export declare const DEFAULT_SERVE_BUNDLE = "@procedures/bundle-mcp";
 /** The options of `prepareServe`: the tool surface and the rules of the server. */
@@ -21,11 +25,25 @@ export interface ServeOptions {
     bundles?: readonly string[] | undefined;
     strictCalls?: boolean | undefined;
     toolTimeoutMs?: number | undefined;
+    /** True: the tools are only the procedures that change nothing. */
+    readOnly?: boolean | undefined;
+    /** The name of the server for the MCP client. */
+    name?: string | undefined;
+    /** The version of the server for the MCP client. */
+    version?: string | undefined;
+    /** The instructions of the server. */
+    instructions?: string | undefined;
+    /** True: debug lines go to stderr. */
+    debug?: boolean | undefined;
+    /** The faces of the host. The default is stdio. */
+    faces?: McpHostFaces | undefined;
 }
 /** The server of `mcp.serve`, before its transport starts. */
 export interface ServeSetup {
     server: ProcedureServer;
     expose: (path: ProcedurePath) => boolean;
+    /** The MCP host of the server: `host.start()` starts its faces. */
+    host: McpHost;
     /** Why the server has no tools, when it has none. */
     warning?: string;
 }

package/dist/procedures/mcp/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/procedures/mcp/serve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAEL,eAAe,EAEf,iBAAiB,EAEjB,KAAK,YAAY,EAEjB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAM5B,8CAA8C;AAC9C,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AA+C7D,mFAAmF;AACnF,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC3C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,YAAY,EACnB,IAAI,GAAE,MAAsB,EAC5B,QAAQ,GAAE,iBAAsC,GAC/C,OAAO,CAAC,UAAU,CAAC,CA6BrB;AAED,eAAO,MAAM,iBAAiB,EAAE,YA8C9B,CAAC"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/procedures/mcp/serve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAEL,eAAe,EAEf,iBAAiB,EACjB,KAAK,YAAY,EAEjB,KAAK,aAAa,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAiB,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAG/E,8CAA8C;AAC9C,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAmD7D,mFAAmF;AACnF,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC3C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,iDAAiD;IACjD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,sCAAsC;IACtC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,sCAAsC;IACtC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,mDAAmD;IACnD,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAClC;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,mEAAmE;IACnE,IAAI,EAAE,OAAO,CAAC;IACd,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,YAAY,EACnB,IAAI,GAAE,MAAsB,EAC5B,QAAQ,GAAE,iBAAsC,GAC/C,OAAO,CAAC,UAAU,CAAC,CAuCrB;AAED,eAAO,MAAM,iBAAiB,EAAE,YAkC9B,CAAC"}

package/dist/procedures/mcp/serve.js

@@ -9,11 +9,14 @@
  * (default: `@procedures/bundle-mcp`, resolved from the current folder). Without a list,
  * nothing is exposed. The nested calls follow the call policy (`strictCalls`), and each tool call
  * has a time limit.
+ *
+ * The server comes from `createMcpHost()` (CLI-10), so its options come from `hostPolicy()` of the
+ * core, as for the dev-tools server. Before, `mcp.serve` built them by hand.
  */
 import { z } from "zod";
-import { defineProcedure, ProcedureServer, PROCEDURE_REGISTRY, ProcedureRegistry, timeoutInterceptor, } from "@procedures/client";
-import { McpServerTransport } from "../../transport/mcp-transport.js";
+import { defineProcedure, ProcedureServer, PROCEDURE_REGISTRY, ProcedureRegistry, } from "@procedures/client";
 import { exposeRule, importBundles, mergeSurfaces } from "../../surface.js";
+import { createMcpHost } from "../../host.js";
 import { ms } from "@procedures/client";
 /** The default bundle of the tool surface. */
 export const DEFAULT_SERVE_BUNDLE = "@procedures/bundle-mcp";
@@ -41,6 +44,10 @@ const McpServeInputSchema = z.object({
     strictCalls: z.boolean().default(true).describe("True (the default): a procedure of code without metadata.calls can call only tools."),
     /** The time limit of each tool call, in milliseconds (default: 600000). 0: no limit. */
     toolTimeoutMs: z.number().int().min(0).default(600_000).describe("The time limit of each tool call, in milliseconds (default: 600000). 0: no limit."),
+    /** True: the tools are only the procedures that change nothing, and each call has that capability. */
+    readOnly: z.boolean().default(false).describe("True: the tools are only the procedures that change nothing, and each call has that capability."),
+    /** The instructions of the server: the MCP client gives them to the model. */
+    instructions: z.string().optional().describe("The instructions of the server: the MCP client gives them to the model."),
 });
 const McpServeOutputSchema = {
     parse: (data) => data,
@@ -54,17 +61,18 @@ const McpServeOutputSchema = {
  * and the host registers the modules (P9).
  */
 export async function prepareServe(input, from = process.cwd(), registry = PROCEDURE_REGISTRY) {
-    let expose = () => false;
+    // Without a surface, nothing is a tool
+    let surface = () => false;
     let warning;
     if (input.namespaces) {
-        expose = exposeRule({ namespaces: input.namespaces, exclude: input.exclude });
+        surface = { namespaces: input.namespaces, exclude: input.exclude };
     }
     else {
         const bundles = input.bundles ?? [DEFAULT_SERVE_BUNDLE];
         try {
-            const surface = mergeSurfaces(await importBundles(bundles, from));
-            if (surface) {
-                expose = exposeRule({ namespaces: surface.namespaces, exclude: [...(surface.exclude ?? []), ...(input.exclude ?? [])] });
+            const merged = mergeSurfaces(await importBundles(bundles, from));
+            if (merged) {
+                surface = { namespaces: merged.namespaces, exclude: [...(merged.exclude ?? []), ...(input.exclude ?? [])] };
             }
             else {
                 warning = `The bundles ${bundles.join(", ")} give no mcpNamespaces, so no procedure is a tool. Give namespaces.`;
@@ -76,14 +84,24 @@ export async function prepareServe(input, from = process.cwd(), registry = PROCE
                     `so no procedure is a tool. Give namespaces, or run in a project that has the bundles.`;
         }
     }
-    const server = new ProcedureServer({
-        autoRegister: input.autoRegister ?? true,
+    const host = createMcpHost({
         registry,
-        expose,
-        strictCalls: input.strictCalls ?? true,
-        interceptors: [timeoutInterceptor({ limit: ms(input.toolTimeoutMs ?? 600_000) })],
+        surface,
+        readOnly: input.readOnly === true,
+        policy: { strictCalls: input.strictCalls ?? true, timeout: ms(input.toolTimeoutMs ?? 600_000) },
+        serverOptions: { autoRegister: input.autoRegister ?? true },
+        ...(input.name !== undefined ? { name: input.name } : {}),
+        ...(input.version !== undefined ? { version: input.version } : {}),
+        ...(input.instructions !== undefined ? { instructions: input.instructions } : {}),
+        ...(input.debug !== undefined ? { debug: input.debug } : {}),
+        faces: input.faces ?? { stdio: true },
     });
-    return warning === undefined ? { server, expose } : { server, expose, warning };
+    // A surface always gives a rule, so the host has one
+    const expose = host.expose ?? (typeof surface === "function" ? surface : exposeRule(surface));
+    const setup = { server: host.server, expose, host };
+    if (warning !== undefined)
+        setup.warning = warning;
+    return setup;
 }
 export const mcpServeProcedure = defineProcedure({
     path: ["mcp", "serve"],
@@ -100,29 +118,16 @@ export const mcpServeProcedure = defineProcedure({
         const serverVersion = input.version ?? "1.0.0";
         // The registry of the caller: a host with its own registry serves its own procedures
         const registry = ctx?.registry instanceof ProcedureRegistry ? ctx.registry : PROCEDURE_REGISTRY;
-        const { server, expose, warning } = await prepareServe(input, process.cwd(), registry);
-        // Build transport options
-        const options = {
-            transport: input.transport,
-            serverInfo: {
-                name: serverName,
-                version: serverVersion,
-            },
-            debug: input.debug,
-            toolFilter: { include: expose },
-        };
-        // Create MCP transport
-        const mcpTransport = new McpServerTransport(server, options);
-        // Add transport and start
-        server.addTransport(mcpTransport);
-        await server.start();
-        const state = mcpTransport.getState();
+        const { host, warning } = await prepareServe({ ...input, name: serverName, version: serverVersion, faces: { stdio: true } }, process.cwd(), registry);
+        // The face of stdio: it stops the host when the client closes the input
+        await host.start();
+        const toolCount = host.state().faces[0]?.toolCount ?? host.tools().length;
         if (warning)
             console.error(`[mcp.serve] ${warning}`);
         return {
             success: true,
             transport: input.transport,
-            toolCount: state.toolCount,
+            toolCount,
             serverName,
             ...(warning ? { warning } : {}),
         };

package/dist/procedures/mcp/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/procedures/mcp/serve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/procedures/mcp/serve.ts"],"names":[],"mappings":"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"}

package/dist/transport/http.d.ts

@@ -8,6 +8,10 @@
  * a local server apply: the server listens on loopback by default, it refuses a web page of
  * another host or origin (DNS rebinding, cross-site requests), and with a token it refuses a
  * request without the token.
+ *
+ * Each tool call carries the credentials of its HTTP request (CLI-10), so the request hook of the
+ * server (`principalOf`) and its token check apply. A server that reads cookies trusts a request
+ * with a cookie only from a named origin (CSRF).
  */
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import type { HttpTransportOptions } from "../types.js";

package/dist/transport/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/transport/http.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,0EAA0E;AAC1E,MAAM,WAAW,gBAAgB;IAC/B,mGAAmG;IACnG,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1B,mCAAmC;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oFAAoF;IACpF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,CAAC,SAAS,EAAE,6BAA6B,KAAK,OAAO,CAAC,IAAI,CAAC,GACnE,gBAAgB,CA4FlB"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/transport/http.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,0EAA0E;AAC1E,MAAM,WAAW,gBAAgB;IAC/B,mGAAmG;IACnG,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1B,mCAAmC;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oFAAoF;IACpF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,CAAC,SAAS,EAAE,6BAA6B,KAAK,OAAO,CAAC,IAAI,CAAC,GACnE,gBAAgB,CA8FlB"}