apcore-mcp 0.12.0 → 0.14.0

package/dist/server/factory.js

@@ -10,6 +10,8 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { SchemaConverter } from "../adapters/schema.js";
 import { AnnotationMapper } from "../adapters/annotations.js";
+import { buildTraceparent } from "./trace-context.js";
+import { APCORE_META_TOOL_PREFIX } from "./async-task-bridge.js";
 /** Metadata keys for AI intent annotations appended to tool descriptions. */
 const AI_INTENT_KEYS = ["x-when-to-use", "x-when-not-to-use", "x-common-mistakes", "x-workflow-hints"];
 export class MCPServerFactory {
@@ -27,7 +29,18 @@ export class MCPServerFactory {
      * @returns A configured Server instance with tools capability
      */
     createServer(name = "apcore-mcp", version = "0.1.0") {
-        return new Server({ name, version }, { capabilities: { tools: {}, resources: {} } });
+        // Advertise listChanged: true so MCP clients receive
+        // notifications/tools/list_changed and notifications/resources/list_changed
+        // when the registry mutates at runtime. Python's build_init_options and
+        // Rust's MCPServerFactory::build_init_options both set this to true;
+        // the TS factory previously passed empty objects, breaking dynamic-tool
+        // registration on TS-hosted servers. [A-D-004]
+        return new Server({ name, version }, {
+            capabilities: {
+                tools: { listChanged: true },
+                resources: { listChanged: true },
+            },
+        });
     }
     /**
      * Build an MCP Tool object from an apcore module descriptor.
@@ -38,10 +51,19 @@ export class MCPServerFactory {
      * - inputSchema = converted via SchemaConverter
      * - annotations = mapped from AnnotationMapper with camelCase keys
      */
-    buildTool(descriptor) {
+    buildTool(descriptor, options) {
         if (!descriptor.moduleId || typeof descriptor.moduleId !== "string") {
             throw new Error("ModuleDescriptor.moduleId is required and must be a string");
         }
+        // Reject reserved __apcore_ prefix at the symbol boundary, not just
+        // the bulk path. Direct callers (extensions, plugins, tests) would
+        // otherwise produce a poisoned Tool that shadows the async-task
+        // meta-tools. Python rejects at this same boundary; TS now does too.
+        // [A-D-009]
+        if (descriptor.moduleId.startsWith(APCORE_META_TOOL_PREFIX)) {
+            throw new Error(`Reserved module id: "${descriptor.moduleId}". Module ids starting with ` +
+                `"${APCORE_META_TOOL_PREFIX}" are reserved for apcore-mcp meta-tools.`);
+        }
         if (descriptor.description !== undefined && descriptor.description !== null && typeof descriptor.description !== "string") {
             throw new Error("ModuleDescriptor.description must be a string");
         }
@@ -49,7 +71,24 @@ export class MCPServerFactory {
         // while Python uses SchemaExporter.export_mcp() for the same mapping.
         // Both produce identical output. If annotation logic changes, update both paths.
         const mcpAnnotations = this._annotationMapper.toMcpAnnotations(descriptor.annotations);
-        const convertedSchema = this._schemaConverter.convertInputSchema(descriptor);
+        const strict = options?.strict ?? true;
+        let convertedSchema;
+        if (strict && options?.registry && typeof options.registry.exportSchema === "function") {
+            try {
+                const exported = options.registry.exportSchema(descriptor.moduleId, true);
+                const inputSchema = exported?.["input_schema"]
+                    ?? exported?.["inputSchema"];
+                if (inputSchema && typeof inputSchema === "object") {
+                    convertedSchema = inputSchema;
+                }
+            }
+            catch {
+                // Fall through to local conversion
+            }
+        }
+        if (!convertedSchema) {
+            convertedSchema = this._schemaConverter.convertInputSchema(descriptor, { strict });
+        }
         const hasApproval = this._annotationMapper.hasRequiresApproval(descriptor.annotations);
         // Resolve display overlay fields (§5.13)
         const metadata = descriptor.metadata ?? {};
@@ -103,6 +142,9 @@ export class MCPServerFactory {
      *
      * Iterates over registry.list(), gets each definition, and builds tools.
      * Skips modules that return null definitions or throw errors (with console.warn).
+     *
+     * Reserved: module ids starting with `__apcore_` collide with the async
+     * task bridge meta-tool namespace and are rejected with a console.error.
      */
     buildTools(registry, options) {
         const tools = [];
@@ -111,13 +153,17 @@ export class MCPServerFactory {
             prefix: options?.prefix ?? null,
         });
         for (const moduleId of moduleIds) {
+            if (moduleId.startsWith(APCORE_META_TOOL_PREFIX)) {
+                throw new Error(`Reserved module id "${moduleId}" — ids prefixed with ` +
+                    `"${APCORE_META_TOOL_PREFIX}" are reserved for apcore-mcp meta-tools.`);
+            }
             try {
                 const descriptor = registry.getDefinition(moduleId);
                 if (descriptor === null) {
                     console.warn(`Skipping module "${moduleId}": getDefinition returned null`);
                     continue;
                 }
-                tools.push(this.buildTool(descriptor));
+                tools.push(this.buildTool(descriptor, { strict: options?.strict, registry }));
             }
             catch (error) {
                 console.warn(`Skipping module "${moduleId}": ${error instanceof Error ? error.message : String(error)}`);
@@ -125,6 +171,27 @@ export class MCPServerFactory {
         }
         return tools;
     }
+    /**
+     * Merge the four async-task meta-tools onto an existing tool list. Called
+     * after `buildTools()` when an `AsyncTaskBridge` is active so meta-tools
+     * are advertised via `tools/list`.
+     */
+    attachAsyncMetaTools(tools, bridge) {
+        if (!bridge || !bridge.enabled)
+            return tools;
+        const metaTools = bridge.buildMetaTools().map((mt) => ({
+            name: mt.name,
+            description: mt.description,
+            inputSchema: mt.inputSchema,
+            annotations: {
+                readOnlyHint: false,
+                destructiveHint: false,
+                idempotentHint: true,
+                openWorldHint: false,
+            },
+        }));
+        return [...tools, ...metaTools];
+    }
     /**
      * Register resources/list and resources/read handlers for modules with documentation.
      *
@@ -193,11 +260,18 @@ export class MCPServerFactory {
      * @param server - The MCP Server to register handlers on
      * @param tools - Array of MCP Tool objects to serve
      * @param router - ExecutionRouter to handle tool call execution
+     * @param options - Optional extra options; `asyncTaskBridge` adds meta-tools
+     *                  and routes meta-tool calls to the bridge (mirrors Python's
+     *                  `register_handlers(server, tools, router, async_bridge)`).
+     *                  [D11-014]
      */
-    registerHandlers(server, tools, router) {
+    registerHandlers(server, tools, router, options) {
+        // [D11-014] If asyncTaskBridge is provided, extend tools list with meta-tools.
+        const bridge = options?.asyncTaskBridge;
+        const allTools = bridge ? this.attachAsyncMetaTools(tools, bridge) : tools;
         // Handle tools/list requests
         server.setRequestHandler(ListToolsRequestSchema, async () => {
-            return { tools };
+            return { tools: allTools };
         });
         // Handle tools/call requests
         server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
@@ -214,8 +288,44 @@ export class MCPServerFactory {
                 _meta: extra?._meta
                     ? { progressToken: extra._meta.progressToken }
                     : undefined,
+                // [A-D-018] Forward the transport's per-session id so the bridge
+                // can record it for cancelSessionTasks() on transport disconnect.
+                sessionId: extra?.sessionId,
             };
-            const [content, isError, _traceId] = await router.handleCall(name, toolArgs, handleCallExtra);
+            const reqMeta = request.params._meta;
+            const apcoreMeta = reqMeta?.["apcore"];
+            if (apcoreMeta?.version) {
+                handleCallExtra._meta = {
+                    ...(handleCallExtra._meta ?? {}),
+                    apcore: { version: apcoreMeta.version },
+                };
+            }
+            // F-042: W3C trace_context ↔ MCP `_meta.traceparent` inbound propagation.
+            // Prefer request params `_meta.traceparent`; fall back to transport extra.
+            const rawTraceparent = reqMeta?.["traceparent"] ??
+                extra?._meta?.traceparent;
+            if (typeof rawTraceparent === "string" && rawTraceparent.length > 0) {
+                handleCallExtra._meta = {
+                    ...(handleCallExtra._meta ?? {}),
+                    traceparent: rawTraceparent,
+                };
+            }
+            // [A-D-014] Auth-identity propagation: thread the authenticated
+            // identity from the AsyncLocalStorage (set by AuthMiddleware) into
+            // the call extra so the router can attach it to the apcore Context.
+            // Mirrors Python's factory pattern (factory.py:232-234) which reads
+            // auth_identity_var.get() and forwards into extra["identity"].
+            try {
+                const { getCurrentIdentity } = await import("../auth/storage.js");
+                const identity = getCurrentIdentity();
+                if (identity !== null) {
+                    handleCallExtra.identity = identity;
+                }
+            }
+            catch {
+                // auth module not available — skip silently (auth is optional).
+            }
+            const [content, isError, traceId] = await router.handleCall(name, toolArgs, handleCallExtra);
             const textContents = content.map(c => ({ type: "text", text: c.text }));
             // NOTE: The MCP SDK decorator always wraps our return in
             // CallToolResult(isError=false). Setting isError=true is not
@@ -227,6 +337,16 @@ export class MCPServerFactory {
             const result = {
                 content: textContents,
             };
+            // F-042 outbound: attach `_meta.traceparent` so downstream MCP callers
+            // can continue the same W3C trace chain. We emit it whenever we have a
+            // traceId (i.e. a context was created) — the client can then thread it
+            // into any follow-up tool invocations.
+            if (traceId) {
+                result._meta = {
+                    ...(result._meta ?? {}),
+                    traceparent: buildTraceparent(traceId),
+                };
+            }
             return result;
         });
     }

package/dist/server/factory.js.map

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

package/dist/server/listener.d.ts

@@ -51,6 +51,9 @@ export declare class RegistryListener {
      * Handle a module unregistration event.
      *
      * Removes the tool from the internal tools map.
+     * - [A-D-011]: gates on `_active` (matches Python+Rust idempotence
+     *   contract — direct invocation post-stop() is a no-op).
+     * - [A-D-011]: only logs when the tool was actually present.
      *
      * @param moduleId - The ID of the unregistered module
      */

package/dist/server/listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../src/server/listener.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,OAAO,CAAU;IAEzB;;;;;OAKG;gBACS,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB;IAOzD;;;;OAIG;IACH,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAE7B;IAED;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAoBb;;;;OAIG;IACH,IAAI,IAAI,IAAI;IAIZ;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsBnC;;;;;;OAMG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;CAItC"}
+{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../src/server/listener.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,OAAO,CAAU;IAEzB;;;;;OAKG;gBACS,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB;IAOzD;;;;OAIG;IACH,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAE7B;IAED;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAoBb;;;;OAIG;IACH,IAAI,IAAI,IAAI;IAIZ;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAyBnC;;;;;;;;;OASG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;CAOtC"}

package/dist/server/listener.js

@@ -71,6 +71,10 @@ export class RegistryListener {
      * @param moduleId - The ID of the newly registered module
      */
     _onRegister(moduleId) {
+        // [D11-001] Mirror Python listener.py:75 and Rust listener.rs:66:
+        // guard with _active check so post-stop() invocations are no-ops.
+        if (!this._active)
+            return;
         try {
             const descriptor = this._registry.getDefinition(moduleId);
             if (descriptor === null) {
@@ -89,12 +93,19 @@ export class RegistryListener {
      * Handle a module unregistration event.
      *
      * Removes the tool from the internal tools map.
+     * - [A-D-011]: gates on `_active` (matches Python+Rust idempotence
+     *   contract — direct invocation post-stop() is a no-op).
+     * - [A-D-011]: only logs when the tool was actually present.
      *
      * @param moduleId - The ID of the unregistered module
      */
     _onUnregister(moduleId) {
-        this._tools.delete(moduleId);
-        console.log(`RegistryListener: unregistered tool "${moduleId}"`);
+        if (!this._active)
+            return;
+        const removed = this._tools.delete(moduleId);
+        if (removed) {
+            console.log(`RegistryListener: unregistered tool "${moduleId}"`);
+        }
     }
 }
 //# sourceMappingURL=listener.js.map

package/dist/server/listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../src/server/listener.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,MAAM,OAAO,gBAAgB;IACV,SAAS,CAAW;IACpB,QAAQ,CAAmB;IAC3B,MAAM,CAAoB;IACnC,OAAO,CAAU;IAEzB;;;;;OAKG;IACH,YAAY,QAAkB,EAAE,OAAyB;QACvD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YACjE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YACnE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;YACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC1D,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,OAAO,CAAC,IAAI,CACV,4CAA4C,QAAQ,uBAAuB,CAC5E,CAAC;gBACF,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,sCAAsC,QAAQ,GAAG,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CACV,8CAA8C,QAAQ,MACpD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,QAAgB;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,wCAAwC,QAAQ,GAAG,CAAC,CAAC;IACnE,CAAC;CACF"}
+{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../src/server/listener.ts"],"names":[],"mappings":"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"}

package/dist/server/observability.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Observability wiring for apcore-mcp.
+ *
+ * Bundles apcore-js's `MetricsCollector` + `MetricsMiddleware` and
+ * `UsageCollector` + `UsageMiddleware` so the bridge can auto-install them
+ * when the caller passes `observability: true` (or `metricsCollector: true`)
+ * to `serve()`, `asyncServe()`, or the `APCoreMCP` constructor.
+ *
+ * Back-compat: when `metricsCollector` is already a concrete
+ * `MetricsExporter` instance, it is passed through unchanged (existing
+ * behaviour). When it is `true`, a fresh MetricsCollector is created
+ * and the matching middleware installed via `executor.use()`.
+ */
+import type { MetricsExporter } from "./transport.js";
+/** Duck-typed collector shapes returned from apcore-js. */
+export interface ObservabilityStack {
+    /** Prometheus exporter (also doubles as the /metrics source). */
+    metricsCollector: MetricsExporter | undefined;
+    /**
+     * Raw UsageCollector with `getSummary(period)` and `getModule(moduleId, period)`.
+     * Typed loose because the bridge never depends on apcore-js at compile time.
+     */
+    usageCollector: any | undefined;
+    /** Middleware instances already installed on the executor. */
+    middleware: unknown[];
+}
+/**
+ * Flag-style options for observability auto-wiring. When `true` or an empty
+ * config is passed, both metrics and usage middleware are installed.
+ */
+export type ObservabilityFlag = boolean | {
+    metrics?: boolean;
+    usage?: boolean;
+    buckets?: number[];
+    retentionHours?: number;
+};
+/**
+ * Build the observability stack and install middleware on the executor.
+ *
+ * @param executor - apcore Executor instance (must expose `.use()` to install
+ *   middleware). When `.use()` is missing, middleware installation is skipped
+ *   with a warning and any instantiated collectors are still returned.
+ * @param metricsCollector - Caller-supplied value. `true` → auto-instantiate.
+ *   An existing `MetricsExporter` → pass through untouched. `undefined` /
+ *   `false` → skip metrics.
+ * @param observability - Master flag that additionally enables the usage
+ *   middleware. When `true`, both metrics and usage are installed unless
+ *   already supplied. Fine-grained sub-toggles supported via the object form.
+ */
+export declare function installObservability(executor: unknown, metricsCollector: MetricsExporter | boolean | undefined, observability: ObservabilityFlag | undefined): Promise<ObservabilityStack>;
+//# sourceMappingURL=observability.d.ts.map

package/dist/server/observability.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observability.d.ts","sourceRoot":"","sources":["../../src/server/observability.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,2DAA2D;AAC3D,MAAM,WAAW,kBAAkB;IACjC,iEAAiE;IACjE,gBAAgB,EAAE,eAAe,GAAG,SAAS,CAAC;IAC9C;;;OAGG;IAEH,cAAc,EAAE,GAAG,GAAG,SAAS,CAAC;IAChC,8DAA8D;IAC9D,UAAU,EAAE,OAAO,EAAE,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GACzB,OAAO,GACP;IACE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,GAAG,OAAO,GAAG,SAAS,EACvD,aAAa,EAAE,iBAAiB,GAAG,SAAS,GAC3C,OAAO,CAAC,kBAAkB,CAAC,CA2F7B"}

package/dist/server/observability.js

@@ -0,0 +1,96 @@
+/**
+ * Observability wiring for apcore-mcp.
+ *
+ * Bundles apcore-js's `MetricsCollector` + `MetricsMiddleware` and
+ * `UsageCollector` + `UsageMiddleware` so the bridge can auto-install them
+ * when the caller passes `observability: true` (or `metricsCollector: true`)
+ * to `serve()`, `asyncServe()`, or the `APCoreMCP` constructor.
+ *
+ * Back-compat: when `metricsCollector` is already a concrete
+ * `MetricsExporter` instance, it is passed through unchanged (existing
+ * behaviour). When it is `true`, a fresh MetricsCollector is created
+ * and the matching middleware installed via `executor.use()`.
+ */
+/**
+ * Build the observability stack and install middleware on the executor.
+ *
+ * @param executor - apcore Executor instance (must expose `.use()` to install
+ *   middleware). When `.use()` is missing, middleware installation is skipped
+ *   with a warning and any instantiated collectors are still returned.
+ * @param metricsCollector - Caller-supplied value. `true` → auto-instantiate.
+ *   An existing `MetricsExporter` → pass through untouched. `undefined` /
+ *   `false` → skip metrics.
+ * @param observability - Master flag that additionally enables the usage
+ *   middleware. When `true`, both metrics and usage are installed unless
+ *   already supplied. Fine-grained sub-toggles supported via the object form.
+ */
+export async function installObservability(executor, metricsCollector, observability) {
+    const stack = {
+        metricsCollector: undefined,
+        usageCollector: undefined,
+        middleware: [],
+    };
+    const obsObj = typeof observability === "object" && observability !== null ? observability : null;
+    const obsOn = observability === true || obsObj !== null;
+    const wantMetrics = metricsCollector === true || (obsOn && (obsObj?.metrics ?? true));
+    const wantUsage = obsOn && (obsObj?.usage ?? true);
+    const hasPreMetrics = metricsCollector !== undefined &&
+        metricsCollector !== null &&
+        metricsCollector !== true &&
+        metricsCollector !== false;
+    // Back-compat: pre-instantiated MetricsExporter passed through.
+    if (hasPreMetrics) {
+        stack.metricsCollector = metricsCollector;
+    }
+    if (!wantMetrics && !wantUsage) {
+        return stack;
+    }
+    let apcoreMod;
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        apcoreMod = (await import("apcore-js"));
+    }
+    catch {
+        console.warn("[apcore-mcp] observability requested but apcore-js is not installed; skipping auto-wire.");
+        return stack;
+    }
+    const apcore = apcoreMod;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const executorAny = executor;
+    const useFn = typeof executorAny.use === "function" ? executorAny.use.bind(executorAny) : null;
+    if (wantMetrics && !hasPreMetrics) {
+        const MetricsCollector = apcore.MetricsCollector ??
+            apcore.default?.["MetricsCollector"];
+        const MetricsMiddleware = apcore.MetricsMiddleware;
+        if (MetricsCollector) {
+            const collector = new MetricsCollector(obsObj?.buckets);
+            stack.metricsCollector = collector;
+            if (MetricsMiddleware && useFn) {
+                const mw = new MetricsMiddleware(collector);
+                useFn(mw);
+                stack.middleware.push(mw);
+            }
+            else if (!useFn) {
+                console.warn("[apcore-mcp] Executor does not expose .use() — MetricsMiddleware not installed.");
+            }
+        }
+    }
+    if (wantUsage) {
+        const UsageCollector = apcore.UsageCollector;
+        const UsageMiddleware = apcore.UsageMiddleware;
+        if (UsageCollector) {
+            const collector = new UsageCollector(obsObj?.retentionHours);
+            stack.usageCollector = collector;
+            if (UsageMiddleware && useFn) {
+                const mw = new UsageMiddleware(collector);
+                useFn(mw);
+                stack.middleware.push(mw);
+            }
+            else if (!useFn) {
+                console.warn("[apcore-mcp] Executor does not expose .use() — UsageMiddleware not installed.");
+            }
+        }
+    }
+    return stack;
+}
+//# sourceMappingURL=observability.js.map

package/dist/server/observability.js.map

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

package/dist/server/router.d.ts

@@ -9,6 +9,7 @@
  * accumulated result.
  */
 import type { Executor, TextContentDict } from "../types.js";
+import type { AsyncTaskBridge } from "./async-task-bridge.js";
 /** Tuple of [content array, isError flag, traceId] returned from handleCall. */
 export type CallResult = [TextContentDict[], boolean, string | undefined];
 /**
@@ -18,13 +19,35 @@ export type CallResult = [TextContentDict[], boolean, string | undefined];
  * - `sendNotification` — sends an out-of-band notification on the current session
  * - `sendRequest` — sends a request to the client (used for elicitation)
  * - `_meta.progressToken` — opaque token the client attached to the request
+ * - `_meta.traceparent` — W3C trace_context header propagated from caller
  */
 export interface HandleCallExtra {
     sendNotification?: (notification: Record<string, unknown>) => Promise<void>;
     sendRequest?: (request: Record<string, unknown>, resultSchema: unknown) => Promise<unknown>;
     _meta?: {
         progressToken?: string | number;
+        apcore?: {
+            version?: string;
+        };
+        traceparent?: string;
     };
+    versionHint?: string;
+    /**
+     * Transport session id (e.g. SSEServerTransport.sessionId or
+     * StreamableHTTPServerTransport's per-session UUID). When present and
+     * the bridge is wired, it's recorded so transport-disconnect can call
+     * `cancelSessionTasks(sessionKey)` for cooperative cancellation.
+     * [A-D-018]
+     */
+    sessionId?: string;
+    /**
+     * Per-call id for cooperative cancellation. When omitted, the router
+     * derives one from `_meta.progressToken` or generates a UUID. Wired
+     * by transport-level handlers parsing inbound MCP
+     * `notifications/cancelled` and forwarding to `router.cancel(callId)`.
+     * [B-002]
+     */
+    callId?: string | number;
 }
 /** Options for the ExecutionRouter constructor. */
 export interface ExecutionRouterOptions {
@@ -35,12 +58,54 @@ export interface ExecutionRouterOptions {
      * Only applied to plain-object results; non-object results always use JSON.stringify.
      */
     outputFormatter?: (result: Record<string, unknown>) => string;
+    /**
+     * When true (default), redact sensitive fields from output using apcore's
+     * `redactSensitive()` before formatting. Requires apcore-js to be installed
+     * and the tool to have an output_schema in `outputSchemaMap`.
+     */
+    redactOutput?: boolean;
+    /**
+     * When true, use callWithTrace() (if available on the executor) to include
+     * pipeline trace metadata in the response `_meta.trace`. Default: false.
+     */
+    trace?: boolean;
+    /**
+     * Map of module_id to output_schema, used by redactSensitive() to identify
+     * which fields should be redacted.
+     */
+    outputSchemaMap?: Record<string, Record<string, unknown>>;
+    /**
+     * Optional AsyncTaskBridge that intercepts calls to async-hinted modules
+     * and the four reserved `__apcore_task_*` meta-tools. When absent, all
+     * calls go through the synchronous executor path.
+     */
+    asyncTaskBridge?: AsyncTaskBridge;
+}
+/**
+ * Cooperative cancellation token. Mirrors apcore-py's CancelToken and
+ * Rust's apcore::CancelToken. [B-002]
+ */
+export declare class CancelToken {
+    private _cancelled;
+    get isCancelled(): boolean;
+    cancel(): void;
 }
 export declare class ExecutionRouter {
     private readonly _executor;
     private readonly _errorMapper;
     private readonly _validateInputs;
     private readonly _outputFormatter?;
+    private readonly _redactOutput;
+    private readonly _outputSchemaMap;
+    private readonly _trace;
+    private readonly _asyncTaskBridge?;
+    /**
+     * [B-002] Per-server `call_id → CancelToken` map. Populated on
+     * tool-call entry by handleCall(); consulted by cancel(callId).
+     * Transport layer should forward inbound MCP `notifications/cancelled`
+     * to `router.cancel(callId, reason)`.
+     */
+    private readonly _cancelTokens;
     /**
      * Create an ExecutionRouter.
      *
@@ -48,6 +113,43 @@ export declare class ExecutionRouter {
      * @param options - Optional configuration including validateInputs and outputFormatter
      */
     constructor(executor: Executor, options?: ExecutionRouterOptions);
+    /** Expose the async task bridge (for factory tool-list merging). */
+    get asyncTaskBridge(): AsyncTaskBridge | undefined;
+    /**
+     * Cooperatively cancel an in-flight tool call. [B-002]
+     *
+     * Looks up the CancelToken registered for `callId` in handleCall and
+     * calls `token.cancel()`. Subsequent checks (e.g., from inside the
+     * executing module via `context.cancelToken?.isCancelled`) will see
+     * the cancellation. When `callId` is unknown (cancel arrived before
+     * submit, or after the call completed), records a tombstone so a
+     * subsequent same-id submit immediately sees the cancellation.
+     *
+     * Returns true when a token was found and cancelled; false when the
+     * callId was unknown (tombstone recorded). Wired by transport-level
+     * handlers parsing inbound MCP `notifications/cancelled` messages.
+     */
+    cancel(callId: string, reason?: string): boolean;
+    /**
+     * Internal: register a CancelToken for the duration of a tool call.
+     * Returns the token (already cancelled if a tombstone was recorded
+     * before the call landed).
+     */
+    _registerCancelToken(callId: string): CancelToken;
+    /** Internal: release a token slot after the call completes. */
+    _releaseCancelToken(callId: string): void;
+    /**
+     * [B-002] Cap the cancel-tokens map at CANCEL_TOKENS_MAX. Map preserves
+     * insertion order, so iterator gives oldest first.
+     */
+    private _evictCancelTokens;
+    /**
+     * Attempt to redact sensitive fields from the result using apcore's redactSensitive().
+     *
+     * Returns the original result if apcore-js is not available, redactSensitive is not
+     * exported, or if an error occurs during redaction.
+     */
+    private _maybeRedact;
     /**
      * Format an execution result into text for LLM consumption.
      *
@@ -79,5 +181,17 @@ export declare class ExecutionRouter {
      * @returns Tuple of [content, isError, traceId] where content is an array of text content dicts
      */
     handleCall(toolName: string, args: Record<string, unknown>, extra?: HandleCallExtra): Promise<CallResult>;
+    private _handleCallInner;
+    /**
+     * Preflight validation for a tool call without executing it.
+     *
+     * Delegates to `executor.validate()` if the executor supports it, and
+     * returns a structured validation result.
+     *
+     * @param toolName - The MCP tool name (maps to apcore moduleId)
+     * @param arguments_ - The tool call arguments to validate
+     * @returns Structured validation result with checks array
+     */
+    validateTool(toolName: string, arguments_: Record<string, unknown>): Promise<Record<string, unknown>>;
 }
 //# sourceMappingURL=router.d.ts.map

package/dist/server/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/server/router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAoB,MAAM,aAAa,CAAC;AA2C/E,gFAAgF;AAChF,MAAM,MAAM,UAAU,GAAG,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAE1E;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,KAAK,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC7C;AAED,mDAAmD;AACnD,MAAM,WAAW,sBAAsB;IACrC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC;CAC/D;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAA8C;IAEhF;;;;;OAKG;gBACS,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAOhE;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAgBrB;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAa9B;;;;;;;;;;;;;;;OAeG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,CAAC,EAAE,eAAe,GACtB,OAAO,CAAC,UAAU,CAAC;CAwKvB"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/server/router.ts"],"names":[],"mappings":"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"}