@sisu-ai/mw-tool-calling 9.0.0 → 9.0.2

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import type { Middleware } from '@sisu-ai/core';
+import type { Middleware } from "@sisu-ai/core";
 export declare const toolCalling: Middleware;
 export declare const iterativeToolCalling: Middleware;

package/dist/index.js

@@ -1,41 +1,99 @@
+/**
+ * Apply user-configured aliases to tools before passing to adapter.
+ * Creates new tool objects with aliased names while keeping originals in registry.
+ */
+function applyAliasesToTools(tools, aliasMap) {
+    if (!aliasMap || aliasMap.size === 0) {
+        // No aliases configured - return tools as-is with identity map
+        const reverseMap = new Map();
+        for (const tool of tools) {
+            reverseMap.set(tool.name, tool.name);
+        }
+        return { aliasedTools: tools, reverseMap };
+    }
+    const aliasedTools = [];
+    const reverseMap = new Map();
+    for (const tool of tools) {
+        const alias = aliasMap.get(tool.name);
+        if (alias) {
+            // Create new tool object with aliased name
+            const aliasedTool = { ...tool, name: alias };
+            aliasedTools.push(aliasedTool);
+            reverseMap.set(alias, tool.name); // alias -> canonical
+        }
+        else {
+            // No alias for this tool - use as-is
+            aliasedTools.push(tool);
+            reverseMap.set(tool.name, tool.name); // identity mapping
+        }
+    }
+    return { aliasedTools, reverseMap };
+}
 export const toolCalling = async (ctx, next) => {
     await next();
+    const toolList = ctx.tools.list();
+    const userAliases = ctx.state.toolAliases;
+    const { aliasedTools, reverseMap } = applyAliasesToTools(toolList, userAliases);
     for (let i = 0; i < 6; i++) {
-        ctx.log.debug?.('[tool-calling] iteration start', { i, messages: ctx.messages.length });
-        const toolList = ctx.tools.list();
-        const allowTools = i === 0 ? 'auto' : 'none';
-        const genOpts = { toolChoice: allowTools, signal: ctx.signal };
-        if (allowTools !== 'none') {
-            genOpts.tools = toolList;
+        ctx.log.debug?.("[tool-calling] iteration start", {
+            i,
+            messages: ctx.messages.length,
+        });
+        const allowTools = i === 0 ? "auto" : "none";
+        const genOpts = {
+            toolChoice: allowTools,
+            signal: ctx.signal,
+        };
+        if (allowTools !== "none") {
+            genOpts.tools = aliasedTools; // Pass renamed tools to adapter
             genOpts.parallelToolCalls = false;
         }
         const out = await ctx.model.generate(ctx.messages, genOpts);
+        if (!out || typeof out !== "object" || !("message" in out)) {
+            throw new Error("[tool-calling] model did not return a message");
+        }
         const msg = out.message;
         const toolCalls = msg.tool_calls;
         if (toolCalls && toolCalls.length > 0) {
             // Important: include the assistant message that requested tools so tool_call_id has a valid anchor.
             ctx.messages.push(msg);
-            ctx.log.info?.('[tool-calling] model requested tools', toolCalls.map(tc => ({ id: tc.id, name: tc.name, hasArgs: typeof tc.arguments !== 'undefined' })));
+            ctx.log.info?.("[tool-calling] model requested tools", toolCalls.map((tc) => ({
+                id: tc.id,
+                name: tc.name,
+                hasArgs: typeof tc.arguments !== "undefined",
+            })));
             // Execute each unique (name,args) once, but reply to every tool_call_id.
             const cache = new Map();
             const keyOf = (tc) => `${tc.name}:${safeStableStringify(tc.arguments)}`;
             const lastArgsByName = new Map();
             // Pre-pass: fill missing arguments from last seen arguments of same tool name (provider quirk)
             const resolvedCalls = toolCalls.map((tc) => {
-                if (typeof tc.arguments === 'undefined' && lastArgsByName.has(tc.name)) {
+                if (typeof tc.arguments === "undefined" &&
+                    lastArgsByName.has(tc.name)) {
                     return { ...tc, arguments: lastArgsByName.get(tc.name) };
                 }
                 return tc;
             });
             for (const call of resolvedCalls) {
-                const tool = ctx.tools.get(call.name);
+                // Resolve alias back to canonical tool name
+                const canonicalName = reverseMap.get(call.name);
+                if (!canonicalName)
+                    throw new Error("Unknown tool: " + call.name);
+                const tool = ctx.tools.get(canonicalName);
                 if (!tool)
-                    throw new Error('Unknown tool: ' + call.name);
+                    throw new Error("Unknown tool: " + canonicalName);
                 const key = keyOf(call);
                 let result = cache.get(key);
                 if (result === undefined) {
-                    const args = tool.schema?.parse ? tool.schema.parse(call.arguments) : call.arguments;
-                    ctx.log.debug?.('[tool-calling] invoking tool', { name: call.name, id: call.id, args });
+                    const args = tool.schema?.parse
+                        ? tool.schema.parse(call.arguments)
+                        : call.arguments;
+                    ctx.log.debug?.("[tool-calling] invoking tool", {
+                        aliasName: call.name,
+                        canonicalName: canonicalName,
+                        id: call.id,
+                        args,
+                    });
                     // Create restricted context for tool execution
                     const toolCtx = {
                         memory: ctx.memory,
@@ -50,21 +108,25 @@ export const toolCalling = async (ctx, next) => {
                     lastArgsByName.set(call.name, args);
                 }
                 else {
-                    ctx.log.debug?.('[tool-calling] reusing cached tool result for duplicate call', { name: call.name, id: call.id });
+                    ctx.log.debug?.("[tool-calling] reusing cached tool result for duplicate call", { name: call.name, id: call.id });
                 }
                 // Prefer tool_call_id when available (tools API)
-                const toolMsg = { role: 'tool', content: JSON.stringify(result) };
-                if (call.id)
-                    toolMsg.tool_call_id = call.id;
-                else
-                    toolMsg.name = call.name;
+                const toolMsg = {
+                    role: "tool",
+                    content: JSON.stringify(result),
+                    ...(call.id ? { tool_call_id: call.id } : { name: call.name }),
+                };
                 ctx.messages.push(toolMsg);
-                ctx.log.debug?.('[tool-calling] tool result appended', { name: call.name, id: call.id, contentBytes: toolMsg.content.length });
+                ctx.log.debug?.("[tool-calling] tool result appended", {
+                    name: call.name,
+                    id: call.id,
+                    contentBytes: toolMsg.content.length,
+                });
             }
             continue;
         }
         else {
-            ctx.log.info?.('[tool-calling] no tool calls; appending assistant message');
+            ctx.log.info?.("[tool-calling] no tool calls; appending assistant message");
             ctx.messages.push(msg);
             break;
         }
@@ -73,35 +135,61 @@ export const toolCalling = async (ctx, next) => {
 export const iterativeToolCalling = async (ctx, next) => {
     await next();
     const maxIters = 12;
+    const toolList = ctx.tools.list();
+    const userAliases = ctx.state.toolAliases;
+    const { aliasedTools, reverseMap } = applyAliasesToTools(toolList, userAliases);
     for (let i = 0; i < maxIters; i++) {
-        ctx.log.debug?.('[iterative-tool-calling] iteration start', { i, messages: ctx.messages.length });
-        const toolList = ctx.tools.list();
-        const genOpts = { toolChoice: 'auto', tools: toolList, parallelToolCalls: false, signal: ctx.signal };
+        ctx.log.debug?.("[iterative-tool-calling] iteration start", {
+            i,
+            messages: ctx.messages.length,
+        });
+        const genOpts = {
+            toolChoice: "auto",
+            tools: aliasedTools, // Pass renamed tools to adapter
+            parallelToolCalls: false,
+            signal: ctx.signal,
+        };
         const out = await ctx.model.generate(ctx.messages, genOpts);
         const msg = out.message;
         const toolCalls = msg.tool_calls;
         if (toolCalls && toolCalls.length > 0) {
             // include the assistant message that requested tools
             ctx.messages.push(msg);
-            ctx.log.info?.('[iterative-tool-calling] model requested tools', toolCalls.map(tc => ({ id: tc.id, name: tc.name, hasArgs: typeof tc.arguments !== 'undefined' })));
+            ctx.log.info?.("[iterative-tool-calling] model requested tools", toolCalls.map((tc) => ({
+                id: tc.id,
+                name: tc.name,
+                hasArgs: typeof tc.arguments !== "undefined",
+            })));
             const cache = new Map();
             const keyOf = (tc) => `${tc.name}:${safeStableStringify(tc.arguments)}`;
             const lastArgsByName = new Map();
             const resolvedCalls = toolCalls.map((tc) => {
-                if (typeof tc.arguments === 'undefined' && lastArgsByName.has(tc.name)) {
+                if (typeof tc.arguments === "undefined" &&
+                    lastArgsByName.has(tc.name)) {
                     return { ...tc, arguments: lastArgsByName.get(tc.name) };
                 }
                 return tc;
             });
             for (const call of resolvedCalls) {
-                const tool = ctx.tools.get(call.name);
+                // Resolve alias back to canonical tool name
+                const canonicalName = reverseMap.get(call.name);
+                if (!canonicalName)
+                    throw new Error("Unknown tool: " + call.name);
+                const tool = ctx.tools.get(canonicalName);
                 if (!tool)
-                    throw new Error('Unknown tool: ' + call.name);
+                    throw new Error("Unknown tool: " + canonicalName);
                 const key = keyOf(call);
                 let result = cache.get(key);
                 if (result === undefined) {
-                    const args = tool.schema?.parse ? tool.schema.parse(call.arguments) : call.arguments;
-                    ctx.log.debug?.('[iterative-tool-calling] invoking tool', { name: call.name, id: call.id, args });
+                    const args = tool.schema?.parse
+                        ? tool.schema.parse(call.arguments)
+                        : call.arguments;
+                    ctx.log.debug?.("[iterative-tool-calling] invoking tool", {
+                        aliasName: call.name,
+                        canonicalName: canonicalName,
+                        id: call.id,
+                        args,
+                    });
                     // Create restricted context for tool execution
                     const toolCtx = {
                         memory: ctx.memory,
@@ -116,19 +204,22 @@ export const iterativeToolCalling = async (ctx, next) => {
                     lastArgsByName.set(call.name, args);
                 }
                 else {
-                    ctx.log.debug?.('[iterative-tool-calling] reusing cached result', { name: call.name, id: call.id });
+                    ctx.log.debug?.("[iterative-tool-calling] reusing cached result", {
+                        name: call.name,
+                        id: call.id,
+                    });
                 }
-                const toolMsg = { role: 'tool', content: JSON.stringify(result) };
-                if (call.id)
-                    toolMsg.tool_call_id = call.id;
-                else
-                    toolMsg.name = call.name;
+                const toolMsg = {
+                    role: "tool",
+                    content: JSON.stringify(result),
+                    ...(call.id ? { tool_call_id: call.id } : { name: call.name }),
+                };
                 ctx.messages.push(toolMsg);
             }
             continue; // next round may call more tools
         }
         else {
-            ctx.log.info?.('[iterative-tool-calling] no tool calls; appending assistant message');
+            ctx.log.info?.("[iterative-tool-calling] no tool calls; appending assistant message");
             ctx.messages.push(msg);
             break;
         }
@@ -136,7 +227,7 @@ export const iterativeToolCalling = async (ctx, next) => {
 };
 function safeStableStringify(v) {
     try {
-        if (v && typeof v === 'object' && !Array.isArray(v)) {
+        if (v && typeof v === "object" && !Array.isArray(v)) {
             const keys = Object.keys(v).sort();
             const obj = {};
             for (const k of keys)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisu-ai/mw-tool-calling",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -11,11 +11,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsc -b"
-  },
   "peerDependencies": {
-    "@sisu-ai/core": "^2.3.0"
+    "@sisu-ai/core": "^2.3.1"
   },
   "repository": {
     "type": "git",
@@ -33,5 +30,12 @@
     "agentic",
     "middleware",
     "tool-calling"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rm -rf dist",
+    "lint": "eslint src --ext .ts,.js",
+    "lint:fix": "eslint src --ext .ts,.js --fix",
+    "typecheck": "tsc --noEmit"
+  }
+}