@anteros/core 0.0.41 → 0.0.42

package/server/mcp.ts

@@ -10,72 +10,18 @@ import {
     ErrorCode,
 } from "@modelcontextprotocol/sdk/types.js";
 import { StreamableHTTPTransport } from "@hono/mcp";
-import type Joi from "joi";
 import { cfg } from "./config";
 import { useRest } from "../database/rest";
+import { createAgents } from "../lib/agents";
+import { createApi } from "../lib/api";
 import { logger } from "../utils/logger";
 import type { McpTool, McpResource } from "../types/mcp";
 import type { HonoVariables } from "./env";
+import { joiToJsonSchema } from "../lib/jsonSchema";
+import { patterns } from "../lib/endpoints";
 
-// ─── Joi → JSON Schema (for the MCP protocol) ────────────────────────────
-
-function joiTypeToJson(type: string): string {
-    switch (type) {
-        case 'number': return 'number';
-        case 'integer': return 'integer';
-        case 'boolean': return 'boolean';
-        case 'date': return 'string';
-        default: return 'string';
-    }
-}
-
-/** Minimal Joi → JSON Schema converter (covers the common field types). */
-function joiToJsonSchema(schema: Joi.Schema, describe = schema.describe() as any): any {
-    const node: any = {};
-    const type = describe?.type;
-
-    switch (type) {
-        case 'object': {
-            node.type = 'object';
-            const properties: Record<string, any> = {};
-            const required: string[] = [];
-            for (const [key, child] of Object.entries(describe.keys ?? {})) {
-                properties[key] = joiToJsonSchema(child as any, child);
-                if ((child as any)?.flags?.presence === 'required') required.push(key);
-            }
-            node.properties = properties;
-            if (required.length) node.required = required;
-            break;
-        }
-        case 'array': {
-            node.type = 'array';
-            if (describe.items?.length) node.items = joiToJsonSchema(describe.items[0], describe.items[0]);
-            break;
-        }
-        default: {
-            node.type = joiTypeToJson(type);
-            if (type === 'date') node.format = 'date-time';
-            if (type === 'string') {
-                for (const rule of describe.rules ?? []) {
-                    if (['email', 'uri', 'uuid', 'isoDate', 'ip'].includes(rule.name)) {
-                        node.format = rule.name;
-                    }
-                    if (rule.name === 'pattern' && rule.args?.regex) {
-                        node.pattern = String(rule.args.regex).replace(/^\/|\/[gimsuy]*$/g, '');
-                    }
-                }
-            }
-            if (describe.valids?.length && describe.valids.length <= 50) {
-                node.enum = describe.valids;
-            }
-            break;
-        }
-    }
-
-    if (describe?.flags?.presence === 'required') node.description = node.description ?? 'required';
-    if (describe?.flags?.description) node.description = describe.flags.description;
-    return node;
-}
+// The Joi → JSON Schema converter is shared with the agent runtime — a tool
+// must look identical whether it is exposed over MCP or to a model.
 
 // ─── URI template matching (users://{id} → params) ───────────────────────
 
@@ -148,7 +94,13 @@ function buildServer(tenantId: string, tools: McpTool[], resources: McpResource[
 
         const rest = new useRest({ tenant_id: tenantId });
         try {
-            const result = await tool.exec({ c: undefined as any, rest, args: value });
+            const result = await tool.exec({
+                c: undefined as any,
+                rest,
+                args: value,
+                agents: createAgents(tenantId, rest),
+                api: createApi(rest),
+            });
             const isError = !!(result as any)?.isError;
             logger[isError ? 'warn' : 'info']('MCP tools/call', { method: 'tools/call', tenant: tenantId, tool: req.params.name, args: value, isError, duration: ms(start) });
             if (result && Array.isArray(result.content)) return result;
@@ -205,6 +157,8 @@ function buildServer(tenantId: string, tools: McpTool[], resources: McpResource[
             const result = await matched.resource.read({
                 c: undefined as any,
                 rest,
+                agents: createAgents(tenantId, rest),
+                api: createApi(rest),
                 params: matched.params,
                 uri,
             });
@@ -221,7 +175,7 @@ function buildServer(tenantId: string, tools: McpTool[], resources: McpResource[
 
 /**
  * Expose each tenant's MCP tools & resources over the Model Context Protocol
- * at `GET/POST /mcp/:tenant_id` (Streamable HTTP transport — works with
+ * at `GET/POST /api/:tenant_id/mcp` (Streamable HTTP transport — works with
  * Claude, Cursor, VS Code, and any MCP client).
  */
 export function initializeMcp(app: Hono<{ Variables: HonoVariables }>) {
@@ -238,7 +192,7 @@ export function initializeMcp(app: Hono<{ Variables: HonoVariables }>) {
         resourcesByTenant.set(resource._tenant_ ?? '', list);
     }
 
-    app.all('/mcp/:tenant_id', async (c: Context<{ Variables: HonoVariables }>) => {
+    app.all(patterns.mcp, async (c: Context<{ Variables: HonoVariables }>) => {
         const tenantId = c.req.param('tenant_id') ?? '';
         const tools = toolsByTenant.get(tenantId) ?? [];
         const resources = resourcesByTenant.get(tenantId) ?? [];

package/server/routes.ts

@@ -3,10 +3,26 @@ import { cfg } from "./config";
 import path from "path";
 import { jwt } from "../utils/func";
 import { useRest } from "../database/rest";
+import { createAgents } from "../lib/agents";
+import { createApi } from "../lib/api";
 import { io } from "./io";
 import { requestCtxStorage } from "../lib/asyncContextStorage";
 import type { HonoVariables } from "./env";
 
+/** The context of a route handler — `rest` and `agents` share the same tenant. */
+function routeContext(c: any, tenantId: string) {
+    const rest = new useRest({ tenant_id: tenantId });
+    return {
+        c,
+        rest,
+        // Tenant-scoped LLM registry, bound to this request's `rest`
+        agents: createAgents(tenantId, rest),
+        api: createApi(rest),
+        jwt: jwt,
+        io: io,
+    };
+}
+
 function initializeRoutes(app: Hono<{ Variables: HonoVariables }>) {
     for (let route of cfg.routes ?? []) {
         if (route._prefix_) {
@@ -24,42 +40,21 @@ function initializeRoutes(app: Hono<{ Variables: HonoVariables }>) {
             if (route.method == "GET") {
                 app.get(routePath, async (c) => { //
                     resolveTenant();
-                    return route.handler({
-                        c,
-                        rest: new useRest({
-                            tenant_id: route._tenant_,
-                        }),
-                        jwt: jwt,
-                        io: io,
-                    });
+                    return route.handler(routeContext(c, route._tenant_!));
                 });
             }
 
             if (route.method == 'POST') {
                 app.post(routePath, async (c) => {
                     resolveTenant();
-                    return route.handler({
-                        c,
-                        rest: new useRest({
-                            tenant_id: route._tenant_,
-                        }),
-                        jwt: jwt,
-                        io: io,
-                    });
+                    return route.handler(routeContext(c, route._tenant_!));
                 });
             }
 
             if (route.method == "PUT") {
                 app.put(routePath, async (c) => { //
                     resolveTenant();
-                    return route.handler({
-                        c,
-                        rest: new useRest({
-                            tenant_id: route._tenant_,
-                        }),
-                        jwt: jwt,
-                        io: io,
-                    });
+                    return route.handler(routeContext(c, route._tenant_!));
                 });
             }
         }