@ganju/utils 0.0.13 → 0.0.14

package/dist/constants.js

@@ -815,7 +815,7 @@ const RESOURCE_SEARCH_COMMON_TERM_MIN = 5;
 const RESOURCE_SEARCH_RERANK_CANDIDATES = 30;
 const RESOURCE_SEARCH_RERANK_MODEL = '@cf/baai/bge-reranker-base';
 const RESOURCE_HANDLER_SLEEP_AFTER = '10m';
-const DOCS_URL = 'https://docs.ganju.ai';
+const DOCS_URL = 'https://ganju.ai/docs/';
 const BASE64_DATA_URI_RE = /data:image\/[a-zA-Z0-9+\-.]+;base64,[A-Za-z0-9+/=\s]+/g;
 const RAW_BASE64_BLOB_RE = /[A-Za-z0-9+/]{512,}={0,2}/g;
 const CHUNK_SEPARATORS = [

package/dist/toolLint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolLint.d.ts","sourceRoot":"","sources":["../src/toolLint.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH;AAED,eAAO,MAAM,eAAe,+JAQlB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,YAAY,CAAC;IAGnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAI9B,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IAGxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,eAAO,MAAM,gCAAgC,KAAK,CAAC;AAKnD,eAAO,MAAM,mBAAmB,KAAK,CAAC;AA2ItC;;;GAGG;AACH,eAAO,MAAM,SAAS,GACpB,OAAO,YAAY,EAAE,EACrB,UAAS,eAAoB,KAC5B,eAAe,EA8FjB,CAAC"}
+{"version":3,"file":"toolLint.d.ts","sourceRoot":"","sources":["../src/toolLint.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH;AAED,eAAO,MAAM,eAAe,+JAQlB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,YAAY,CAAC;IAGnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAI9B,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IAGxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,eAAO,MAAM,gCAAgC,KAAK,CAAC;AAKnD,eAAO,MAAM,mBAAmB,KAAK,CAAC;AA2JtC;;;GAGG;AACH,eAAO,MAAM,SAAS,GACpB,OAAO,YAAY,EAAE,EACrB,UAAS,eAAoB,KAC5B,eAAe,EA8FjB,CAAC"}

package/dist/toolLint.js

@@ -44,8 +44,11 @@ const fold = (text) => text
 // Wording that tells a model WHEN to call a tool rather than only what it does
 // — English, Spanish and Portuguese, the languages descriptions here are
 // written in. Loose on purpose: a false "says when" costs nothing, a false
-// "doesn't" nags someone whose description is fine.
-const USAGE_GUIDANCE = /\b(use|uses|using|call|calls|when|whenever|before|after|instead|only if|if the user|if you|for questions|usa|usala|usalo|usar|llama|llamala|llamar|cuando|antes de|despues de|en lugar de|si el usuario|quando|use-a|utilize|chame)\b/;
+// "doesn't" nags someone whose description is fine. But not so loose that
+// words about how a tool works count: "uses the Stripe API" and "makes an API
+// call" say nothing about when to reach for it, so "call" counts only as an
+// instruction ("call this…", "call it…").
+const USAGE_GUIDANCE = /\b(use|call (?:this|it)|when|whenever|before|after|instead|only if|if the user|if you|for questions|usa|usala|usalo|usar|llama|llamala|llamar|cuando|antes de|despues de|en lugar de|si el usuario|quando|use-a|utilize|chame)\b/;
 const STOPWORDS = new Set([
     'the',
     'and',
@@ -87,8 +90,19 @@ const STOPWORDS = new Set([
 const contentWords = (text) => new Set(fold(text)
     .split(/[^a-z0-9]+/)
     .filter(word => word.length >= 3 && !STOPWORDS.has(word)));
+// A proxied tool is named `<server prefix>__<remote name>`. The prefix says
+// which connection it came from, not what it does, so `search_repositories`
+// and `github__search_repositories` are the same tool to a model. Kept here
+// rather than imported from constants (MCP_PROXY_TOOL_NAME_SEP), since this
+// file imports nothing.
+const PROXY_NAME_SEP = '__';
+const withoutProxyPrefix = (name) => {
+    const at = name.lastIndexOf(PROXY_NAME_SEP);
+    const bare = at === -1 ? name : name.slice(at + PROXY_NAME_SEP.length);
+    return bare || name;
+};
 // `lookupOrder`, `lookup-order` and `order_lookup` name the same thing.
-const nameTokens = (name) => name
+const nameTokens = (name) => withoutProxyPrefix(name)
     .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
     .toLowerCase()
     .split(/[^a-z0-9]+/)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganju/utils",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Shared constants, schemas and helpers for Ganju",
   "license": "Apache-2.0",
   "author": "MontoyaAndres <andresmontoyafcb@gmail.com>",

package/src/constants.ts

@@ -967,7 +967,7 @@ const RESOURCE_SEARCH_RERANK_MODEL = '@cf/baai/bge-reranker-base';
 
 const RESOURCE_HANDLER_SLEEP_AFTER = '10m';
 
-const DOCS_URL = 'https://docs.ganju.ai';
+const DOCS_URL = 'https://ganju.ai/docs/';
 
 const BASE64_DATA_URI_RE =
   /data:image\/[a-zA-Z0-9+\-.]+;base64,[A-Za-z0-9+/=\s]+/g;

package/src/toolLint.ts

@@ -93,9 +93,12 @@ const fold = (text: string): string =>
 // Wording that tells a model WHEN to call a tool rather than only what it does
 // — English, Spanish and Portuguese, the languages descriptions here are
 // written in. Loose on purpose: a false "says when" costs nothing, a false
-// "doesn't" nags someone whose description is fine.
+// "doesn't" nags someone whose description is fine. But not so loose that
+// words about how a tool works count: "uses the Stripe API" and "makes an API
+// call" say nothing about when to reach for it, so "call" counts only as an
+// instruction ("call this…", "call it…").
 const USAGE_GUIDANCE =
-  /\b(use|uses|using|call|calls|when|whenever|before|after|instead|only if|if the user|if you|for questions|usa|usala|usalo|usar|llama|llamala|llamar|cuando|antes de|despues de|en lugar de|si el usuario|quando|use-a|utilize|chame)\b/;
+  /\b(use|call (?:this|it)|when|whenever|before|after|instead|only if|if the user|if you|for questions|usa|usala|usalo|usar|llama|llamala|llamar|cuando|antes de|despues de|en lugar de|si el usuario|quando|use-a|utilize|chame)\b/;
 
 const STOPWORDS = new Set([
   'the',
@@ -143,9 +146,22 @@ const contentWords = (text: string): Set<string> =>
       .filter(word => word.length >= 3 && !STOPWORDS.has(word))
   );
 
+// A proxied tool is named `<server prefix>__<remote name>`. The prefix says
+// which connection it came from, not what it does, so `search_repositories`
+// and `github__search_repositories` are the same tool to a model. Kept here
+// rather than imported from constants (MCP_PROXY_TOOL_NAME_SEP), since this
+// file imports nothing.
+const PROXY_NAME_SEP = '__';
+
+const withoutProxyPrefix = (name: string): string => {
+  const at = name.lastIndexOf(PROXY_NAME_SEP);
+  const bare = at === -1 ? name : name.slice(at + PROXY_NAME_SEP.length);
+  return bare || name;
+};
+
 // `lookupOrder`, `lookup-order` and `order_lookup` name the same thing.
 const nameTokens = (name: string): string =>
-  name
+  withoutProxyPrefix(name)
     .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
     .toLowerCase()
     .split(/[^a-z0-9]+/)