@ignfab/geocontext 0.9.5 → 0.9.7

package/dist/tools/GpfWfsGetFeaturesTool.d.ts

@@ -1,8 +1,12 @@
-import { MCPTool } from "mcp-framework";
-import type { Collection } from "@ignfab/gpf-schema-store";
-import { type CompiledRequest } from "../helpers/wfs_internal/request.js";
-import { type GpfWfsGetFeaturesInput } from "../helpers/wfs_internal/schema.js";
-declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
+import BaseTool from "./BaseTool.js";
+import { type GpfWfsGetFeaturesInput } from "../helpers/wfs_engine/schema.js";
+/**
+ * MCP tool exposing structured WFS feature search.
+ *
+ * The tool remains responsible for MCP schema exposure and response formatting.
+ * WFS request preparation and execution live in the structured WFS engine.
+ */
+declare class GpfWfsGetFeaturesTool extends BaseTool<GpfWfsGetFeaturesInput> {
     name: string;
     title: string;
     annotations: {
@@ -21,11 +25,11 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
             property: import("zod").ZodString;
             direction: import("zod").ZodDefault<import("zod").ZodEnum<["asc", "desc"]>>;
         }, "strict", import("zod").ZodTypeAny, {
-            property?: string;
-            direction?: "asc" | "desc";
+            property: string;
+            direction: "asc" | "desc";
         }, {
-            property?: string;
-            direction?: "asc" | "desc";
+            property: string;
+            direction?: "asc" | "desc" | undefined;
         }>, "many">>;
         where: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
             property: import("zod").ZodString;
@@ -33,15 +37,15 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
             value: import("zod").ZodOptional<import("zod").ZodString>;
             values: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
         }, "strict", import("zod").ZodTypeAny, {
-            values?: string[];
-            value?: string;
-            property?: string;
-            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            property: string;
+            operator: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            values?: string[] | undefined;
+            value?: string | undefined;
         }, {
-            values?: string[];
-            value?: string;
-            property?: string;
-            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            property: string;
+            operator: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            values?: string[] | undefined;
+            value?: string | undefined;
         }>, "many">>;
         spatial_operator: import("zod").ZodOptional<import("zod").ZodEnum<["bbox", "intersects_point", "dwithin_point", "intersects_feature"]>>;
         bbox_west: import("zod").ZodOptional<import("zod").ZodNumber>;
