@procedures/mcp-dev-tools 0.7.0 → 0.8.1

package/dist/config.d.ts

@@ -34,9 +34,9 @@ export interface McpServerConfig {
      */
     programCheck?: boolean | undefined;
     /**
-     * The folder that confines each path of the `fs.*` procedures of the host (roadmap R33). The
-     * nested `fs.*` calls of the tools (`lib.scan`, `cue.add`) are confined too. A path outside
-     * gives `FORBIDDEN` with the reason `outside-root`. No value: no root.
+     * The root of the files of the host (roadmap R33). Each procedure keeps its paths in it, also
+     * in the nested calls (`lib.scan`, `cue.add`), or the root refuses it. A path outside, and a
+     * refused tool, give `FORBIDDEN` with the reason `outside-root`. No value: no root.
      */
     fsRoot?: string | undefined;
 }
@@ -52,7 +52,7 @@ export interface McpServerConfig {
  * - MCP_READ_ONLY: "true" or "1" gives only the tools that change nothing (default: false)
  * - MCP_HTTP_PORT, MCP_HTTP_HOST, MCP_HTTP_TOKEN: serve over Streamable HTTP, not stdio
  * - MCP_PROGRAM_CHECK: "false" or "0" starts a program without the check before the run
- * - MCP_FS_ROOT: the folder that confines each path of the fs.* procedures (default: no root)
+ * - MCP_FS_ROOT: the root of the files: each tool keeps its paths in it, or it is refused (default: no root)
  */
 /** The default time limit of a tool call: a build or a test run can take minutes. */
 export declare const DEFAULT_TOOL_TIMEOUT_MS = 600000;

package/dist/config.js

@@ -15,7 +15,7 @@
  * - MCP_READ_ONLY: "true" or "1" gives only the tools that change nothing (default: false)
  * - MCP_HTTP_PORT, MCP_HTTP_HOST, MCP_HTTP_TOKEN: serve over Streamable HTTP, not stdio
  * - MCP_PROGRAM_CHECK: "false" or "0" starts a program without the check before the run
- * - MCP_FS_ROOT: the folder that confines each path of the fs.* procedures (default: no root)
+ * - MCP_FS_ROOT: the root of the files: each tool keeps its paths in it, or it is refused (default: no root)
  */
 /** The default time limit of a tool call: a build or a test run can take minutes. */
 export const DEFAULT_TOOL_TIMEOUT_MS = 600_000;

package/dist/host.d.ts

@@ -8,13 +8,15 @@
  * - each tool call has a time limit.
  *
  * `server.ts` (the file in the MCP configuration of Claude Code) and `mark mcp` both start the
- * server with `startDevToolsServer()`.
+ * server with `startDevToolsServer()`. The host comes from `createMcpHost()` of
+ * `@procedures/mcp-server` (CLI-10): the same factory as `mcp.serve` and the hosts of the apps.
  *
- * `MCP_FS_ROOT` confines the `fs.*` procedures to one folder. The host serves no remote events:
- * its transport carries only MCP, and `events.subscribe` is not a tool.
+ * `MCP_FS_ROOT` confines the procedures to one folder (`confineToRoot()` of `@procedures/fs`):
+ * each tool keeps its paths in it, or the root refuses the tool. The host serves no remote
+ * events: its transport carries only MCP, and `events.subscribe` is not a tool.
  */
 import { ProcedureServer, type HostPolicy, type ProcedureModule, type ProcedureRegistry, type ToolSurface } from "@procedures/client";
-import { type BundleSurfaceModule } from "@procedures/mcp-server";
+import { type BundleSurfaceModule, type McpHost } from "@procedures/mcp-server";
 import { type McpServerConfig } from "./config.js";
 /** The modules and the tool lists of some bundles. */
 export interface LoadedBundles {
@@ -34,15 +36,20 @@ export interface DevToolsHost {
     surface: ToolSurface | undefined;
     policy: HostPolicy;
     server: ProcedureServer;
-    /** The absolute path of the root of the `fs.*` procedures (`MCP_FS_ROOT`), or undefined. */
+    /** The absolute path of the root of the files (`MCP_FS_ROOT`), or undefined. */
     fsRoot?: string | undefined;
+    /** With a root: the keys of the procedures that the root refuses. Some of them are tools. */
+    refusedUnderRoot?: string[] | undefined;
+    /** The MCP host: `mcp.start()` starts its face (stdio, or Streamable HTTP with `config.http`). */
+    mcp: McpHost;
 }
 /** This function builds the host. It starts no transport. */
 export declare function createDevToolsHost(config?: McpServerConfig): Promise<DevToolsHost>;
 /**
  * This function starts the dev-tools MCP server over stdio, or over Streamable HTTP with
  * `config.http` (roadmap R26). Over stdio, stdout carries the protocol, so `console.log` goes to
- * stderr from here on (BUGS-2026-07 Bug5).
+ * stderr from here on (BUGS-2026-07 Bug5). The stdio server stops when the client closes its
+ * input: `host.mcp.closed` then resolves.
  */
 export declare function startDevToolsServer(config?: McpServerConfig): Promise<DevToolsHost>;
 //# sourceMappingURL=host.d.ts.map

package/dist/host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../src/host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,eAAe,EAQf,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAqC,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAQ/D,sDAAsD;AACtD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,kFAAkF;AAClF,wBAAsB,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAgBpF;AAaD,kFAAkF;AAClF,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,eAAe,CAAC;IACxB,4FAA4F;IAC5F,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,6DAA6D;AAC7D,wBAAsB,kBAAkB,CAAC,MAAM,GAAE,eAA8B,GAAG,OAAO,CAAC,YAAY,CAAC,CAqCtG;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,GAAE,eAA8B,GAAG,OAAO,CAAC,YAAY,CAAC,CAyCvG"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../src/host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAEL,eAAe,EAGf,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,OAAO,EAEb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAQ/D,sDAAsD;AACtD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,kFAAkF;AAClF,wBAAsB,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAgBpF;AAaD,kFAAkF;AAClF,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,eAAe,CAAC;IACxB,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,kGAAkG;IAClG,GAAG,EAAE,OAAO,CAAC;CACd;AAcD,6DAA6D;AAC7D,wBAAsB,kBAAkB,CAAC,MAAM,GAAE,eAA8B,GAAG,OAAO,CAAC,YAAY,CAAC,CAmCtG;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,GAAE,eAA8B,GAAG,OAAO,CAAC,YAAY,CAAC,CAoBvG"}

package/dist/host.js

@@ -8,13 +8,15 @@
  * - each tool call has a time limit.
  *
  * `server.ts` (the file in the MCP configuration of Claude Code) and `mark mcp` both start the
- * server with `startDevToolsServer()`.
+ * server with `startDevToolsServer()`. The host comes from `createMcpHost()` of
+ * `@procedures/mcp-server` (CLI-10): the same factory as `mcp.serve` and the hosts of the apps.
  *
- * `MCP_FS_ROOT` confines the `fs.*` procedures to one folder. The host serves no remote events:
- * its transport carries only MCP, and `events.subscribe` is not a tool.
+ * `MCP_FS_ROOT` confines the procedures to one folder (`confineToRoot()` of `@procedures/fs`):
+ * each tool keeps its paths in it, or the root refuses the tool. The host serves no remote
+ * events: its transport carries only MCP, and `events.subscribe` is not a tool.
  */
-import { PROCEDURE_REGISTRY, ProcedureServer, createRegistry, registerClientProcedures, capabilityRefusal, narrowCapability, surfaceRule, hostPolicy, procedureServerOptions, } from "@procedures/client";
-import { McpServerTransport, mergeSurfaces } from "@procedures/mcp-server";
+import { PROCEDURE_REGISTRY, ProcedureServer, createRegistry, registerClientProcedures, } from "@procedures/client";
+import { createMcpHost, mergeSurfaces, redirectConsoleToStderr, } from "@procedures/mcp-server";
 import { programCheckInterceptor } from "@procedures/compiler";
 import { loadConfig } from "./config.js";
 import { ms } from "@procedures/client";
@@ -48,89 +50,78 @@ async function loadBundlesGlobally(bundles) {
     }
     return { modules: [], surfaces, global: true };
 }
