mikser-io-mcp 1.23.1 → 2.0.0

package/index.js

@@ -1,5 +1,5 @@
 // MCP substrate for mikser-io. The mcp plugin exposes
-// `runtime.options.mcp` (a substrate object) at factory time so other
+// the 'mcp' service (a substrate object) at factory time so other
 // plugins can register tools / resources / prompts against it at their
 // onLoaded hook with the same shape as the SDK's McpServer.
 //
@@ -63,6 +63,8 @@ import {
     useProvenance,
     sourcesBehind,
     sourcesOf,
+    provideService,
+    useService,
     registerTool as coreRegisterTool,
     toolNames as coreToolNames,
     toolSchema as coreToolSchema,
@@ -259,7 +261,7 @@ function actingPrincipal() {
     // everything else agree about who is calling.
     const principal = authContext.getStore()?.principal
     if (!principal) return 'agent'
-    const role = actingRole(principal.roles ?? [], runtime.options.roles?.catalogue ?? {})
+    const role = actingRole(principal.roles ?? [], useService('roles')?.catalogue ?? {})
     const subject = principal.subject ?? 'agent'
     return role ? `${subject} (${role})` : subject
 }
@@ -333,11 +335,24 @@ export function createMcpSubstrate() {
             const schema = coreToolSchema(name)
             if (!schema) continue
             try {
-                server.registerTool(
-                    exposed,
-                    { description: schema.description, inputSchema: zodShapeFrom(schema.inputSchema) },
-                    (args) => coreInvokeTool(name, args),
-                )
+                // normalizeInputSchema, not zodShapeFrom: a plugin registering
+                // against the engine may describe its parameters EITHER in the
+                // engine's neutral vocabulary or in zod. zodShapeFrom assumes
+                // neutral, so a real zod shape came through it as a bag of
+                // optional strings — every constraint dropped, no error, and a
+                // tool that looked registered but refused nothing.
+                let inputSchema = normalizeInputSchema(schema.inputSchema)
+                let handler = (args) => coreInvokeTool(name, args)
+                // `mutates: true` reaches here now that the engine registry
+                // carries the whole definition. Without this a mutating tool
+                // registered against the engine would take no changeSet, and
+                // its writes would be unattributable — the one failure nothing
+                // downstream can repair.
+                if (schema.mutates) {
+                    inputSchema = withChangeSetParams(inputSchema)
+                    handler = wrapMutatingHandler(handler)
+                }
+                server.registerTool(exposed, { description: schema.description, inputSchema }, handler)
                 bound.tools++
             } catch (err) {
                 runtime.engine?.logger?.debug(
@@ -828,8 +843,8 @@ function authStatus() {
     const authority = describeAuthority({
         capabilities: principal.capabilities,
         roles: principal.roles ?? [],
-        catalogue: runtime.options.roles?.catalogue ?? {},
-        summaries: runtime.options.roles?.summaries ?? {},
+        catalogue: useService('roles')?.catalogue ?? {},
+        summaries: useService('roles')?.summaries ?? {},
     })
     const exp = principal.claims?.exp
     if (!exp) {
@@ -1497,7 +1512,7 @@ function pinoLevelNumber(name) {
 //
 // The factory creates the substrate SYNCHRONOUSLY so other plugins
 // listed AFTER 'mcp' in the array can register tools/resources at
-// their own onLoaded hook with `if (!runtime.options.mcp) return`
+// their own onLoaded hook by asking core for the 'mcp' service
 // gating already in place from the in-core era. The plugin MUST be
 // FIRST in the user's plugins array — that's a documented invariant
 // in this repo's README.
@@ -1539,12 +1554,19 @@ export function mcp(options = {}) {
         add(runtime.options.corsExposeHeaders, ['mcp-session-id', 'mcp-protocol-version'])
     }
 
-    // Create substrate synchronously. Other plugins' factories /
-    // onLoaded hooks check `if (!runtime.options.mcp) return` before
-    // calling `mcp.simpleTool(...)` — so the substrate has to be on
-    // runtime.options.mcp by the time those run. The mcp plugin MUST
-    // be FIRST in the user's plugins array for that contract to hold.
-    runtime.options.mcp = createMcpSubstrate()
+    // Offered as a service rather than assigned to runtime.options.mcp.
+    //
+    // Tools do not need this at all any more — a plugin registers those
+    // against the engine's registry and this package binds them into each
+    // session. What is left is genuinely MCP's: resources and prompts, which
+    // core deliberately has no vocabulary for.
+    //
+    // A consumer asks core for it from a hook, by which time every factory
+    // has run — which retires the rule this comment used to carry, that the
+    // mcp plugin MUST be FIRST in the user's plugins array. Nothing enforced
+    // that; put it second and the tools silently vanished.
+    const substrate = createMcpSubstrate()
+    provideService('mcp', substrate, { plugin: 'mikser-io-mcp' })
     // mikser_build_report needs the cycle recorded, and recording is off
     // unless a reader asks for it — see report.js requestReport.
     requestReport()
@@ -1565,7 +1587,7 @@ export function mcp(options = {}) {
         // reference (held by plugins, render workers, useLogger
         // consumers) gains the side-channel automatically.
         if (runtime.engine?.logger) {
-            wireLoggerToMcp(runtime.engine.logger, runtime.options.mcp)
+            wireLoggerToMcp(runtime.engine.logger, substrate)
             logger.debug('MCP logger wiring active')
         }
 
@@ -1575,7 +1597,7 @@ export function mcp(options = {}) {
         if (runtime.options.app && runtime.options.mcpPath) {
             await mountMcpOnExpress(
                 runtime.options.app,
-                runtime.options.mcp,
+                substrate,
                 runtime.options.mcpPath,
             )
         }
@@ -1590,7 +1612,7 @@ export function mcp(options = {}) {
     // are silently skipped.
     onLoaded(() => {
         const logger = useLogger()
-        const mcp = runtime.options.mcp
+        const mcp = substrate
         if (!runtime.refs) {
             logger.debug('mikser_refs_* tools skipped: runtime.refs not initialized')
             return
@@ -1995,7 +2017,7 @@ export function mcp(options = {}) {
     })
 
     // mikser_layouts_inspect moved out — registered by mikser-io-layouts
-    // directly against `runtime.options.mcp`, same pattern vector and
+    // directly against the substrate, same pattern vector and
     // schemas use. Domain-owned tools live with the domain plugin; mcp
     // is registry + transport, not a tool catalog.
 
@@ -2017,7 +2039,7 @@ export function mcp(options = {}) {
     //
     onLoaded(() => {
         const logger = useLogger()
-        const mcp = runtime.options.mcp
+        const mcp = substrate
 
         const { render: mcpRender } = useRenderer(runtime, {
             defaultTimeout: options.renderTimeout ?? 30_000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mikser-io-mcp",
-  "version": "1.23.1",
+  "version": "2.0.0",
   "description": "MCP (Model Context Protocol) substrate and tools for mikser-io. Extracted from core to iterate on its own release cadence.",
   "main": "index.js",
   "type": "module",
@@ -42,7 +42,7 @@
     "minimatch": "^10.0.3"
   },
   "peerDependencies": {
-    "mikser-io": "^9.57.0",
+    "mikser-io": "^10.0.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {

package/preview.js

@@ -7,7 +7,7 @@
 // the in-memory preview cache.
 //
 // The cache itself lives in mikser-io's preview plugin
-// (runtime.options.preview.{store, get, stats, config}). This module
+// (the `preview` service: {store, get, stats, config}). This module
 // reaches into it via that surface — no cross-plugin imports.
 
 import path from 'node:path'
@@ -15,7 +15,7 @@ import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { randomUUID, createHmac } from 'node:crypto'
 import { z } from 'zod'
-import { useRenderer, mimeForEntity, matchEntity } from 'mikser-io'
+import { useRenderer, mimeForEntity, matchEntity, useService } from 'mikser-io'
 
 // Resolve a path relative to this module's file. Used to find the
 // public/ folder regardless of where the package is installed (works
@@ -122,7 +122,7 @@ const PREVIEW_UI_SHELL_HTML = readFileSync(path.join(__dirname, "public", "previ
 // Plugin function — invoked by mikser-io-mcp/index.js's factory after
 // the substrate is set up. Registers the MCP-UI surface (shell + modes
 // resource + preview_ui + ui_action) AND the preview-render tool (which
-// reaches into runtime.options.preview for the cache).
+// asks core for the preview service).
 //
 // Not a default export plugin in the mikser sense — this is internal
 // composition. The mcp plugin's index.js is what mikser loads; this
@@ -135,15 +135,17 @@ export default ({
     findEntities,
 }) => {
     onLoaded(() => {
-        if (!runtime.options.mcp) return
-        const mcp = runtime.options.mcp
+        // Asked for from a hook, so every factory has run — including this
+        // package's own, which provides it.
+        const mcp = useService('mcp')
+        if (!mcp) return
         const { render: previewRender } = useRenderer(runtime, {
             defaultTimeout: runtime.config.preview?.renderTimeout ?? 30_000,
         })
 
         // mikser_preview_render — render an entity through the pipeline,
         // stash the bytes in the in-memory preview cache (provided by
-        // mikser-io core's preview plugin via runtime.options.preview),
+        // mikser-io core's preview plugin, offered as the `preview` service),
         // and return a clickable URL. Requires --server (or any
         // engine-supplied Express app) so the URL is reachable.
         mcp.simpleTool(
@@ -155,7 +157,7 @@ export default ({
             },
             async ({ entity = {}, options = {} }) => {
                 const logger = useLogger()
-                const preview = runtime.options.preview
+                const preview = useService('preview')
                 const ok = (data) => ({
                     content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
                 })
@@ -176,7 +178,7 @@ export default ({
                         return fail('mikser_preview_render requires either --url <public-url> or --server to be set so the preview URL is reachable. Use mikser_render to get raw bytes inline instead.')
                     }
                     if (!preview) {
-                        return fail('mikser_preview_render requires the preview cache. Ensure mikser-io core is loaded and runtime.options.preview is available.')
+                        return fail('mikser_preview_render requires the preview cache. Ensure the preview plugin from mikser-io core is in your plugins array.')
                     }
 
                     const cfg = preview.config()