@@ -56,70 +60,66 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
         intersects_feature_typename: import("zod").ZodOptional<import("zod").ZodString>;
         intersects_feature_id: import("zod").ZodOptional<import("zod").ZodString>;
     }, "strict", import("zod").ZodTypeAny, {
-        typename?: string;
-        limit?: number;
-        result_type?: "request" | "results" | "hits";
-        select?: string[];
+        typename: string;
+        result_type: "request" | "results" | "hits";
+        limit: number;
+        select?: string[] | undefined;
         order_by?: {
-            property?: string;
-            direction?: "asc" | "desc";
-        }[];
+            property: string;
+            direction: "asc" | "desc";
+        }[] | undefined;
         where?: {
-            values?: string[];
-            value?: string;
-            property?: string;
-            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
-        }[];
-        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature";
-        bbox_west?: number;
-        bbox_south?: number;
-        bbox_east?: number;
-        bbox_north?: number;
-        intersects_lon?: number;
-        intersects_lat?: number;
-        dwithin_lon?: number;
-        dwithin_lat?: number;
-        dwithin_distance_m?: number;
-        intersects_feature_typename?: string;
-        intersects_feature_id?: string;
+            property: string;
+            operator: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            values?: string[] | undefined;
+            value?: string | undefined;
+        }[] | undefined;
+        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature" | undefined;
+        bbox_west?: number | undefined;
+        bbox_south?: number | undefined;
+        bbox_east?: number | undefined;
+        bbox_north?: number | undefined;
+        intersects_lon?: number | undefined;
+        intersects_lat?: number | undefined;
+        dwithin_lon?: number | undefined;
+        dwithin_lat?: number | undefined;
+        dwithin_distance_m?: number | undefined;
+        intersects_feature_typename?: string | undefined;
+        intersects_feature_id?: string | undefined;
     }, {
-        typename?: string;
-        limit?: number;
-        result_type?: "request" | "results" | "hits";
-        select?: string[];
+        typename: string;
+        result_type?: "request" | "results" | "hits" | undefined;
+        limit?: number | undefined;
+        select?: string[] | undefined;
         order_by?: {
-            property?: string;
-            direction?: "asc" | "desc";
-        }[];
+            property: string;
+            direction?: "asc" | "desc" | undefined;
+        }[] | undefined;
         where?: {
-            values?: string[];
-            value?: string;
-            property?: string;
-            operator?: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
-        }[];
-        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature";
-        bbox_west?: number;
-        bbox_south?: number;
-        bbox_east?: number;
-        bbox_north?: number;
-        intersects_lon?: number;
-        intersects_lat?: number;
-        dwithin_lon?: number;
-        dwithin_lat?: number;
-        dwithin_distance_m?: number;
-        intersects_feature_typename?: string;
-        intersects_feature_id?: string;
+            property: string;
+            operator: "gte" | "gt" | "lte" | "lt" | "eq" | "ne" | "in" | "is_null";
+            values?: string[] | undefined;
+            value?: string | undefined;
+        }[] | undefined;
+        spatial_operator?: "bbox" | "intersects_point" | "dwithin_point" | "intersects_feature" | undefined;
+        bbox_west?: number | undefined;
+        bbox_south?: number | undefined;
+        bbox_east?: number | undefined;
+        bbox_north?: number | undefined;
+        intersects_lon?: number | undefined;
+        intersects_lat?: number | undefined;
+        dwithin_lon?: number | undefined;
+        dwithin_lat?: number | undefined;
+        dwithin_distance_m?: number | undefined;
+        intersects_feature_typename?: string | undefined;
+        intersects_feature_id?: string | undefined;
     }>;
     /**
      * Exposes an input schema variant that stays compatible with most MCP integrations.
      *
      * @returns The published input schema exposed through the MCP tool definition.
      */
-    get inputSchema(): {
-        type: "object";
-        properties?: Record<string, object>;
-        required?: string[];
-    };
+    get inputSchema(): import("../helpers/jsonSchema.js").PublishedInputSchema;
     /**
      * Formats compact responses (`hits`, `request`) into `structuredContent`.
      * Full result sets are still delegated to the framework default behavior.
@@ -133,8 +133,8 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
             text: string;
         }[];
         structuredContent: {
-            result_type?: "hits";
-            totalFeatures?: number;
+            result_type: "hits";
+            totalFeatures: number;
         };
     } | {
         content: {
@@ -142,64 +142,30 @@ declare class GpfWfsGetFeaturesTool extends MCPTool<GpfWfsGetFeaturesInput> {
             text: string;
         }[];
         structuredContent: {
-            body?: string;
-            result_type?: "request";
-            method?: "POST";
-            url?: string;
-            query?: Record<string, string>;
-            get_url?: string;
+            url: string;
+            result_type: "request";
+            method: "POST";
+            query: Record<string, string>;
+            body: string;
+            get_url?: string | null | undefined;
         };
     };
     /**
-     * Loads a WFS feature type description from the embedded catalog.
-     *
-     * @param typename Exact WFS typename to load from the embedded schema store.
-     * @returns The matching feature type description.
-     */
-    protected getFeatureType(typename: string): Promise<Collection>;
-    /**
-     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
-     *
-     * @param request Compiled request split into query-string parameters and POST body.
-     * @returns The parsed JSON response returned by the WFS endpoint.
-     */
-    protected fetchFeatureCollection(request: CompiledRequest): Promise<any>;
-    /**
-     * Extracts a result count from a WFS response, preferring `numberMatched`.
-     * Explicitly rejects responses that do not provide a usable total.
-     *
-     * @param featureCollection Parsed WFS response object.
-     * @returns The total number of matching features.
-     */
-    protected getMatchedFeatureCount(featureCollection: Record<string, unknown>): number;
-    /**
-     * Enriches transformed features with a complete `feature_ref`, reusable
-     * in particular by `intersects_feature`.
-     *
-     * @param featureCollection Raw WFS FeatureCollection response.
-     * @param typename Typename of the main queried layer.
-     * @returns The transformed FeatureCollection with fully populated feature references.
-     */
-    protected attachFeatureRefs(featureCollection: Record<string, unknown>, typename: string): Record<string, unknown>;
-    /**
-     * Resolves the geometry of a reference feature when `intersects_feature` is used,
-     * then converts it to EWKT for CQL compilation.
+     * Orchestrates the MCP-facing execution flow.
      *
-     * @param input Normalized tool input.
-     * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
-     */
-    protected resolveIntersectsFeatureGeometry(input: GpfWfsGetFeaturesInput): Promise<{
-        typename: string;
-        feature_id: string;
-        geometry_ewkt: string;
-    }>;
-    /**
-     * Orchestrates the full tool execution flow:
-     * catalog lookup -> compilation -> WFS request -> response post-processing.
+     * Request previews stay in the tool because they are a tool-specific output
+     * mode, while the WFS-side preparation and execution live in `features.ts`.
      *
      * @param input Normalized tool input.
      * @returns Either a compiled request, a hit count, or a transformed FeatureCollection.
      */
