@markusylisiurunen/tau 0.3.78 → 0.3.80

package/dist/core/mcp/manager.js

@@ -0,0 +1,245 @@
+import { McpClient, McpSessionExpiredError, StdioTransport, StreamableHttpTransport, } from "@earendil-works/pi-mcp";
+import { Value } from "typebox/value";
+import { APP_VERSION } from "../version.js";
+const DEFAULT_DISCOVERY_TIMEOUT_MS = 30_000;
+const DEFAULT_EXECUTION_TIMEOUT_MS = 300_000;
+const MAX_MESSAGE_BYTES = 16 * 1024 * 1024;
+export class McpManager {
+    env;
+    servers;
+    connections = new Map();
+    startups = new Set();
+    cleanups = new Set();
+    closed = false;
+    closePromise;
+    constructor(servers = {}, env = process.env) {
+        this.env = env;
+        this.servers = structuredClone(servers);
+    }
+    get available() {
+        return Object.values(this.servers).some((server) => server.enabled !== false);
+    }
+    listServers() {
+        this.assertOpen();
+        return Object.entries(this.servers)
+            .filter(([, server]) => server.enabled !== false)
+            .map(([name]) => ({ name }));
+    }
+    async listTools(server, signal) {
+        signal.throwIfAborted();
+        const connection = this.getConnection(server);
+        const client = await waitForConnection(connection.ready, signal);
+        signal.throwIfAborted();
+        if (!connection.tools) {
+            const revision = connection.revision;
+            const tools = await this.request(client, () => client.listTools({ signal }));
+            if (revision === connection.revision)
+                connection.tools = tools;
+            return { ...(client.instructions ? { instructions: client.instructions } : {}), tools };
+        }
+        return {
+            ...(client.instructions ? { instructions: client.instructions } : {}),
+            tools: connection.tools,
+        };
+    }
+    async describeTool(server, name, signal) {
+        const { tools } = await this.listTools(server, signal);
+        const tool = tools.find((candidate) => candidate.name === name);
+        if (!tool)
+            throw new Error(`MCP server '${server}' has no tool '${name}'.`);
+        return tool;
+    }
+    async callTool(server, name, args, signal) {
+        const tool = await this.describeTool(server, name, signal);
+        if (!Value.Check(tool.inputSchema, args)) {
+            throw new Error(`Invalid arguments for MCP tool '${server}/${name}'; read its inputSchema.`);
+        }
+        signal.throwIfAborted();
+        const client = await waitForConnection(this.getConnection(server).ready, signal);
+        const result = await this.request(client, () => client.callTool(name, args, {
+            signal,
+            timeoutMs: this.servers[server].timeoutMs ?? DEFAULT_EXECUTION_TIMEOUT_MS,
+        }));
+        return {
+            content: result.content.map(stripContentMetadata),
+            ...(result.structuredContent === undefined
+                ? {}
+                : { structuredContent: result.structuredContent }),
+            isError: result.isError ?? false,
+        };
+    }
+    async listResources(server, signal) {
+        signal.throwIfAborted();
+        const client = await waitForConnection(this.getConnection(server).ready, signal);
+        const resources = await this.request(client, () => client.listResources({ signal }));
+        return resources.map(({ _meta, ...resource }) => resource);
+    }
+    async listResourceTemplates(server, signal) {
+        signal.throwIfAborted();
+        const client = await waitForConnection(this.getConnection(server).ready, signal);
+        const templates = await this.request(client, () => client.listResourceTemplates({ signal }));
+        return templates.map(({ _meta, ...template }) => template);
+    }
+    async readResource(server, uri, signal) {
+        signal.throwIfAborted();
+        const client = await waitForConnection(this.getConnection(server).ready, signal);
+        const result = await this.request(client, () => client.readResource(uri, {
+            signal,
+            timeoutMs: this.servers[server].timeoutMs ?? DEFAULT_EXECUTION_TIMEOUT_MS,
+        }));
+        return {
+            contents: result.contents.map(({ _meta, ...content }) => content),
+        };
+    }
+    close() {
+        this.closed = true;
+        this.closePromise ??= this.closeConnections();
+        return this.closePromise;
+    }
+    async closeConnections() {
+        const connections = [...this.connections.values()];
+        this.connections.clear();
+        const results = await Promise.allSettled(connections.map(async ({ client, ready }) => {
+            await this.closeClient(client);
+            await ready.catch(() => { });
+        }));
+        await Promise.allSettled(this.startups);
+        const cleanups = await Promise.allSettled(this.cleanups);
+        if ([...results, ...cleanups].some((result) => result.status === "rejected")) {
+            throw new Error("failed to close MCP connections");
+        }
+    }
+    async request(client, run) {
+        try {
+            return await run();
+        }
+        catch (error) {
+            if (error instanceof McpSessionExpiredError)
+                await this.closeClient(client);
+            throw error;
+        }
+    }
+    closeClient(client) {
+        const cleanup = client.close();
+        this.cleanups.add(cleanup);
+        void cleanup.then(() => this.cleanups.delete(cleanup), () => this.cleanups.delete(cleanup));
+        return cleanup;
+    }
+    assertOpen() {
+        if (this.closed)
+            throw new Error("MCP connections are closed.");
+    }
+    getConnection(name) {
+        this.assertOpen();
+        const server = Object.hasOwn(this.servers, name) ? this.servers[name] : undefined;
+        if (!server || server.enabled === false)
+            throw new Error(`MCP server '${name}' is unavailable.`);
+        const existing = this.connections.get(name);
+        if (existing && existing.client.connectionState !== "closed")
+            return existing;
+        const client = new McpClient({
+            name: "tau",
+            version: APP_VERSION,
+            requestTimeoutMs: server.discoveryTimeoutMs ?? DEFAULT_DISCOVERY_TIMEOUT_MS,
+        });
+        const transport = this.createTransport(name, server);
+        const connection = {
+            client,
+            ready: Promise.resolve(client),
+            revision: 0,
+        };
+        this.connections.set(name, connection);
+        client.onNotification("notifications/tools/list_changed", () => {
+            connection.tools = undefined;
+            connection.revision++;
+        });
+        const timer = setTimeout(() => {
+            void this.closeClient(client).catch(() => { });
+        }, server.discoveryTimeoutMs ?? DEFAULT_DISCOVERY_TIMEOUT_MS);
+        connection.ready = client
+            .connect(transport)
+            .then(() => {
+            this.assertOpen();
+            return client;
+        }, () => {
+            throw new Error(`failed to connect MCP server '${name}'; check its configuration and authentication`);
+        })
+            .finally(() => clearTimeout(timer));
+        this.startups.add(connection.ready);
+        // A caller can be cancelled while the shared startup continues to its request deadline.
+        void connection.ready.then(() => this.startups.delete(connection.ready), () => this.startups.delete(connection.ready));
+        return connection;
+    }
+    createTransport(name, server) {
+        const expand = (values = {}) => Object.fromEntries(Object.entries(values).map(([key, value]) => [
+            key,
+            value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, variable) => {
+                const resolved = this.env[variable];
+                if (resolved === undefined)
+                    throw new Error(`MCP server '${name}' requires environment variable '${variable}'.`);
+                return resolved;
+            }),
+        ]));
+        if (server.type === "http") {
+            return new StreamableHttpTransport({
+                url: server.url,
+                headers: expand(server.headers),
+                fetch: boundedFetch(Math.max(server.timeoutMs ?? DEFAULT_EXECUTION_TIMEOUT_MS, server.discoveryTimeoutMs ?? DEFAULT_DISCOVERY_TIMEOUT_MS)),
+                maxMessageBytes: MAX_MESSAGE_BYTES,
+            });
+        }
+        return new StdioTransport({
+            command: server.command,
+            args: server.args,
+            cwd: server.cwd,
+            env: {
+                ...Object.fromEntries(Object.entries(this.env).filter((entry) => typeof entry[1] === "string")),
+                ...expand(server.env),
+            },
+            inheritEnv: false,
+            maxMessageBytes: MAX_MESSAGE_BYTES,
+        });
+    }
+}
+function stripContentMetadata(block) {
+    const { _meta, ...content } = block;
+    if (content.type !== "resource")
+        return content;
+    const { _meta: resourceMeta, ...resource } = content.resource;
+    return { ...content, resource };
+}
+function boundedFetch(timeoutMs) {
+    return async (input, init) => {
+        const signal = init?.method === "GET"
+            ? init.signal
+            : AbortSignal.any([...(init?.signal ? [init.signal] : []), AbortSignal.timeout(timeoutMs)]);
+        const response = await fetch(input, { ...init, signal });
+        if (!response.body ||
+            response.headers.get("content-type")?.split(";")[0]?.trim() === "text/event-stream") {
+            return response;
+        }
+        let bytes = 0;
+        const body = response.body.pipeThrough(new TransformStream({
+            transform(chunk, controller) {
+                bytes += chunk.byteLength;
+                if (bytes > MAX_MESSAGE_BYTES)
+                    throw new Error("MCP HTTP response exceeded the 16 MiB limit.");
+                controller.enqueue(chunk);
+            },
+        }));
+        return new Response(body, {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+    };
+}
+function waitForConnection(promise, signal) {
+    signal.throwIfAborted();
+    return new Promise((resolve, reject) => {
+        const onAbort = () => reject(signal.reason);
+        signal.addEventListener("abort", onAbort, { once: true });
+        promise.then(resolve, reject).finally(() => signal.removeEventListener("abort", onAbort));
+    });
+}
+//# sourceMappingURL=manager.js.map

package/dist/core/mcp/manager.js.map

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

package/dist/core/mcp/search.js

@@ -0,0 +1,77 @@
+import { rankBm25 } from "../utils/bm25.js";
+function schemaText(schema, parts) {
+    if (typeof schema !== "object" || schema === null || Array.isArray(schema))
+        return;
+    const value = schema;
+    if (typeof value.description === "string")
+        parts.push(value.description);
+    if (typeof value.properties === "object" && value.properties !== null) {
+        for (const [name, property] of Object.entries(value.properties)) {
+            parts.push(name);
+            schemaText(property, parts);
+        }
+    }
+    schemaText(value.items, parts);
+    for (const key of ["anyOf", "oneOf", "allOf"]) {
+        const variants = value[key];
+        if (Array.isArray(variants))
+            for (const variant of variants)
+                schemaText(variant, parts);
+    }
+}
+export async function searchMcpTools(manager, query, options, signal) {
+    signal.throwIfAborted();
+    const servers = options.server === undefined
+        ? manager.listServers().map((server) => server.name)
+        : [options.server];
+    const catalogs = new Array(servers.length);
+    const failures = new Array(servers.length);
+    let next = 0;
+    await Promise.all(Array.from({ length: Math.min(4, servers.length) }, async () => {
+        while (next < servers.length) {
+            signal.throwIfAborted();
+            const index = next++;
+            const server = servers[index];
+            try {
+                catalogs[index] = await manager.listTools(server, signal);
+            }
+            catch {
+                signal.throwIfAborted();
+                failures[index] = { server, error: "failed to discover tools" };
+            }
+        }
+    }));
+    signal.throwIfAborted();
+    const tools = [];
+    const documents = catalogs.flatMap((catalog, index) => {
+        if (!catalog)
+            return [];
+        const server = servers[index];
+        return catalog.tools.map((tool) => {
+            const id = String(tools.length);
+            tools.push({
+                server,
+                name: tool.name,
+                ...(tool.description ? { description: tool.description } : {}),
+            });
+            // Repeated name tokens give exact tool-name matches more influence.
+            const parts = [
+                tool.name,
+                tool.name,
+                tool.description ?? "",
+                server,
+                catalog.instructions ?? "",
+            ];
+            schemaText(tool.inputSchema, parts);
+            return { id, text: parts.join(" ") };
+        });
+    });
+    return {
+        tools: rankBm25(query, documents, options.limit).map((match) => ({
+            ...tools[Number(match.id)],
+            score: match.score,
+        })),
+        errors: failures.filter((failure) => failure !== undefined),
+    };
+}
+//# sourceMappingURL=search.js.map

package/dist/core/mcp/search.js.map

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

package/dist/core/models/catalog.js

@@ -1,52 +1,4 @@
 import { getBuiltinModels, getBuiltinProviders } from "@earendil-works/pi-ai/providers/all";
-import { z } from "zod";
-const CostTierSchema = z
-    .object({
-    inputTokensAbove: z.number().int().nonnegative(),
-    input: z.number().nonnegative(),
-    output: z.number().nonnegative(),
-    cacheRead: z.number().nonnegative(),
-    cacheWrite: z.number().nonnegative(),
-})
-    .strip();
-const CostSchema = z
-    .object({
-    input: z.number().nonnegative().optional(),
-    output: z.number().nonnegative().optional(),
-    cacheRead: z.number().nonnegative().optional(),
-    cacheWrite: z.number().nonnegative().optional(),
-    tiers: z.array(CostTierSchema).optional(),
-})
-    .optional();
-const ModelSchema = z
-    .object({
-    id: z.string().trim().min(1),
-    name: z.string().trim().min(1).optional(),
-    api: z.string().trim().min(1).optional(),
-    baseUrl: z.string().trim().min(1).optional(),
-    headers: z.record(z.string(), z.string()).optional(),
-    reasoning: z.boolean().optional(),
-    input: z.array(z.enum(["text", "image"])).optional(),
-    cost: CostSchema,
-    contextWindow: z.number().int().positive().optional(),
-    maxTokens: z.number().int().positive().optional(),
-    compat: z.unknown().optional(),
-})
-    .strip();
-const ProviderSchema = z
-    .object({
-    api: z.string().trim().min(1).optional(),
-    baseUrl: z.string().trim().min(1).optional(),
-    headers: z.record(z.string(), z.string()).optional(),
-    compat: z.unknown().optional(),
-    models: z.array(ModelSchema).optional(),
-})
-    .strip();
-const ModelsFileSchema = z
-    .object({
-    providers: z.record(z.string(), ProviderSchema),
-})
-    .strip();
 let catalogState;
 function ensureProviderModels(providers, provider) {
     const existing = providers.get(provider);
@@ -121,104 +73,6 @@ function cloneModel(model) {
             : {}),
     };
 }
-function isObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function mergeCompat(base, patch) {
-    if (patch === undefined) {
-        return base;
-    }
-    if (isObject(base) && isObject(patch)) {
-        return {
-            ...base,
-            ...patch,
-        };
-    }
-    return patch;
-}
-function applyModelPatch(model, patch) {
-    let next = cloneModel(model);
-    if (patch.api !== undefined) {
-        next = { ...next, api: patch.api };
-    }
-    if (patch.baseUrl !== undefined) {
-        next = { ...next, baseUrl: patch.baseUrl };
-    }
-    if (patch.headers !== undefined) {
-        next = {
-            ...next,
-            headers: {
-                ...(next.headers ?? {}),
-                ...patch.headers,
-            },
-        };
-    }
-    if (patch.compat !== undefined) {
-        next = {
-            ...next,
-            compat: mergeCompat(next.compat, patch.compat),
-        };
-    }
-    if (patch.name !== undefined) {
-        next = { ...next, name: patch.name };
-    }
-    if (patch.reasoning !== undefined) {
-        next = { ...next, reasoning: patch.reasoning };
-    }
-    if (patch.input !== undefined) {
-        next = { ...next, input: [...patch.input] };
-    }
-    if (patch.cost !== undefined) {
-        next = {
-            ...next,
-            cost: {
-                ...next.cost,
-                ...patch.cost,
-            },
-        };
-    }
-    if (patch.contextWindow !== undefined) {
-        next = { ...next, contextWindow: patch.contextWindow };
-    }
-    if (patch.maxTokens !== undefined) {
-        next = { ...next, maxTokens: patch.maxTokens };
-    }
-    return next;
-}
-function mergeProviderPatch(base, overlay) {
-    const mergedHeaders = {
-        ...(base?.headers ?? {}),
-        ...(overlay.headers ?? {}),
-    };
-    return {
-        ...(base ?? {}),
-        ...overlay,
-        ...(Object.keys(mergedHeaders).length > 0 ? { headers: mergedHeaders } : {}),
-        compat: mergeCompat(base?.compat, overlay.compat),
-    };
-}
-function createProviderPatch(provider) {
-    return {
-        ...(provider.api !== undefined ? { api: provider.api } : {}),
-        ...(provider.baseUrl !== undefined ? { baseUrl: provider.baseUrl } : {}),
-        ...(provider.headers !== undefined ? { headers: provider.headers } : {}),
-        ...(provider.compat !== undefined ? { compat: provider.compat } : {}),
-    };
-}
-function createModelPatch(model) {
-    return {
-        ...(model.api !== undefined ? { api: model.api } : {}),
-        ...(model.baseUrl !== undefined ? { baseUrl: model.baseUrl } : {}),
-        ...(model.headers !== undefined ? { headers: model.headers } : {}),
-        ...(model.compat !== undefined ? { compat: model.compat } : {}),
-        ...(model.name !== undefined ? { name: model.name } : {}),
-        ...(model.reasoning !== undefined ? { reasoning: model.reasoning } : {}),
-        ...(model.input !== undefined ? { input: model.input } : {}),
-        ...(model.cost !== undefined ? { cost: model.cost } : {}),
-        ...(model.contextWindow !== undefined ? { contextWindow: model.contextWindow } : {}),
-        ...(model.maxTokens !== undefined ? { maxTokens: model.maxTokens } : {}),
-    };
-}
 function createSyntheticModel(provider, modelId, providerTemplates) {
     const template = providerTemplates.get(provider);
     if (!template) {
@@ -230,44 +84,7 @@ function createSyntheticModel(provider, modelId, providerTemplates) {
         name: modelId,
     };
 }
-function formatZodError(error) {
-    return error.issues
-        .map((issue) => {
-        const path = issue.path.length > 0 ? `${issue.path.join(".")}: ` : "";
-        return `${path}${issue.message}`;
-    })
-        .join("; ");
-}
-function loadModelsFile(path, deps) {
-    let rawText;
-    try {
-        rawText = deps.fs.readFile(path);
-    }
-    catch (error) {
-        return {
-            error: `${path}: failed to read models file: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-    let parsedJson;
-    try {
-        parsedJson = JSON.parse(rawText);
-    }
-    catch (error) {
-        return {
-            error: `${path}: failed to parse json: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-    const parsed = ModelsFileSchema.safeParse(parsedJson);
-    if (!parsed.success) {
-        return {
-            error: `${path}: invalid models schema: ${formatZodError(parsed.error)}`,
-        };
-    }
-    return { data: parsed.data };
-}
-export function loadModelResolver(options) {
-    const deps = options.deps;
-    const levels = options.levels;
+export function loadModelResolver(options = {}) {
     const state = options.remoteCatalog
         ? createCatalogState(options.remoteCatalog)
         : getCatalogState();
@@ -284,55 +101,6 @@ export function loadModelResolver(options) {
             modelsByKey.set(modelKey(provider, model.id), cloneModel(model));
         }
     }
-    const providerPatches = new Map();
-    const modelPatches = new Map();
-    const errors = [];
-    for (const level of levels) {
-        if (!deps.fs.exists(level.modelsPath)) {
-            continue;
-        }
-        const loaded = loadModelsFile(level.modelsPath, deps);
-        if (loaded.error) {
-            errors.push(loaded.error);
-            continue;
-        }
-        if (!loaded.data) {
-            continue;
-        }
-        for (const [providerNameRaw, providerConfig] of Object.entries(loaded.data.providers)) {
-            const providerName = providerNameRaw.trim().toLowerCase();
-            if (!providerName || !knownProviders.has(providerName)) {
-                errors.push(`${level.modelsPath}: unknown provider '${providerNameRaw}'.`);
-                continue;
-            }
-            const providerPatch = createProviderPatch(providerConfig);
-            if (Object.keys(providerPatch).length > 0) {
-                providerPatches.set(providerName, mergeProviderPatch(providerPatches.get(providerName), providerPatch));
-            }
-            for (const modelConfig of providerConfig.models ?? []) {
-                const key = modelKey(providerName, modelConfig.id);
-                if (!modelsByKey.has(key)) {
-                    const synthetic = createSyntheticModel(providerName, modelConfig.id, providerTemplates);
-                    if (!synthetic) {
-                        errors.push(`${level.modelsPath}: provider '${providerName}' does not have bundled defaults to derive model '${modelConfig.id}'.`);
-                        continue;
-                    }
-                    modelsByKey.set(key, synthetic);
-                }
-                const patches = modelPatches.get(key) ?? [];
-                patches.push(createModelPatch(modelConfig));
-                modelPatches.set(key, patches);
-            }
-        }
-    }
-    for (const [key, baseModel] of modelsByKey.entries()) {
-        const providerPatch = providerPatches.get(baseModel.provider);
-        let resolved = providerPatch ? applyModelPatch(baseModel, providerPatch) : baseModel;
-        for (const modelPatch of modelPatches.get(key) ?? []) {
-            resolved = applyModelPatch(resolved, modelPatch);
-        }
-        modelsByKey.set(key, resolved);
-    }
     const resolveConfiguredModel = (providerRaw, modelIdRaw) => {
         const provider = providerRaw.trim().toLowerCase();
         const modelId = modelIdRaw.trim();
@@ -359,16 +127,11 @@ export function loadModelResolver(options) {
         if (!synthetic) {
             return undefined;
         }
-        const providerPatch = providerPatches.get(provider);
-        if (!providerPatch) {
-            return synthetic;
-        }
-        return applyModelPatch(synthetic, providerPatch);
+        return synthetic;
     };
     return {
         resolveModel,
         resolveConfiguredModel,
-        errors,
     };
 }
 export function listProviders() {