mcp-creatio 0.5.0 → 0.6.0

package/dist/server/mcp/filters.js

@@ -1,110 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFilterFromStructured = buildFilterFromStructured;
-function isGuid(s) {
-    return (typeof s === 'string' &&
-        /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(s));
-}
-function isIdish(field) {
-    return /(^|\/)Id$/.test(field) || /Id$/i.test(field);
-}
-function escapeStr(val) {
-    return val.replace(/'/g, "''");
-}
-function literalFor(field, value) {
-    if (value == null) {
-        return 'null';
-    }
-    const t = typeof value;
-    if (t === 'number') {
-        return String(value);
-    }
-    if (t === 'boolean') {
-        return value ? 'true' : 'false';
-    }
-    if (t === 'string') {
-        const v = String(value);
-        // Bare (unquoted) GUID for any Id-typed path — the scalar key `Id`, a lookup
-        // FK `XxxId`, or a navigation `Xxx/Id`. Other strings (incl. `Xxx/Name`) are quoted.
-        if (isGuid(v) && isIdish(field)) {
-            return v;
-        }
-        return `'${escapeStr(v)}'`;
-    }
-    return `'${escapeStr(JSON.stringify(value))}'`;
-}
-// Creatio OData cannot filter a lookup by its scalar FK column (`ContactId eq <guid>`
-// 500s "Column by path ContactId not found"); it must be filtered through the
-// navigation property (`Contact/Id eq <guid>`), per the official docs and verified
-// live. Rewrite `<Lookup>Id` -> `<Lookup>/Id` for equality against a GUID. The
-// primary key `Id` and already-navigated paths are left untouched.
-function lookupNavField(field, value) {
-    if (isGuid(value) && field !== 'Id' && !field.includes('/') && /Id$/.test(field)) {
-        return `${field.slice(0, -2)}/Id`;
-    }
-    return field;
-}
-function buildCondition(c) {
+exports.buildFilterNode = buildFilterNode;
+exports.parseOrderBy = parseOrderBy;
+function toNode(c) {
     if (!c || !c.field) {
         return undefined;
     }
     const field = String(c.field);
     if (Array.isArray(c.in)) {
-        const values = c.in;
-        if (!values.length) {
-            return undefined;
-        }
-        const parts = values.map((v) => {
-            const f = lookupNavField(field, v);
-            return `${f} eq ${literalFor(f, v)}`;
-        });
-        return parts.length === 1 ? parts[0] : `(${parts.join(' or ')})`;
+        return c.in.length ? { kind: 'in', field, values: c.in } : undefined;
     }
-    const op = String(c.op || 'eq');
-    const value = c.value;
-    if (op === 'contains' || op === 'startswith' || op === 'endswith') {
-        return `${op}(${field},${literalFor(field, value)})`;
+    const op = (c.op ? String(c.op) : 'eq');
+    // A null/absent value against eq/ne is a null-check; route it through the dedicated
+    // neutral ops so each backend renders it correctly (OData `field eq null`,
+    // DataService `IsNullFilter`).
+    if (c.value === null || c.value === undefined) {
+        if (op === 'eq') {
+            return { kind: 'condition', field, op: 'isNull' };
+        }
+        if (op === 'ne') {
+            return { kind: 'condition', field, op: 'isNotNull' };
+        }
     }
-    if (value == null && (op === 'eq' || op === 'ne')) {
-        return `${field} ${op} null`;
+    return { kind: 'condition', field, op, value: c.value };
+}
+function group(logic, conditions) {
+    const items = conditions.map(toNode).filter((n) => Boolean(n));
+    if (!items.length) {
+        return undefined;
     }
-    const f = op === 'eq' || op === 'ne' ? lookupNavField(field, value) : field;
-    return `${f} ${op} ${literalFor(f, value)}`;
+    return { kind: 'group', logic, items };
 }
-function buildFilterFromStructured(filters) {
+/** Build the neutral {@link FilterNode} from the structured `filters` argument (AND of the
+ *  `all` group with the `any` group), or undefined when there is nothing to filter on. */
+function buildFilterNode(filters) {
     if (!filters || typeof filters !== 'object') {
         return undefined;
     }
-    const andParts = [];
-    const orParts = [];
-    if (Array.isArray(filters.all)) {
-        for (const c of filters.all) {
-            const s = buildCondition(c);
-            if (s) {
-                andParts.push(s);
-            }
-        }
-    }
-    if (Array.isArray(filters.any)) {
-        for (const c of filters.any) {
-            const s = buildCondition(c);
-            if (s) {
-                orParts.push(s);
-            }
-        }
-    }
-    const andStr = andParts.join(' and ');
-    const orStr = orParts.join(' or ');
-    const parts = [];
-    if (andStr) {
-        parts.push(andParts.length > 1 ? `(${andStr})` : andStr);
+    const f = filters;
+    const allNode = Array.isArray(f.all) ? group('and', f.all) : undefined;
+    const anyNode = Array.isArray(f.any) ? group('or', f.any) : undefined;
+    const parts = [allNode, anyNode].filter((n) => Boolean(n));
+    if (!parts.length) {
+        return undefined;
     }
-    if (orStr) {
-        parts.push(orParts.length > 1 ? `(${orStr})` : orStr);
+    if (parts.length === 1) {
+        return parts[0];
     }
-    if (!parts.length) {
+    return { kind: 'group', logic: 'and', items: parts };
+}
+/** Parse an OData-style `$orderby` clause ("Name asc, CreatedOn desc") into neutral order
+ *  terms. Direction defaults to ascending when omitted. */
+function parseOrderBy(orderBy) {
+    if (typeof orderBy !== 'string' || !orderBy.trim()) {
         return undefined;
     }
-    return parts.join(' and ');
+    const terms = orderBy
+        .split(',')
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .map((part) => {
+        const [field, dir] = part.split(/\s+/);
+        return { field: field, dir: (dir ?? '').toLowerCase() === 'desc' ? 'desc' : 'asc' };
+    });
+    return terms.length ? terms : undefined;
 }
 //# sourceMappingURL=filters.js.map

package/dist/server/mcp/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../src/server/mcp/filters.ts"],"names":[],"mappings":";;AA8EA,8DAmCC;AAjHD,SAAS,MAAM,CAAC,CAAU;IACzB,OAAO,CACN,OAAO,CAAC,KAAK,QAAQ;QACrB,+EAA+E,CAAC,IAAI,CAAC,CAAC,CAAC,CACvF,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAa;IAC7B,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,KAAU;IAC5C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IACf,CAAC;IACD,MAAM,CAAC,GAAG,OAAO,KAAK,CAAC;IACvB,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,6EAA6E;QAC7E,qFAAqF;QACrF,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,CAAC;QACV,CAAC;QACD,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;AAChD,CAAC;AAED,sFAAsF;AACtF,8EAA8E;AAC9E,mFAAmF;AACnF,+EAA+E;AAC/E,mEAAmE;AACnE,SAAS,cAAc,CAAC,KAAa,EAAE,KAAc;IACpD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClF,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACnC,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,CAAM;IAC7B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,KAAK,CAAC,OAAO,CAAE,CAAS,CAAC,EAAE,CAAC,EAAE,CAAC;QAClC,MAAM,MAAM,GAAI,CAAS,CAAC,EAAW,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,MAAM,CAAC,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAClE,CAAC;IACD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC;IAChC,MAAM,KAAK,GAAI,CAAS,CAAC,KAAK,CAAC;IAC/B,IAAI,EAAE,KAAK,UAAU,IAAI,EAAE,KAAK,YAAY,IAAI,EAAE,KAAK,UAAU,EAAE,CAAC;QACnE,OAAO,GAAG,EAAE,IAAI,KAAK,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;IACtD,CAAC;IACD,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACnD,OAAO,GAAG,KAAK,IAAI,EAAE,OAAO,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC5E,OAAO,GAAG,CAAC,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;AAC7C,CAAC;AAED,SAAgB,yBAAyB,CAAC,OAAwB;IACjE,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,EAAE,CAAC;gBACP,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACF,CAAC;IACF,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;QACF,CAAC;IACF,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../src/server/mcp/filters.ts"],"names":[],"mappings":"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"}

package/dist/server/mcp/server.d.ts

@@ -24,7 +24,6 @@ export declare class Server {
     private _normalizeToToolHandler;
     private _registerAsTool;
     private _registerPrompts;
-    private _textResult;
     /** Adapter exposing handler registration to {@link ToolPreparer}s. */
     private _toolRegistrar;
     /**
@@ -36,6 +35,22 @@ export declare class Server {
     private _prepareTools;
     /** Whether DataForge was probed as enabled at startup. */
     private _isDataForgeReady;
+    /** Compile the `read` tool args into a neutral {@link ReadQuery}: structured `filters`
+     *  become a {@link FilterNode}; a raw `$filter` string and `expand` are carried as
+     *  OData-only escape hatches. The normalized {@link ReadResult} is mapped back to the
+     *  tool's established output shape (a bare array, or `{ total, value }` when counting). */
+    private _read;
+    /** When DataForge is enabled, prefer its richer column details and fall back to the active
+     *  CRUD backend's schema on a per-call miss. The `source` discriminator is part of the
+     *  public tool contract and reflects where the schema actually came from. */
+    private _describeEntity;
+    /**
+     * The client tool surface as data. Handlers return raw domain results; MCP content
+     * wrapping is applied once by {@link _normalizeToToolHandler}. Adding a tool is a new
+     * row here (plus its descriptor) — no new bespoke wrapping. Mutating tools are listed
+     * separately and only registered when not in readonly mode.
+     */
+    private _clientToolDefs;
     private _registerClientTools;
     startMcp(): Promise<McpServer>;
     stopMcp(): Promise<void>;

package/dist/server/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/mcp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EAEpB,MAAM,eAAe,CAAC;AA0DvB,MAAM,WAAW,YAAY;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,MAAM;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA0B;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAW;IAIjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwB;IAC3D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA2B;IACjE,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA+B;IACvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8B;IAE5D,IAAW,YAAY,IAAI,oBAAoB,CAE9C;gBAEW,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,YAAY;IAoB/D,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,8BAA8B;IAQtC,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,WAAW;IAWnB,sEAAsE;IACtE,OAAO,CAAC,cAAc;IAOtB;;;;;OAKG;YACW,aAAa;IAc3B,0DAA0D;IAC1D,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,oBAAoB;IAsQf,QAAQ;IAqBR,OAAO;CAWpB"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/mcp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EAGpB,MAAM,eAAe,CAAC;AA0DvB,MAAM,WAAW,YAAY;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAWD,qBAAa,MAAM;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA0B;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAW;IAIjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwB;IAC3D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA2B;IACjE,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA+B;IACvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8B;IAE5D,IAAW,YAAY,IAAI,oBAAoB,CAE9C;gBAEW,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,YAAY;IAoB/D,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,8BAA8B;IAQtC,OAAO,CAAC,uBAAuB;IAyB/B,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,gBAAgB;IAsBxB,sEAAsE;IACtE,OAAO,CAAC,cAAc;IAOtB;;;;;OAKG;YACW,aAAa;IAc3B,0DAA0D;IAC1D,OAAO,CAAC,iBAAiB;IAIzB;;;+FAG2F;YAC7E,KAAK;IAyBnB;;iFAE6E;YAC/D,eAAe;IAY7B;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA8IvB,OAAO,CAAC,oBAAoB;IAYf,QAAQ;IAqBR,OAAO;CAWpB"}

package/dist/server/mcp/server.js

@@ -71,7 +71,13 @@ class Server {
     _normalizeToToolHandler(handler) {
         return async (args) => {
             const result = await handler(args);
-            if (result && typeof result === 'object' && 'content' in result) {
+            // Pass through only a genuine MCP envelope (`content` is an array of blocks) — e.g.
+            // the published-tools proxy returns an upstream tools/call result already shaped.
+            // Raw domain data (incl. server payloads that happen to have a scalar/object
+            // `content` field) is stringified, never mistaken for a pre-wrapped result.
+            if (result &&
+                typeof result === 'object' &&
+                Array.isArray(result.content)) {
                 return result;
             }
             return {
@@ -122,16 +128,6 @@ class Server {
             log_1.default.warn('mcp.prompts.register.failed', { error: String(err) });
         }
     }
-    _textResult(payload) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2),
-                },
-            ],
-        };
-    }
     /** Adapter exposing handler registration to {@link ToolPreparer}s. */
     _toolRegistrar() {
         return {
@@ -162,177 +158,193 @@ class Server {
     _isDataForgeReady() {
         return this._capabilities.get(this._dataForgePreparer.name) === true;
     }
-    _registerClientTools() {
-        const crud = this._engines.crud;
-        const user = this._engines.user;
-        const sysSettings = this._engines.sysSettings;
-        this._registerHandlerWithDescriptor('get-current-user-info', tools_data_1.getCurrentUserInfoDescriptor, (0, utils_1.withValidation)(tools_data_1.getCurrentUserInfoInput, () => user.getCurrentUserInfo()));
-        this._registerHandlerWithDescriptor('list-entities', tools_data_1.listEntitiesDescriptor, (0, utils_1.withValidation)(tools_data_1.listEntitiesInput, async () => {
-            const sets = await crud.listEntitySets();
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({ results: sets }),
-                    },
-                ],
-            };
-        }));
-        this._registerHandlerWithDescriptor('describe-entity', tools_data_1.describeEntityDescriptor, (0, utils_1.withValidation)(tools_data_1.describeEntityInput, async ({ entitySet }) => {
-            // When DataForge is enabled, prefer its richer column details and
-            // fall back to exact OData $metadata on a per-call miss; when it is
-            // not enabled, go straight to OData without any remote attempt.
-            if (this._isDataForgeReady()) {
-                const dataForge = await this._dataForge.getColumnsOrNull(entitySet);
-                if (dataForge !== null) {
-                    return this._textResult({ source: 'dataforge', entitySet, dataForge });
-                }
-            }
-            const schema = await crud.describeEntity(entitySet);
-            return this._textResult({ source: 'odata', entitySet, metadata: schema });
-        }));
-        this._registerHandlerWithDescriptor('read', tools_data_1.readDescriptor, (0, utils_1.withValidation)(tools_data_1.readInput, async ({ entity, filter, filters, select, top, expand, orderBy, skip, count }) => {
-            const structured = (0, filters_1.buildFilterFromStructured)(filters);
-            let finalFilter = filter || structured;
-            if (filter && structured) {
-                finalFilter = `(${filter}) and (${structured})`;
+    /** Compile the `read` tool args into a neutral {@link ReadQuery}: structured `filters`
+     *  become a {@link FilterNode}; a raw `$filter` string and `expand` are carried as
+     *  OData-only escape hatches. The normalized {@link ReadResult} is mapped back to the
+     *  tool's established output shape (a bare array, or `{ total, value }` when counting). */
+    async _read(args) {
+        const { entity, filter, filters, select, top, expand, orderBy, skip, count } = args;
+        const odata = {};
+        if (filter) {
+            odata.rawFilter = filter;
+        }
+        if (Array.isArray(expand) && expand.length > 0) {
+            odata.expand = expand;
+        }
+        const node = (0, filters_1.buildFilterNode)(filters);
+        const order = (0, filters_1.parseOrderBy)(orderBy);
+        const query = {
+            entity,
+            top: top ?? DEFAULT_READ_TOP,
+            ...(select ? { columns: select } : {}),
+            ...(node ? { filter: node } : {}),
+            ...(order ? { order } : {}),
+            ...(skip !== undefined ? { skip } : {}),
+            ...(count !== undefined ? { count } : {}),
+            ...(Object.keys(odata).length ? { odata } : {}),
+        };
+        const result = await this._engines.crud.read(query);
+        return count ? { total: result.totalCount, value: result.items } : result.items;
+    }
+    /** When DataForge is enabled, prefer its richer column details and fall back to the active
+     *  CRUD backend's schema on a per-call miss. The `source` discriminator is part of the
+     *  public tool contract and reflects where the schema actually came from. */
+    async _describeEntity(entitySet) {
+        if (this._isDataForgeReady()) {
+            const dataForge = await this._dataForge.getColumnsOrNull(entitySet);
+            if (dataForge !== null) {
+                return { source: 'dataforge', entitySet, dataForge };
             }
-            return crud.read({
-                entity,
-                filter: finalFilter ?? undefined,
-                select,
-                top: top ?? DEFAULT_READ_TOP,
-                expand,
-                orderBy,
-                skip,
-                count,
-            });
-        }));
-        this._registerHandlerWithDescriptor('query-sys-settings', tools_data_1.querySysSettingsDescriptor, (0, utils_1.withValidation)(tools_data_1.querySysSettingsInput, async ({ sysSettingCodes }) => {
-            const result = await sysSettings.queryValues(sysSettingCodes);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify(result, null, 2),
-                    },
-                ],
-            };
-        }));
-        if (!this._readonly) {
-            const process = this._engines.process;
-            const feature = this._engines.feature;
-            const adminOperation = this._engines.adminOperation;
-            const configuration = this._engines.configuration;
-            this._registerHandlerWithDescriptor('create', tools_data_1.createDescriptor, (0, utils_1.withValidation)(tools_data_1.createInput, async ({ entity, data }) => crud.create({ entity, data })));
-            this._registerHandlerWithDescriptor('update', tools_data_1.updateDescriptor, (0, utils_1.withValidation)(tools_data_1.updateInput, async ({ entity, id, data }) => crud.update({ entity, id, data })));
-            this._registerHandlerWithDescriptor('delete', tools_data_1.deleteDescriptor, (0, utils_1.withValidation)(tools_data_1.deleteInput, async ({ entity, id }) => crud.delete({ entity, id })));
-            this._registerHandlerWithDescriptor('execute-process', tools_data_1.executeProcessDescriptor, (0, utils_1.withValidation)(tools_data_1.executeProcessInput, async ({ processName, parameters }) => {
-                const result = await process.execute({
-                    processName,
-                    parameters: parameters || {},
-                });
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify(result, null, 2),
-                        },
-                    ],
-                };
-            }));
-            this._registerHandlerWithDescriptor('set-sys-settings-value', tools_data_1.setSysSettingsValueDescriptor, (0, utils_1.withValidation)(tools_data_1.setSysSettingsValueInput, async ({ sysSettingsValues }) => {
-                const result = await sysSettings.setValues(sysSettingsValues);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify(result),
-                        },
-                    ],
-                };
-            }));
-            this._registerHandlerWithDescriptor('create-sys-setting', tools_data_1.createSysSettingDescriptor, (0, utils_1.withValidation)(tools_data_1.createSysSettingInput, async ({ definition, initialValue }) => {
-                const result = await sysSettings.createSetting({ definition, initialValue });
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify(result, null, 2),
-                        },
-                    ],
-                };
-            }));
-            this._registerHandlerWithDescriptor('update-sys-setting-definition', tools_data_1.updateSysSettingDefinitionDescriptor, (0, utils_1.withValidation)(tools_data_1.updateSysSettingDefinitionInput, async ({ id, definition }) => {
-                const result = await sysSettings.updateDefinition({
+        }
+        const metadata = await this._engines.crud.describeEntity(entitySet);
+        const source = this._engines.crud.kind === 'creatio-dataservice' ? 'dataservice' : 'odata';
+        return { source, entitySet, metadata };
+    }
+    /**
+     * The client tool surface as data. Handlers return raw domain results; MCP content
+     * wrapping is applied once by {@link _normalizeToToolHandler}. Adding a tool is a new
+     * row here (plus its descriptor) — no new bespoke wrapping. Mutating tools are listed
+     * separately and only registered when not in readonly mode.
+     */
+    _clientToolDefs() {
+        const { crud, user, sysSettings, process, feature, adminOperation, configuration } = this._engines;
+        const core = [
+            {
+                name: 'get-current-user-info',
+                descriptor: tools_data_1.getCurrentUserInfoDescriptor,
+                input: tools_data_1.getCurrentUserInfoInput,
+                run: () => user.getCurrentUserInfo(),
+            },
+            {
+                name: 'list-entities',
+                descriptor: tools_data_1.listEntitiesDescriptor,
+                input: tools_data_1.listEntitiesInput,
+                run: async () => ({ results: await crud.listEntitySets() }),
+            },
+            {
+                name: 'describe-entity',
+                descriptor: tools_data_1.describeEntityDescriptor,
+                input: tools_data_1.describeEntityInput,
+                run: ({ entitySet }) => this._describeEntity(entitySet),
+            },
+            {
+                name: 'read',
+                descriptor: (0, tools_data_1.buildReadDescriptor)(crud.capabilities),
+                input: (0, tools_data_1.buildReadInput)(crud.capabilities),
+                run: (args) => this._read(args),
+            },
+            {
+                name: 'query-sys-settings',
+                descriptor: tools_data_1.querySysSettingsDescriptor,
+                input: tools_data_1.querySysSettingsInput,
+                run: ({ sysSettingCodes }) => sysSettings.queryValues(sysSettingCodes),
+            },
+        ];
+        const mutating = [
+            {
+                name: 'create',
+                descriptor: tools_data_1.createDescriptor,
+                input: tools_data_1.createInput,
+                run: ({ entity, data }) => crud.create({ entity, data }),
+            },
+            {
+                name: 'update',
+                descriptor: tools_data_1.updateDescriptor,
+                input: tools_data_1.updateInput,
+                run: ({ entity, id, data }) => crud.update({ entity, id, data }),
+            },
+            {
+                name: 'delete',
+                descriptor: tools_data_1.deleteDescriptor,
+                input: tools_data_1.deleteInput,
+                run: ({ entity, id }) => crud.delete({ entity, id }),
+            },
+            {
+                name: 'execute-process',
+                descriptor: tools_data_1.executeProcessDescriptor,
+                input: tools_data_1.executeProcessInput,
+                run: ({ processName, parameters }) => process.execute({ processName, parameters: parameters || {} }),
+            },
+            {
+                name: 'set-sys-settings-value',
+                descriptor: tools_data_1.setSysSettingsValueDescriptor,
+                input: tools_data_1.setSysSettingsValueInput,
+                run: ({ sysSettingsValues }) => sysSettings.setValues(sysSettingsValues),
+            },
+            {
+                name: 'create-sys-setting',
+                descriptor: tools_data_1.createSysSettingDescriptor,
+                input: tools_data_1.createSysSettingInput,
+                run: ({ definition, initialValue }) => sysSettings.createSetting({ definition, initialValue }),
+            },
+            {
+                name: 'update-sys-setting-definition',
+                descriptor: tools_data_1.updateSysSettingDefinitionDescriptor,
+                input: tools_data_1.updateSysSettingDefinitionInput,
+                run: ({ id, definition }) => sysSettings.updateDefinition({
                     ...definition,
                     id,
-                });
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify(result, null, 2),
-                        },
-                    ],
-                };
-            }));
-            this._registerHandlerWithDescriptor('refresh-feature-cache', tools_data_1.refreshFeatureCacheDescriptor, (0, utils_1.withValidation)(tools_data_1.refreshFeatureCacheInput, async ({ featureCode }) => {
-                const result = await feature.clearFeaturesCache(featureCode);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify(result, null, 2),
-                        },
-                    ],
-                };
-            }));
-            this._registerHandlerWithDescriptor('upsert-admin-operation', tools_data_1.upsertAdminOperationDescriptor, (0, utils_1.withValidation)(tools_data_1.upsertAdminOperationInput, async ({ id, name, code, description }) => {
-                const result = await adminOperation.upsertAdminOperation({
+                }),
+            },
+            {
+                name: 'refresh-feature-cache',
+                descriptor: tools_data_1.refreshFeatureCacheDescriptor,
+                input: tools_data_1.refreshFeatureCacheInput,
+                run: ({ featureCode }) => feature.clearFeaturesCache(featureCode),
+            },
+            {
+                name: 'upsert-admin-operation',
+                descriptor: tools_data_1.upsertAdminOperationDescriptor,
+                input: tools_data_1.upsertAdminOperationInput,
+                run: ({ id, name, code, description }) => adminOperation.upsertAdminOperation({
                     ...(id !== undefined ? { id } : {}),
                     name,
                     code,
                     ...(description !== undefined ? { description } : {}),
-                });
-                return {
-                    content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                };
-            }));
-            this._registerHandlerWithDescriptor('delete-admin-operation', tools_data_1.deleteAdminOperationDescriptor, (0, utils_1.withValidation)(tools_data_1.deleteAdminOperationInput, async ({ ids }) => {
-                const result = await adminOperation.deleteAdminOperation(ids);
-                return {
-                    content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                };
-            }));
-            this._registerHandlerWithDescriptor('set-admin-operation-grantee', tools_data_1.setAdminOperationGranteeDescriptor, (0, utils_1.withValidation)(tools_data_1.setAdminOperationGranteeInput, async ({ adminOperationId, adminUnitIds, canExecute }) => {
-                const result = await adminOperation.setAdminOperationGrantee({
+                }),
+            },
+            {
+                name: 'delete-admin-operation',
+                descriptor: tools_data_1.deleteAdminOperationDescriptor,
+                input: tools_data_1.deleteAdminOperationInput,
+                run: ({ ids }) => adminOperation.deleteAdminOperation(ids),
+            },
+            {
+                name: 'set-admin-operation-grantee',
+                descriptor: tools_data_1.setAdminOperationGranteeDescriptor,
+                input: tools_data_1.setAdminOperationGranteeInput,
+                run: ({ adminOperationId, adminUnitIds, canExecute }) => adminOperation.setAdminOperationGrantee({
                     adminOperationId,
                     adminUnitIds,
                     canExecute,
-                });
-                return {
-                    content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                };
-            }));
-            this._registerHandlerWithDescriptor('delete-admin-operation-grantee', tools_data_1.deleteAdminOperationGranteeDescriptor, (0, utils_1.withValidation)(tools_data_1.deleteAdminOperationGranteeInput, async ({ ids }) => {
-                const result = await adminOperation.deleteAdminOperationGrantee(ids);
-                return {
-                    content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                };
-            }));
-            this._registerHandlerWithDescriptor('call-configuration-service', tools_data_1.callConfigurationServiceDescriptor, (0, utils_1.withValidation)(tools_data_1.callConfigurationServiceInput, async ({ service, method, httpMethod, body, query }) => {
-                const result = await configuration.call({
+                }),
+            },
+            {
+                name: 'delete-admin-operation-grantee',
+                descriptor: tools_data_1.deleteAdminOperationGranteeDescriptor,
+                input: tools_data_1.deleteAdminOperationGranteeInput,
+                run: ({ ids }) => adminOperation.deleteAdminOperationGrantee(ids),
+            },
+            {
+                name: 'call-configuration-service',
+                descriptor: tools_data_1.callConfigurationServiceDescriptor,
+                input: tools_data_1.callConfigurationServiceInput,
+                run: ({ service, method, httpMethod, body, query }) => configuration.call({
                     service,
                     method,
                     httpMethod,
                     ...(body !== undefined ? { body } : {}),
                     ...(query !== undefined ? { query } : {}),
-                });
-                return {
-                    content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                };
-            }));
+                }),
+            },
+        ];
+        return { core, mutating };
+    }
+    _registerClientTools() {
+        const { core, mutating } = this._clientToolDefs();
+        const defs = this._readonly ? core : [...core, ...mutating];
+        for (const def of defs) {
+            this._registerHandlerWithDescriptor(def.name, def.descriptor, (0, utils_1.withValidation)(def.input, def.run));
         }
     }
     async startMcp() {