-    execute(input: GpfWfsGetFeaturesInput): Promise<Record<string, unknown>>;
+    execute(input: GpfWfsGetFeaturesInput): Promise<import("../helpers/wfs_engine/request.js").WfsRequestPayload | (Record<string, unknown> & {
+        features?: (Record<string, unknown> & {
+            feature_ref?: {
+                typename: string | null;
+                feature_id: string;
+            };
+        })[];
+    })>;
 }
 export default GpfWfsGetFeaturesTool;

package/dist/tools/GpfWfsGetFeaturesTool.js

@@ -1,13 +1,17 @@
-import { MCPTool } from "mcp-framework";
-import { wfsClient } from "../gpf/wfs.js";
-import { fetchJSONPost } from "../helpers/http.js";
-import logger from "../logger.js";
+import BaseTool from "./BaseTool.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
-import { compileQueryParts, geometryToEwkt, getGeometryProperty, getSpatialFilter } from "../helpers/wfs_internal/compile.js";
-import { buildMainRequest, buildReferenceGeometryRequest } from "../helpers/wfs_internal/request.js";
-import { transformFeatureCollectionResponse } from "../helpers/wfs_internal/response.js";
-import { gpfWfsGetFeaturesHitsOutputSchema, gpfWfsGetFeaturesInputSchema, gpfWfsGetFeaturesPublishedInputSchema, gpfWfsGetFeaturesRequestOutputSchema, } from "../helpers/wfs_internal/schema.js";
-class GpfWfsGetFeaturesTool extends MCPTool {
+import { executeGetFeatures, prepareGetFeaturesRequest, } from "../helpers/wfs_engine/features.js";
+import { toWfsRequestPayload } from "../helpers/wfs_engine/request.js";
+import { gpfWfsGetFeaturesHitsOutputSchema, gpfWfsGetFeaturesInputSchema, gpfWfsGetFeaturesPublishedInputSchema, gpfWfsGetFeaturesRequestOutputSchema, } from "../helpers/wfs_engine/schema.js";
+import logger from "../logger.js";
+/**
+ * MCP tool exposing structured WFS feature search.
+ *
+ * The tool remains responsible for MCP schema exposure and response formatting.
+ * WFS request preparation and execution live in the structured WFS engine.
+ */
+// --- Tool ---
+class GpfWfsGetFeaturesTool extends BaseTool {
     name = "gpf_wfs_get_features";
     title = "Lecture d’objets WFS";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
@@ -16,9 +20,15 @@ class GpfWfsGetFeaturesTool extends MCPTool {
         "Utiliser `select` pour choisir les propriétés, `where` pour filtrer, `order_by` pour trier et `spatial_operator` avec ses paramètres dédiés pour le spatial. Avec `result_type=\"request\"`, la géométrie est automatiquement ajoutée aux propriétés sélectionnées pour garantir une requête cartographiable.",
         "Exemple attributaire : `where=[{ property: \"code_insee\", operator: \"eq\", value: \"75056\" }]`.",
         "Exemple bbox : `spatial_operator=\"bbox\"` avec `bbox_west`, `bbox_south`, `bbox_east`, `bbox_north` en `lon/lat`.",
+        "Exemple point dans géométrie : `spatial_operator=\"intersects_point\"` avec `intersects_lon` et `intersects_lat`.",
         "Exemple distance : `spatial_operator=\"dwithin_point\"` avec `dwithin_lon`, `dwithin_lat`, `dwithin_distance_m`.",
         "Exemple réutilisation : `spatial_operator=\"intersects_feature\"` avec `intersects_feature_typename` et `intersects_feature_id` issus d'une `feature_ref`.",
+        "⚠️ Quand `typename` et `intersects_feature_typename` sont identiques, utiliser `gpf_wfs_get_feature_by_id` pour récupérer exactement l'objet ciblé.",
+        "**OBLIGATOIRE : toujours appeler `gpf_wfs_describe_type` avant ce tool, sauf si `gpf_wfs_describe_type` a déjà été appelé pour ce même typename dans la conversation en cours.**",
+        "Les noms de propriétés **ne peuvent pas être devinés** : ils sont spécifiques à chaque typename et diffèrent systématiquement des conventions habituelles (ex : pas de nom_officiel, navigabilite sans accent, etc.). Toute tentative sans appel préalable à `gpf_wfs_describe_type` **provoquera une erreur.**",
     ].join("\n");
+    // `schema` remains the runtime validation source, while `inputSchema`
+    // publishes the MCP-facing variant expected by clients.
     schema = gpfWfsGetFeaturesInputSchema;
     /**
      * Exposes an input schema variant that stays compatible with most MCP integrations.
@@ -42,9 +52,10 @@ class GpfWfsGetFeaturesTool extends MCPTool {
             data.result_type === "hits" &&
             "totalFeatures" in data &&
             typeof data.totalFeatures === "number") {
+            const payload = gpfWfsGetFeaturesHitsOutputSchema.parse(data);
             return {
-                content: [{ type: "text", text: JSON.stringify(data.totalFeatures) }],
-                structuredContent: gpfWfsGetFeaturesHitsOutputSchema.parse(data),
+                content: [{ type: "text", text: JSON.stringify(payload) }],
+                structuredContent: payload,
             };
         }
         if (typeof data === "object" &&
@@ -59,147 +70,23 @@ class GpfWfsGetFeaturesTool extends MCPTool {
         return super.createSuccessResponse(data);
     }
     /**
-     * Loads a WFS feature type description from the embedded catalog.
+     * Orchestrates the MCP-facing execution flow.
      *
-     * @param typename Exact WFS typename to load from the embedded schema store.
-     * @returns The matching feature type description.
-     */
-    async getFeatureType(typename) {
-        return wfsClient.getFeatureType(typename);
-    }
-    /**
-     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
-     *
-     * @param request Compiled request split into query-string parameters and POST body.
-     * @returns The parsed JSON response returned by the WFS endpoint.
-     */
-    async fetchFeatureCollection(request) {
-        const url = `${request.url}?${new URLSearchParams(request.query).toString()}`;
-        return fetchJSONPost(url, request.body, {
-            "Content-Type": "application/x-www-form-urlencoded",
-            "Accept": "application/json",
-        });
-    }
-    /**
-     * Extracts a result count from a WFS response, preferring `numberMatched`.
-     * Explicitly rejects responses that do not provide a usable total.
-     *
-     * @param featureCollection Parsed WFS response object.
-     * @returns The total number of matching features.
-     */
-    getMatchedFeatureCount(featureCollection) {
-        if (typeof featureCollection.numberMatched === "number") {
-            return featureCollection.numberMatched;
-        }
-        if (featureCollection.numberMatched === "unknown") {
-            throw new Error("Le service WFS a renvoyé un comptage indéterminé (numberMatched=\"unknown\").");
-        }
-        if (typeof featureCollection.totalFeatures === "number") {
-            return featureCollection.totalFeatures;
-        }
-        throw new Error("Le service WFS n'a pas retourné de comptage exploitable");
-    }
-    /**
-     * Enriches transformed features with a complete `feature_ref`, reusable
-     * in particular by `intersects_feature`.
-     *
-     * @param featureCollection Raw WFS FeatureCollection response.
-     * @param typename Typename of the main queried layer.
-     * @returns The transformed FeatureCollection with fully populated feature references.
-     */
-    attachFeatureRefs(featureCollection, typename) {
-        const transformed = transformFeatureCollectionResponse(featureCollection);
-        if (!Array.isArray(transformed.features)) {
-            return transformed;
-        }
-        transformed.features = transformed.features.map((feature) => {
-            if (typeof feature !== "object" || feature === null || !("feature_ref" in feature)) {
-                return feature;
-            }
-            const featureRef = feature.feature_ref;
-            if (typeof featureRef !== "object" || featureRef === null) {
-                return feature;
-            }
-            return {
-                ...feature,
-                feature_ref: {
-                    ...featureRef,
-                    typename,
-                },
-            };
-        });
-        return transformed;
-    }
-    /**
-     * Resolves the geometry of a reference feature when `intersects_feature` is used,
-     * then converts it to EWKT for CQL compilation.
-     *
-     * @param input Normalized tool input.
-     * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
-     */
-    async resolveIntersectsFeatureGeometry(input) {
-        const spatialFilter = getSpatialFilter(input);
-        if (!spatialFilter || spatialFilter.operator !== "intersects_feature") {
-            return undefined;
-        }
-        const referenceFeatureType = await this.getFeatureType(spatialFilter.typename);
-        const referenceGeometryProperty = getGeometryProperty(referenceFeatureType);
-        const request = buildReferenceGeometryRequest(spatialFilter.typename, spatialFilter.feature_id, referenceGeometryProperty.name);
-        const featureCollection = await this.fetchFeatureCollection(request);
-        const referenceFeature = Array.isArray(featureCollection?.features) ? featureCollection.features[0] : undefined;
-        if (!referenceFeature) {
-            throw new Error(`Le feature de référence '${spatialFilter.feature_id}' est introuvable dans '${spatialFilter.typename}'.`);
-        }
-        if (!referenceFeature?.geometry) {
-            throw new Error(`Le feature de référence '${spatialFilter.feature_id}' n'a pas de géométrie exploitable.`);
-        }
-        return {
-            typename: spatialFilter.typename,
-            feature_id: spatialFilter.feature_id,
-            geometry_ewkt: geometryToEwkt(referenceFeature.geometry),
-        };
-    }
-    /**
-     * Orchestrates the full tool execution flow:
-     * catalog lookup -> compilation -> WFS request -> response post-processing.
+     * Request previews stay in the tool because they are a tool-specific output
+     * mode, while the WFS-side preparation and execution live in `features.ts`.
      *
      * @param input Normalized tool input.
      * @returns Either a compiled request, a hit count, or a transformed FeatureCollection.
      */
     async execute(input) {
-        const featureType = await this.getFeatureType(input.typename);
-        const resolvedGeometryRef = await this.resolveIntersectsFeatureGeometry(input);
-        const compiled = compileQueryParts(input, featureType, resolvedGeometryRef);
-        const request = buildMainRequest(input, compiled);
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
         if (input.result_type === "request") {
-            return {
-                result_type: "request",
-                method: request.method,
-                url: request.url,
-                query: request.query,
-                body: request.body,
-                get_url: request.get_url ?? null,
-            };
-        }
-        let featureCollection;
-        try {
-            logger.info(`[gpf_wfs_get_features] POST ${request.url}?${new URLSearchParams(request.query).toString()}`);
-            featureCollection = await this.fetchFeatureCollection(request);
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            if (message.includes(`Illegal property name: ${compiled.geometryProperty.name}`)) {
-                throw new Error(`Le champ géométrique '${compiled.geometryProperty.name}' issu du catalogue embarqué est rejeté par le WFS live pour '${input.typename}'. Le catalogue embarqué est probablement désynchronisé. Détail : ${message}`);
-            }
-            throw error;
-        }
-        if (input.result_type === "hits") {
-            return {
-                result_type: "hits",
-                totalFeatures: this.getMatchedFeatureCount(featureCollection),
-            };
+            const { request } = await prepareGetFeaturesRequest(input);
+            return toWfsRequestPayload(request);
         }
-        return this.attachFeatureRefs(featureCollection, input.typename);
+        return executeGetFeatures(input);
     }
 }
 export default GpfWfsGetFeaturesTool;

package/dist/tools/GpfWfsGetFeaturesTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"GpfWfsGetFeaturesTool.js","sourceRoot":"","sources":["../../src/tools/GpfWfsGetFeaturesTool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GpfWfsGetFeaturesTool.js","sourceRoot":"","sources":["../../src/tools/GpfWfsGetFeaturesTool.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EACL,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EACL,iCAAiC,EACjC,4BAA4B,EAE5B,qCAAqC,EACrC,oCAAoC,GACrC,MAAM,iCAAiC,CAAC;AACzC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC;;;;;GAKG;AAEH,eAAe;AAEf,MAAM,qBAAsB,SAAQ,QAAgC;IAClE,IAAI,GAAG,sBAAsB,CAAC;IAC9B,KAAK,GAAG,sBAAsB,CAAC;IAC/B,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG;QACZ,8GAA8G;QAC9G,+SAA+S;QAC/S,oGAAoG;QACpG,oHAAoH;QACpH,mHAAmH;QACnH,kHAAkH;QAClH,4JAA4J;QAC5J,qJAAqJ;QACrJ,kLAAkL;QAClL,iTAAiT;KAClT,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,sEAAsE;IACtE,wDAAwD;IACxD,MAAM,GAAG,4BAA4B,CAAC;IAEtC;;;;OAIG;IACH,IAAI,WAAW;QACb,OAAO,qCAAqC,CAAC;IAC/C,CAAC;IAED;;;;;;OAMG;IACO,qBAAqB,CAAC,IAAa;QAC3C,IACE,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,aAAa,IAAI,IAAI;YACrB,IAAI,CAAC,WAAW,KAAK,MAAM;YAC3B,eAAe,IAAI,IAAI;YACvB,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,EACtC,CAAC;YACD,MAAM,OAAO,GAAG,iCAAiC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE9D,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnE,iBAAiB,EAAE,OAAO;aAC3B,CAAC;QACJ,CAAC;QAED,IACE,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,aAAa,IAAI,IAAI;YACrB,IAAI,CAAC,WAAW,KAAK,SAAS,EAC9B,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChE,iBAAiB,EAAE,oCAAoC,CAAC,KAAK,CAAC,IAAI,CAAC;aACpE,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,OAAO,CAAC,KAA6B;QACzC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,MAAM,EAAE;YAC7C,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAC3D,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAED,eAAe,qBAAqB,CAAC"}

package/dist/tools/GpfWfsSearchTypesTool.d.ts

@@ -1,17 +1,20 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing keyword-based search over the embedded WFS type catalog.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 declare const gpfWfsSearchTypesInputSchema: z.ZodObject<{
     query: z.ZodString;
     max_results: z.ZodOptional<z.ZodNumber>;
 }, "strict", z.ZodTypeAny, {
-    query?: string;
-    max_results?: number;
+    query: string;
+    max_results?: number | undefined;
 }, {
-    query?: string;
-    max_results?: number;
+    query: string;
+    max_results?: number | undefined;
 }>;
 type GpfWfsSearchTypesInput = z.infer<typeof gpfWfsSearchTypesInputSchema>;
-declare class GpfWfsSearchTypesTool extends MCPTool<GpfWfsSearchTypesInput> {
+declare class GpfWfsSearchTypesTool extends BaseTool<GpfWfsSearchTypesInput> {
     name: string;
     title: string;
     annotations: {
@@ -28,47 +31,53 @@ declare class GpfWfsSearchTypesTool extends MCPTool<GpfWfsSearchTypesInput> {
             description: z.ZodString;
             score: z.ZodOptional<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            id?: string;
-            title?: string;
-            description?: string;
-            score?: number;
+            title: string;
+            description: string;
+            id: string;
+            score?: number | undefined;
         }, {
-            id?: string;
-            title?: string;
-            description?: string;
-            score?: number;
+            title: string;
+            description: string;
+            id: string;
+            score?: number | undefined;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        results?: {
-            id?: string;
-            title?: string;
-            description?: string;
-            score?: number;
+        results: {
+            title: string;
+            description: string;
+            id: string;
+            score?: number | undefined;
         }[];
     }, {
-        results?: {
-            id?: string;
-            title?: string;
-            description?: string;
-            score?: number;
+        results: {
+            title: string;
+            description: string;
+            id: string;
+            score?: number | undefined;
         }[];
     }>;
     schema: z.ZodObject<{
         query: z.ZodString;
         max_results: z.ZodOptional<z.ZodNumber>;
     }, "strict", z.ZodTypeAny, {
-        query?: string;
-        max_results?: number;
+        query: string;
+        max_results?: number | undefined;
     }, {
-        query?: string;
-        max_results?: number;
+        query: string;
+        max_results?: number | undefined;
     }>;
+    /**
+     * Searches the embedded WFS type catalog from a free-text query.
+     *
+     * @param input Normalized tool input.
+     * @returns The ordered search results, optionally enriched with relevance scores.
+     */
     execute(input: GpfWfsSearchTypesInput): Promise<{
         results: {
-            score?: number;
-            id: string;
-            title: string;
-            description: string;
+            score?: any;
+            id: any;
+            title: any;
+            description: any;
         }[];
     }>;
 }

package/dist/tools/GpfWfsSearchTypesTool.js

@@ -1,7 +1,12 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing keyword-based search over the embedded WFS type catalog.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
-import { wfsClient } from "../gpf/wfs.js";
+import { wfsClient } from "../gpf/wfs-schema-catalog.js";
+import logger from "../logger.js";
+// --- Schema ---
 const gpfWfsSearchTypesInputSchema = z.object({
     query: z
         .string()
@@ -25,7 +30,8 @@ const gpfWfsSearchTypeResultSchema = z.object({
 const gpfWfsSearchTypesOutputSchema = z.object({
     results: z.array(gpfWfsSearchTypeResultSchema).describe("La liste ordonnée des types WFS trouvés."),
 });
-class GpfWfsSearchTypesTool extends MCPTool {
+// --- Tool ---
+class GpfWfsSearchTypesTool extends BaseTool {
     name = "gpf_wfs_search_types";
     title = "Recherche de types WFS";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
@@ -38,7 +44,16 @@ class GpfWfsSearchTypesTool extends MCPTool {
     ].join("\n");
     outputSchemaShape = gpfWfsSearchTypesOutputSchema;
     schema = gpfWfsSearchTypesInputSchema;
+    /**
+     * Searches the embedded WFS type catalog from a free-text query.
+     *
+     * @param input Normalized tool input.
+     * @returns The ordered search results, optionally enriched with relevance scores.
+     */
     async execute(input) {
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
         const maxResults = input.max_results || 10;
         const featureTypes = await wfsClient.searchFeatureTypesWithScores(input.query, maxResults);
         return {