@open-multi-agent/core 1.4.0

package/dist/tool/mcp.js

@@ -0,0 +1,175 @@
+import { z } from 'zod';
+import { defineTool } from './framework.js';
+const DEFAULT_MCP_REQUEST_TIMEOUT_MS = 60_000;
+async function loadMCPModules() {
+    const [{ Client }, { StdioClientTransport }] = await Promise.all([
+        import('@modelcontextprotocol/sdk/client/index.js'),
+        import('@modelcontextprotocol/sdk/client/stdio.js'),
+    ]);
+    return { Client, StdioClientTransport };
+}
+/**
+ * Build an LLM-safe tool name: MCP and prior examples used `prefix/name`, but
+ * Anthropic and other providers reject `/` in tool names.
+ */
+function normalizeToolName(rawName, namePrefix) {
+    const trimmedPrefix = namePrefix?.trim();
+    const base = trimmedPrefix !== undefined && trimmedPrefix !== ''
+        ? `${trimmedPrefix}_${rawName}`
+        : rawName;
+    return base.replace(/\//g, '_');
+}
+/** MCP `tools/list` JSON Schema; forwarded to the LLM as-is (runtime validation stays `z.any()`). */
+function mcpLlmInputSchema(schema) {
+    if (schema !== undefined && typeof schema === 'object' && !Array.isArray(schema)) {
+        return schema;
+    }
+    return { type: 'object' };
+}
+function contentBlockToText(block) {
+    const typ = block.type;
+    if (typ === 'text' && typeof block.text === 'string') {
+        return block.text;
+    }
+    if (typ === 'image' && typeof block.data === 'string') {
+        const mime = typeof block.mimeType === 'string' ? block.mimeType : 'image/*';
+        return `[image ${mime}; base64 length=${block.data.length}]`;
+    }
+    if (typ === 'audio' && typeof block.data === 'string') {
+        const mime = typeof block.mimeType === 'string' ? block.mimeType : 'audio/*';
+        return `[audio ${mime}; base64 length=${block.data.length}]`;
+    }
+    if (typ === 'resource' &&
+        block.resource !== null &&
+        typeof block.resource === 'object') {
+        const r = block.resource;
+        const uri = typeof r.uri === 'string' ? r.uri : '';
+        if (typeof r.text === 'string') {
+            return `[resource ${uri}]\n${r.text}`;
+        }
+        if (typeof r.blob === 'string') {
+            const mime = typeof r.mimeType === 'string' ? r.mimeType : '';
+            return `[resource ${uri}; mimeType=${mime}; blob base64 length=${r.blob.length}]`;
+        }
+        return `[resource ${uri}]`;
+    }
+    if (typ === 'resource_link') {
+        const uri = typeof block.uri === 'string' ? block.uri : '';
+        const name = typeof block.name === 'string' ? block.name : '';
+        const desc = typeof block.description === 'string' ? block.description : '';
+        const head = `[resource_link name=${JSON.stringify(name)} uri=${JSON.stringify(uri)}]`;
+        return desc === '' ? head : `${head}\n${desc}`;
+    }
+    return undefined;
+}
+function toToolResultData(result) {
+    if ('toolResult' in result && result.toolResult !== undefined) {
+        try {
+            return JSON.stringify(result.toolResult, null, 2);
+        }
+        catch {
+            return String(result.toolResult);
+        }
+    }
+    const lines = [];
+    for (const block of result.content ?? []) {
+        if (block === null || typeof block !== 'object')
+            continue;
+        const rec = block;
+        const line = contentBlockToText(rec);
+        if (line !== undefined) {
+            lines.push(line);
+            continue;
+        }
+        try {
+            lines.push(`[${String(rec.type ?? 'unknown')}]\n${JSON.stringify(rec, null, 2)}`);
+        }
+        catch {
+            lines.push('[mcp content block]');
+        }
+    }
+    if (lines.length > 0) {
+        return lines.join('\n');
+    }
+    if (result.structuredContent !== undefined) {
+        try {
+            return JSON.stringify(result.structuredContent, null, 2);
+        }
+        catch {
+            return String(result.structuredContent);
+        }
+    }
+    try {
+        return JSON.stringify(result);
+    }
+    catch {
+        return 'MCP tool completed with non-text output.';
+    }
+}
+async function listAllMcpTools(client, requestOpts) {
+    const acc = [];
+    let cursor;
+    do {
+        const page = await client.listTools(cursor !== undefined ? { cursor } : {}, requestOpts);
+        acc.push(...(page.tools ?? []));
+        cursor =
+            typeof page.nextCursor === 'string' && page.nextCursor !== ''
+                ? page.nextCursor
+                : undefined;
+    } while (cursor !== undefined);
+    return acc;
+}
+/**
+ * Connect to an MCP server over stdio and convert exposed MCP tools into
+ * open-multi-agent ToolDefinitions.
+ */
+export async function connectMCPTools(config) {
+    const { Client, StdioClientTransport } = await loadMCPModules();
+    const transport = new StdioClientTransport({
+        command: config.command,
+        args: config.args ?? [],
+        env: config.env,
+        cwd: config.cwd,
+    });
+    const client = new Client({
+        name: config.clientName ?? 'open-multi-agent',
+        version: config.clientVersion ?? '0.0.0',
+    }, { capabilities: {} });
+    const requestOpts = {
+        timeout: config.requestTimeoutMs ?? DEFAULT_MCP_REQUEST_TIMEOUT_MS,
+    };
+    await client.connect(transport, requestOpts);
+    const mcpTools = await listAllMcpTools(client, requestOpts);
+    const tools = mcpTools.map((tool) => defineTool({
+        name: normalizeToolName(tool.name, config.namePrefix),
+        description: tool.description ?? `MCP tool: ${tool.name}`,
+        inputSchema: z.any(),
+        llmInputSchema: mcpLlmInputSchema(tool.inputSchema),
+        execute: async (input) => {
+            try {
+                const result = await client.callTool({
+                    name: tool.name,
+                    arguments: input,
+                }, undefined, requestOpts);
+                return {
+                    data: toToolResultData(result),
+                    isError: result.isError === true,
+                };
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                return {
+                    data: `MCP tool "${tool.name}" failed: ${message}`,
+                    isError: true,
+                };
+            }
+        },
+    }));
+    return {
+        tools,
+        disconnect: async () => {
+            await client.close?.();
+        },
+    };
+}
+//# sourceMappingURL=mcp.js.map

package/dist/tool/mcp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/tool/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAqD3C,MAAM,8BAA8B,GAAG,MAAM,CAAA;AAE7C,KAAK,UAAU,cAAc;IAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,oBAAoB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/D,MAAM,CAAC,2CAA2C,CAEhD;QACF,MAAM,CAAC,2CAA2C,CAEhD;KACH,CAAC,CAAA;IACF,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAA;AACzC,CAAC;AA4BD;;;GAGG;AACH,SAAS,iBAAiB,CAAC,OAAe,EAAE,UAAmB;IAC7D,MAAM,aAAa,GAAG,UAAU,EAAE,IAAI,EAAE,CAAA;IACxC,MAAM,IAAI,GACR,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,EAAE;QACjD,CAAC,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE;QAC/B,CAAC,CAAC,OAAO,CAAA;IACb,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAED,qGAAqG;AACrG,SAAS,iBAAiB,CACxB,MAA2C;IAE3C,IAAI,MAAM,KAAK,SAAS,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACjF,OAAO,MAAM,CAAA;IACf,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AAC3B,CAAC;AAED,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAA;IACtB,IAAI,GAAG,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,IAAI,CAAA;IACnB,CAAC;IACD,IAAI,GAAG,KAAK,OAAO,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtD,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;QACjE,OAAO,UAAU,IAAI,mBAAmB,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAA;IAC9D,CAAC;IACD,IAAI,GAAG,KAAK,OAAO,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtD,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;QACjE,OAAO,UAAU,IAAI,mBAAmB,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAA;IAC9D,CAAC;IACD,IACE,GAAG,KAAK,UAAU;QAClB,KAAK,CAAC,QAAQ,KAAK,IAAI;QACvB,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAClC,CAAC;QACD,MAAM,CAAC,GAAG,KAAK,CAAC,QAAmC,CAAA;QACnD,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAClD,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,aAAa,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;QACvC,CAAC;QACD,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAA;YAC7D,OAAO,aAAa,GAAG,cAAc,IAAI,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAA;QACnF,CAAC;QACD,OAAO,aAAa,GAAG,GAAG,CAAA;IAC5B,CAAC;IACD,IAAI,GAAG,KAAK,eAAe,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1D,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7D,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAA;QAChE,MAAM,IAAI,GAAG,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAA;QACtF,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAA;IAChD,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA2B;IACnD,IAAI,YAAY,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9D,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACzC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,SAAQ;QACzD,MAAM,GAAG,GAAG,KAAgC,CAAA;QAC5C,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAChB,SAAQ;QACV,CAAC;QACD,IAAI,CAAC;YACH,KAAK,CAAC,IAAI,CACR,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACtE,CAAA;QACH,CAAC;QAAC,MAAM,CAAC;YACP,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACnC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,0CAA0C,CAAA;IACnD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,MAAqB,EACrB,WAAgC;IAEhC,MAAM,GAAG,GAAwB,EAAE,CAAA;IACnC,IAAI,MAA0B,CAAA;IAC9B,GAAG,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CACjC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EACtC,WAAW,CACZ,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAA;QAC/B,MAAM;YACJ,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE;gBAC3D,CAAC,CAAC,IAAI,CAAC,UAAU;gBACjB,CAAC,CAAC,SAAS,CAAA;IACjB,CAAC,QAAQ,MAAM,KAAK,SAAS,EAAC;IAC9B,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAA6B;IAE7B,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,cAAc,EAAE,CAAA;IAE/D,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;QACvB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB;QACE,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,kBAAkB;QAC7C,OAAO,EAAE,MAAM,CAAC,aAAa,IAAI,OAAO;KACzC,EACD,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAA;IAED,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,MAAM,CAAC,gBAAgB,IAAI,8BAA8B;KACnE,CAAA;IAED,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IAE5C,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAE3D,MAAM,KAAK,GAAqB,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACpD,UAAU,CAAC;QACT,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC;QACrD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,aAAa,IAAI,CAAC,IAAI,EAAE;QACzD,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE;QACpB,cAAc,EAAE,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;QACnD,OAAO,EAAE,KAAK,EAAE,KAA8B,EAAE,EAAE;YAChD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAClC;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,KAAK;iBACjB,EACD,SAAS,EACT,WAAW,CACZ,CAAA;gBACD,OAAO;oBACL,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;oBAC9B,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI;iBACjC,CAAA;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GACX,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACxD,OAAO;oBACL,IAAI,EAAE,aAAa,IAAI,CAAC,IAAI,aAAa,OAAO,EAAE;oBAClD,OAAO,EAAE,IAAI;iBACd,CAAA;YACH,CAAC;QACH,CAAC;KACF,CAAC,CACH,CAAA;IAED,OAAO;QACL,KAAK;QACL,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,MAAM,CAAC,KAAK,EAAE,EAAE,CAAA;QACxB,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/tool/text-tool-extractor.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @fileoverview Fallback tool-call extractor for local models.
+ *
+ * When a local model (Ollama, vLLM, LM Studio) returns tool calls as plain
+ * text instead of using the OpenAI `tool_calls` wire format, this module
+ * attempts to extract them from the text output.
+ *
+ * Common scenarios:
+ * - Ollama thinking-model bug: tool call JSON ends up inside unclosed `<think>` tags
+ * - Model outputs raw JSON tool calls without the server parsing them
+ * - Model wraps tool calls in markdown code fences
+ * - Hermes-format `<tool_call>` tags
+ *
+ * This is a **safety net**, not the primary path. Native `tool_calls` from
+ * the server are always preferred.
+ */
+import type { ToolUseBlock } from '../types.js';
+/**
+ * Attempt to extract tool calls from a model's text output.
+ *
+ * Tries multiple strategies in order:
+ * 1. Hermes `<tool_call>` tags
+ * 2. JSON objects in text (bare or inside code fences)
+ *
+ * @param text           - The model's text output.
+ * @param knownToolNames - Whitelist of registered tool names. When non-empty,
+ *                         only JSON objects whose `name` matches a known tool
+ *                         are treated as tool calls.
+ * @returns Extracted {@link ToolUseBlock}s, or an empty array if none found.
+ */
+export declare function extractToolCallsFromText(text: string, knownToolNames: string[]): ToolUseBlock[];
+//# sourceMappingURL=text-tool-extractor.d.ts.map

package/dist/tool/text-tool-extractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text-tool-extractor.d.ts","sourceRoot":"","sources":["../../src/tool/text-tool-extractor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AA4K/C;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EAAE,GACvB,YAAY,EAAE,CAoBhB"}

package/dist/tool/text-tool-extractor.js

@@ -0,0 +1,195 @@
+/**
+ * @fileoverview Fallback tool-call extractor for local models.
+ *
+ * When a local model (Ollama, vLLM, LM Studio) returns tool calls as plain
+ * text instead of using the OpenAI `tool_calls` wire format, this module
+ * attempts to extract them from the text output.
+ *
+ * Common scenarios:
+ * - Ollama thinking-model bug: tool call JSON ends up inside unclosed `<think>` tags
+ * - Model outputs raw JSON tool calls without the server parsing them
+ * - Model wraps tool calls in markdown code fences
+ * - Hermes-format `<tool_call>` tags
+ *
+ * This is a **safety net**, not the primary path. Native `tool_calls` from
+ * the server are always preferred.
+ */
+// ---------------------------------------------------------------------------
+// ID generation
+// ---------------------------------------------------------------------------
+let callCounter = 0;
+/** Generate a unique tool-call ID for extracted calls. */
+function generateToolCallId() {
+    return `extracted_call_${Date.now()}_${++callCounter}`;
+}
+// ---------------------------------------------------------------------------
+// Internal parsers
+// ---------------------------------------------------------------------------
+/**
+ * Try to parse a single JSON object as a tool call.
+ *
+ * Accepted shapes:
+ * ```json
+ * { "name": "bash", "arguments": { "command": "ls" } }
+ * { "name": "bash", "parameters": { "command": "ls" } }
+ * { "function": { "name": "bash", "arguments": { "command": "ls" } } }
+ * ```
+ */
+function parseToolCallJSON(json, knownToolNames) {
+    if (json === null || typeof json !== 'object' || Array.isArray(json)) {
+        return null;
+    }
+    const obj = json;
+    // Shape: { function: { name, arguments } }
+    if (typeof obj['function'] === 'object' && obj['function'] !== null) {
+        const fn = obj['function'];
+        return parseFlat(fn, knownToolNames);
+    }
+    // Shape: { name, arguments|parameters }
+    return parseFlat(obj, knownToolNames);
+}
+function parseFlat(obj, knownToolNames) {
+    const name = obj['name'];
+    if (typeof name !== 'string' || name.length === 0)
+        return null;
+    // Whitelist check — don't treat arbitrary JSON as a tool call
+    if (knownToolNames.size > 0 && !knownToolNames.has(name))
+        return null;
+    let input = {};
+    const args = obj['arguments'] ?? obj['parameters'] ?? obj['input'];
+    if (args !== null && args !== undefined) {
+        if (typeof args === 'string') {
+            try {
+                const parsed = JSON.parse(args);
+                if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+                    input = parsed;
+                }
+            }
+            catch {
+                // Malformed — use empty input
+            }
+        }
+        else if (typeof args === 'object' && !Array.isArray(args)) {
+            input = args;
+        }
+    }
+    return {
+        type: 'tool_use',
+        id: generateToolCallId(),
+        name,
+        input,
+    };
+}
+// ---------------------------------------------------------------------------
+// JSON extraction from text
+// ---------------------------------------------------------------------------
+/**
+ * Find all top-level JSON objects in a string by tracking brace depth.
+ * Returns the parsed objects (not sub-objects).
+ */
+function extractJSONObjects(text) {
+    const results = [];
+    let depth = 0;
+    let start = -1;
+    let inString = false;
+    let escape = false;
+    for (let i = 0; i < text.length; i++) {
+        const ch = text[i];
+        if (escape) {
+            escape = false;
+            continue;
+        }
+        if (ch === '\\' && inString) {
+            escape = true;
+            continue;
+        }
+        if (ch === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (ch === '{') {
+            if (depth === 0)
+                start = i;
+            depth++;
+        }
+        else if (ch === '}') {
+            // Stray `}` outside any open object (e.g. prose like "use ${var}" where
+            // the `${` was prefix-truncated, or a model quoting unbalanced text).
+            // Ignoring it keeps depth non-negative — otherwise the `depth === 0`
+            // anchor for the next `{` would never re-fire, and any later valid JSON
+            // tool calls would be skipped (or the inner sub-object extracted in
+            // their place, which has no `name` field and is silently rejected).
+            if (depth === 0)
+                continue;
+            depth--;
+            if (depth === 0 && start !== -1) {
+                const candidate = text.slice(start, i + 1);
+                try {
+                    results.push(JSON.parse(candidate));
+                }
+                catch {
+                    // Not valid JSON — skip
+                }
+                start = -1;
+            }
+        }
+    }
+    return results;
+}
+// ---------------------------------------------------------------------------
+// Hermes format: <tool_call>...</tool_call>
+// ---------------------------------------------------------------------------
+function extractHermesToolCalls(text, knownToolNames) {
+    const results = [];
+    for (const match of text.matchAll(/<tool_call>\s*([\s\S]*?)\s*<\/tool_call>/g)) {
+        const inner = match[1].trim();
+        try {
+            const parsed = JSON.parse(inner);
+            const block = parseToolCallJSON(parsed, knownToolNames);
+            if (block !== null)
+                results.push(block);
+        }
+        catch {
+            // Malformed hermes content — skip
+        }
+    }
+    return results;
+}
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+/**
+ * Attempt to extract tool calls from a model's text output.
+ *
+ * Tries multiple strategies in order:
+ * 1. Hermes `<tool_call>` tags
+ * 2. JSON objects in text (bare or inside code fences)
+ *
+ * @param text           - The model's text output.
+ * @param knownToolNames - Whitelist of registered tool names. When non-empty,
+ *                         only JSON objects whose `name` matches a known tool
+ *                         are treated as tool calls.
+ * @returns Extracted {@link ToolUseBlock}s, or an empty array if none found.
+ */
+export function extractToolCallsFromText(text, knownToolNames) {
+    if (text.length === 0)
+        return [];
+    const nameSet = new Set(knownToolNames);
+    // Strategy 1: Hermes format
+    const hermesResults = extractHermesToolCalls(text, nameSet);
+    if (hermesResults.length > 0)
+        return hermesResults;
+    // Strategy 2: Strip code fences, then extract JSON objects
+    const stripped = text.replace(/```(?:json)?\s*\n?([\s\S]*?)\n?\s*```/g, '$1');
+    const jsonObjects = extractJSONObjects(stripped);
+    const results = [];
+    for (const obj of jsonObjects) {
+        const block = parseToolCallJSON(obj, nameSet);
+        if (block !== null)
+            results.push(block);
+    }
+    return results;
+}
+//# sourceMappingURL=text-tool-extractor.js.map

package/dist/tool/text-tool-extractor.js.map

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