+/** The face of the configuration: Streamable HTTP with `config.http`, else stdio. */
+function facesOf(config) {
+    if (!config.http)
+        return { stdio: true };
+    return {
+        http: {
+            port: config.http.port,
+            ...(config.http.host ? { host: config.http.host } : {}),
+            ...(config.http.token ? { token: config.http.token } : {}),
+        },
+    };
+}
 /** This function builds the host. It starts no transport. */
 export async function createDevToolsHost(config = loadConfig()) {
     const loaded = await loadBundles(config.bundles);
     const registry = loaded.global ? PROCEDURE_REGISTRY : createRegistry(...loaded.modules);
-    // MCP_FS_ROOT (roadmap R33): each fs.* procedure of the registry confines its paths, so the
-    // nested fs calls of the tools are confined too. It adds no procedure: the tools stay the same.
+    // MCP_FS_ROOT (roadmap R33): each procedure of the registry keeps its paths in the root, also
+    // in the nested calls, or the root refuses it. It adds no procedure: the tools stay the same.
     let fsRoot;
+    let refusedUnderRoot;
     if (config.fsRoot !== undefined) {
-        const { confineFsProcedures } = await import("@procedures/fs/module");
-        fsRoot = confineFsProcedures(registry, config.fsRoot).root;
+        const { confineToRoot } = await import("@procedures/fs/module");
+        ({ root: fsRoot, refused: refusedUnderRoot } = confineToRoot(registry, config.fsRoot));
     }
     // Bundles without mcpNamespaces say nothing about their tools: then every procedure is a tool
     const surface = mergeSurfaces(loaded.surfaces);
     // Read only: the tools are the procedures that the capability permits, so the list shows only
-    // what a call can start (CAPABILITIES-2026-10)
-    const readOnly = config.readOnly === true;
-    const capability = readOnly ? narrowCapability(undefined, { effects: { writes: [] } }) : undefined;
-    const surfaceExpose = surface ? surfaceRule(surface) : undefined;
-    const expose = capability
-        ? (path) => {
-            if (surfaceExpose && !surfaceExpose(path))
-                return false;
-            const procedure = registry.get(path);
-            return procedure !== undefined && capabilityRefusal(procedure, capability) === undefined;
-        }
-        : surface;
-    // The check before the run (roadmap R22): a program with an error does not start, so a refusal
-    // in step 3 comes before the write of step 1
-    const exposeRule = typeof expose === "function" ? expose : expose ? surfaceRule(expose) : undefined;
-    const programCheck = config.programCheck === false ? [] : [programCheckInterceptor({ registry, expose: exposeRule })];
-    const policy = hostPolicy({
-        ...(expose ? { expose } : {}),
-        strictCalls: true,
-        timeout: ms(config.toolTimeoutMs),
-        ...(readOnly ? { readOnly: true } : {}),
-        ...(programCheck.length > 0 ? { interceptors: programCheck } : {}),
+    // what a call can start (CAPABILITIES-2026-10). The check before the run (roadmap R22): a
+    // program with an error does not start, so a refusal in step 3 comes before the write of step 1.
+    const mcp = createMcpHost({
+        registry,
+        ...(surface ? { surface } : {}),
+        readOnly: config.readOnly === true,
+        policy: { strictCalls: true, timeout: ms(config.toolTimeoutMs) },
+        ...(config.programCheck === false ? {} : { interceptors: ({ expose }) => [programCheckInterceptor({ registry, expose })] }),
+        name: config.serverName,
+        version: config.serverVersion,
+        debug: config.debug,
+        faces: facesOf(config),
     });
-    const server = new ProcedureServer(procedureServerOptions(policy, registry));
-    return { registry, surface, policy, server, ...(fsRoot !== undefined ? { fsRoot } : {}) };
+    return {
+        registry,
+        surface,
+        policy: mcp.policy,
+        server: mcp.server,
+        mcp,
+        ...(fsRoot !== undefined ? { fsRoot, refusedUnderRoot } : {}),
+    };
 }
 /**
  * This function starts the dev-tools MCP server over stdio, or over Streamable HTTP with
  * `config.http` (roadmap R26). Over stdio, stdout carries the protocol, so `console.log` goes to
- * stderr from here on (BUGS-2026-07 Bug5).
+ * stderr from here on (BUGS-2026-07 Bug5). The stdio server stops when the client closes its
+ * input: `host.mcp.closed` then resolves.
  */
 export async function startDevToolsServer(config = loadConfig()) {
-    // Defense-in-depth for the stdio transport: a stray console.log (from a procedure handler or a
-    // dependency) would corrupt the protocol. The MCP SDK writes its frames with
-    // process.stdout.write, so it is not affected.
-    console.log = (...args) => {
-        console.error(...args);
-    };
+    // Defense-in-depth for the stdio transport: a stray console.log (from a procedure handler, a
+    // dependency or a bundle that loads) would corrupt the protocol. The MCP SDK writes its frames
+    // with process.stdout.write, so it is not affected.
+    redirectConsoleToStderr();
     if (config.debug) {
         console.error("[mcp-server] Starting with config:", JSON.stringify(config, null, 2));
     }
     const host = await createDevToolsHost(config);
-    const expose = host.policy.expose;
-    const transport = new McpServerTransport(host.server, {
-        ...(config.http
-            ? {
-                transport: "http",
-                httpOptions: {
-                    port: config.http.port,
-                    ...(config.http.host ? { host: config.http.host } : {}),
-                    ...(config.http.token ? { token: config.http.token } : {}),
-                },
-            }
-            : { transport: "stdio" }),
-        serverInfo: {
-            name: config.serverName,
-            version: config.serverVersion,
-        },
-        debug: config.debug,
-        ...(expose ? { toolFilter: { include: expose } } : {}),
-    });
-    host.server.addTransport(transport);
-    await host.server.start();
+    await host.mcp.start();
+    const face = host.mcp.state().faces[0];
     if (config.debug) {
-        console.error(`[mcp-server] Started with ${transport.getState().toolCount} tools`);
+        console.error(`[mcp-server] Started with ${face?.toolCount ?? 0} tools`);
     }
     if (host.fsRoot !== undefined)
-        console.error(`[mcp-server] fs.* refuses each path outside ${host.fsRoot}`);
-    const url = transport.getState().url;
+        console.error(`[mcp-server] Each tool refuses a path outside ${host.fsRoot}. Refused under the root: ${String(host.refusedUnderRoot)}`);
+    const url = face?.url;
     if (url)
         console.error(`[mcp-server] Streamable HTTP at ${url}${config.http?.token ? " (send Authorization: Bearer <token>)" : ""}`);
     return host;

package/dist/host.js.map

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

package/dist/server.d.ts

@@ -4,6 +4,9 @@
  * Starts an MCP server that exposes procedures as tools to Claude Code and Claude Desktop. The
  * MCP configuration of a client runs this file (`node packages/impl-mcp-dev/dist/server.js`).
  * Configurable via environment variables (see `config.ts`). `mark mcp` starts the same server.
+ *
+ * When the client closes the input of stdio, the host stops (the calls in flight get their grace
+ * time), and this process ends (CLI-10).
  */
 export {};
 //# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/server.js

@@ -4,9 +4,17 @@
  * Starts an MCP server that exposes procedures as tools to Claude Code and Claude Desktop. The
  * MCP configuration of a client runs this file (`node packages/impl-mcp-dev/dist/server.js`).
  * Configurable via environment variables (see `config.ts`). `mark mcp` starts the same server.
+ *
+ * When the client closes the input of stdio, the host stops (the calls in flight get their grace
+ * time), and this process ends (CLI-10).
  */
 import { startDevToolsServer } from "./host.js";
-startDevToolsServer().catch((error) => {
+startDevToolsServer()
+    .then(async (host) => {
+    await host.mcp.closed;
+    process.exit(0);
+})
+    .catch((error) => {
     console.error("[mcp-server] Fatal error:", error);
     process.exit(1);
 });

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,mBAAmB,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACpC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,mBAAmB,EAAE;KAClB,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACnB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@procedures/mcp-dev-tools",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "A ready-to-use MCP server for Claude Code and Claude Desktop: 91 developer tools (docker, mongo, sqlite, cue, vitest, workspace) with a strict call policy.",
   "keywords": [
     "mcp",
@@ -53,11 +53,11 @@
     "provenance": true
   },
   "dependencies": {
-    "@procedures/bundle-mcp": "0.7.0",
-    "@procedures/client": "0.7.0",
-    "@procedures/compiler": "0.7.0",
-    "@procedures/fs": "0.7.0",
-    "@procedures/mcp-server": "0.7.0"
+    "@procedures/bundle-mcp": "0.8.1",
+    "@procedures/client": "0.8.1",
+    "@procedures/compiler": "0.8.1",
+    "@procedures/fs": "0.8.1",
+    "@procedures/mcp-server": "0.8.1"
   },
   "devDependencies": {
     "@mark1russell7/cue": "^1.0.0",

package/src/config.ts

@@ -31,9 +31,9 @@ export interface McpServerConfig {
    */
   programCheck?: boolean | undefined;
   /**
-   * The folder that confines each path of the `fs.*` procedures of the host (roadmap R33). The
-   * nested `fs.*` calls of the tools (`lib.scan`, `cue.add`) are confined too. A path outside
-   * gives `FORBIDDEN` with the reason `outside-root`. No value: no root.
+   * The root of the files of the host (roadmap R33). Each procedure keeps its paths in it, also
+   * in the nested calls (`lib.scan`, `cue.add`), or the root refuses it. A path outside, and a
+   * refused tool, give `FORBIDDEN` with the reason `outside-root`. No value: no root.
    */
   fsRoot?: string | undefined;
 }
@@ -50,7 +50,7 @@ export interface McpServerConfig {
  * - MCP_READ_ONLY: "true" or "1" gives only the tools that change nothing (default: false)
  * - MCP_HTTP_PORT, MCP_HTTP_HOST, MCP_HTTP_TOKEN: serve over Streamable HTTP, not stdio
  * - MCP_PROGRAM_CHECK: "false" or "0" starts a program without the check before the run
- * - MCP_FS_ROOT: the folder that confines each path of the fs.* procedures (default: no root)
+ * - MCP_FS_ROOT: the root of the files: each tool keeps its paths in it, or it is refused (default: no root)
  */
 /** The default time limit of a tool call: a build or a test run can take minutes. */
 export const DEFAULT_TOOL_TIMEOUT_MS = 600_000;

package/src/host.ts

@@ -8,10 +8,12 @@
  * - each tool call has a time limit.
  *
  * `server.ts` (the file in the MCP configuration of Claude Code) and `mark mcp` both start the
- * server with `startDevToolsServer()`.
+ * server with `startDevToolsServer()`. The host comes from `createMcpHost()` of
+ * `@procedures/mcp-server` (CLI-10): the same factory as `mcp.serve` and the hosts of the apps.
  *
- * `MCP_FS_ROOT` confines the `fs.*` procedures to one folder. The host serves no remote events:
- * its transport carries only MCP, and `events.subscribe` is not a tool.
+ * `MCP_FS_ROOT` confines the procedures to one folder (`confineToRoot()` of `@procedures/fs`):
+ * each tool keeps its paths in it, or the root refuses the tool. The host serves no remote
+ * events: its transport carries only MCP, and `events.subscribe` is not a tool.
  */
 
 import {
@@ -19,17 +21,19 @@ import {
   ProcedureServer,
   createRegistry,
   registerClientProcedures,
-  capabilityRefusal,
-  narrowCapability,
-  surfaceRule,
-  hostPolicy,
-  procedureServerOptions,
   type HostPolicy,
   type ProcedureModule,
   type ProcedureRegistry,
   type ToolSurface,
 } from "@procedures/client";
-import { McpServerTransport, mergeSurfaces, type BundleSurfaceModule } from "@procedures/mcp-server";
+import {
+  createMcpHost,
+  mergeSurfaces,
+  redirectConsoleToStderr,
+  type BundleSurfaceModule,
+  type McpHost,
+  type McpHostFaces,
+} from "@procedures/mcp-server";
 import { programCheckInterceptor } from "@procedures/compiler";
 import { loadConfig, type McpServerConfig } from "./config.js";
 import { ms } from "@procedures/client";
@@ -86,94 +90,88 @@ export interface DevToolsHost {
   surface: ToolSurface | undefined;
   policy: HostPolicy;
   server: ProcedureServer;
-  /** The absolute path of the root of the `fs.*` procedures (`MCP_FS_ROOT`), or undefined. */
+  /** The absolute path of the root of the files (`MCP_FS_ROOT`), or undefined. */
   fsRoot?: string | undefined;
+  /** With a root: the keys of the procedures that the root refuses. Some of them are tools. */
+  refusedUnderRoot?: string[] | undefined;
+  /** The MCP host: `mcp.start()` starts its face (stdio, or Streamable HTTP with `config.http`). */
+  mcp: McpHost;
+}
+
+/** The face of the configuration: Streamable HTTP with `config.http`, else stdio. */
+function facesOf(config: McpServerConfig): McpHostFaces {
+  if (!config.http) return { stdio: true };
+  return {
+    http: {
+      port: config.http.port,
+      ...(config.http.host ? { host: config.http.host } : {}),
+      ...(config.http.token ? { token: config.http.token } : {}),
+    },
+  };
 }
 
 /** This function builds the host. It starts no transport. */
 export async function createDevToolsHost(config: McpServerConfig = loadConfig()): Promise<DevToolsHost> {
   const loaded = await loadBundles(config.bundles);
   const registry = loaded.global ? PROCEDURE_REGISTRY : createRegistry(...loaded.modules);
-  // MCP_FS_ROOT (roadmap R33): each fs.* procedure of the registry confines its paths, so the
-  // nested fs calls of the tools are confined too. It adds no procedure: the tools stay the same.
+  // MCP_FS_ROOT (roadmap R33): each procedure of the registry keeps its paths in the root, also
+  // in the nested calls, or the root refuses it. It adds no procedure: the tools stay the same.
   let fsRoot: string | undefined;
+  let refusedUnderRoot: string[] | undefined;
   if (config.fsRoot !== undefined) {
-    const { confineFsProcedures } = await import("@procedures/fs/module");
-    fsRoot = confineFsProcedures(registry, config.fsRoot).root;
+    const { confineToRoot } = await import("@procedures/fs/module");
+    ({ root: fsRoot, refused: refusedUnderRoot } = confineToRoot(registry, config.fsRoot));
   }
   // Bundles without mcpNamespaces say nothing about their tools: then every procedure is a tool
   const surface = mergeSurfaces(loaded.surfaces);
   // Read only: the tools are the procedures that the capability permits, so the list shows only
-  // what a call can start (CAPABILITIES-2026-10)
-  const readOnly = config.readOnly === true;
-  const capability = readOnly ? narrowCapability(undefined, { effects: { writes: [] } }) : undefined;
-  const surfaceExpose = surface ? surfaceRule(surface) : undefined;
-  const expose = capability
-    ? (path: string[]): boolean => {
-        if (surfaceExpose && !surfaceExpose(path)) return false;
-        const procedure = registry.get(path);
-        return procedure !== undefined && capabilityRefusal(procedure, capability) === undefined;
-      }
-    : surface;
-  // The check before the run (roadmap R22): a program with an error does not start, so a refusal
-  // in step 3 comes before the write of step 1
-  const exposeRule = typeof expose === "function" ? expose : expose ? surfaceRule(expose) : undefined;
-  const programCheck = config.programCheck === false ? [] : [programCheckInterceptor({ registry, expose: exposeRule })];
-  const policy = hostPolicy({
-    ...(expose ? { expose } : {}),
-    strictCalls: true,
-    timeout: ms(config.toolTimeoutMs),
-    ...(readOnly ? { readOnly: true } : {}),
-    ...(programCheck.length > 0 ? { interceptors: programCheck } : {}),
+  // what a call can start (CAPABILITIES-2026-10). The check before the run (roadmap R22): a
+  // program with an error does not start, so a refusal in step 3 comes before the write of step 1.
+  const mcp = createMcpHost({
+    registry,
+    ...(surface ? { surface } : {}),
+    readOnly: config.readOnly === true,
+    policy: { strictCalls: true, timeout: ms(config.toolTimeoutMs) },
+    ...(config.programCheck === false ? {} : { interceptors: ({ expose }) => [programCheckInterceptor({ registry, expose })] }),
+    name: config.serverName,
+    version: config.serverVersion,
+    debug: config.debug,
+    faces: facesOf(config),
   });
-  const server = new ProcedureServer(procedureServerOptions(policy, registry));
-  return { registry, surface, policy, server, ...(fsRoot !== undefined ? { fsRoot } : {}) };
+  return {
+    registry,
+    surface,
+    policy: mcp.policy,
+    server: mcp.server,
+    mcp,
+    ...(fsRoot !== undefined ? { fsRoot, refusedUnderRoot } : {}),
+  };
 }
 
 /**
  * This function starts the dev-tools MCP server over stdio, or over Streamable HTTP with
  * `config.http` (roadmap R26). Over stdio, stdout carries the protocol, so `console.log` goes to
- * stderr from here on (BUGS-2026-07 Bug5).
+ * stderr from here on (BUGS-2026-07 Bug5). The stdio server stops when the client closes its
+ * input: `host.mcp.closed` then resolves.
  */
 export async function startDevToolsServer(config: McpServerConfig = loadConfig()): Promise<DevToolsHost> {
-  // Defense-in-depth for the stdio transport: a stray console.log (from a procedure handler or a
-  // dependency) would corrupt the protocol. The MCP SDK writes its frames with
-  // process.stdout.write, so it is not affected.
-  console.log = (...args: unknown[]): void => {
-    console.error(...args);
-  };
+  // Defense-in-depth for the stdio transport: a stray console.log (from a procedure handler, a
+  // dependency or a bundle that loads) would corrupt the protocol. The MCP SDK writes its frames
+  // with process.stdout.write, so it is not affected.
+  redirectConsoleToStderr();
   if (config.debug) {
     console.error("[mcp-server] Starting with config:", JSON.stringify(config, null, 2));
   }
 
   const host = await createDevToolsHost(config);
-  const expose = host.policy.expose;
-  const transport = new McpServerTransport(host.server, {
-    ...(config.http
-      ? {
-          transport: "http" as const,
-          httpOptions: {
-            port: config.http.port,
-            ...(config.http.host ? { host: config.http.host } : {}),
-            ...(config.http.token ? { token: config.http.token } : {}),
-          },
-        }
-      : { transport: "stdio" as const }),
-    serverInfo: {
-      name: config.serverName,
-      version: config.serverVersion,
-    },
-    debug: config.debug,
-    ...(expose ? { toolFilter: { include: expose } } : {}),
-  });
-  host.server.addTransport(transport);
-  await host.server.start();
+  await host.mcp.start();
+  const face = host.mcp.state().faces[0];
 
   if (config.debug) {
-    console.error(`[mcp-server] Started with ${transport.getState().toolCount} tools`);
+    console.error(`[mcp-server] Started with ${face?.toolCount ?? 0} tools`);
   }
-  if (host.fsRoot !== undefined) console.error(`[mcp-server] fs.* refuses each path outside ${host.fsRoot}`);
-  const url = transport.getState().url;
+  if (host.fsRoot !== undefined) console.error(`[mcp-server] Each tool refuses a path outside ${host.fsRoot}. Refused under the root: ${String(host.refusedUnderRoot)}`);
+  const url = face?.url;
   if (url) console.error(`[mcp-server] Streamable HTTP at ${url}${config.http?.token ? " (send Authorization: Bearer <token>)" : ""}`);
   return host;
 }

package/src/server.ts

@@ -4,11 +4,19 @@
  * Starts an MCP server that exposes procedures as tools to Claude Code and Claude Desktop. The
  * MCP configuration of a client runs this file (`node packages/impl-mcp-dev/dist/server.js`).
  * Configurable via environment variables (see `config.ts`). `mark mcp` starts the same server.
+ *
+ * When the client closes the input of stdio, the host stops (the calls in flight get their grace
+ * time), and this process ends (CLI-10).
  */
 
 import { startDevToolsServer } from "./host.js";
 
-startDevToolsServer().catch((error) => {
-  console.error("[mcp-server] Fatal error:", error);
-  process.exit(1);
-});
+startDevToolsServer()
+  .then(async (host) => {
+    await host.mcp.closed;
+    process.exit(0);
+  })
+  .catch((error) => {
+    console.error("[mcp-server] Fatal error:", error);
+    process.exit(1);
+  });