@mcoda/codali 0.1.117 → 0.1.118

package/dist/gateway/GatewayPlanner.d.ts

@@ -188,8 +188,32 @@ export declare const CODALI_GATEWAY_PLANNER_SCHEMA: {
         };
     };
 };
+/**
+ * Matches a tool name the planner wrote against the tools that actually exist.
+ *
+ * Registered names are namespaced — `http:logmira_tenant_records:daily_logs`,
+ * `mcp:github:list_issues` — and a model asked to repeat one routinely writes
+ * the last segment instead, or drops the transport prefix. Compared exactly,
+ * that name matches nothing, and a task whose tools do not resolve is rejected
+ * whole: the run then calls no tools at all, returns no sources, and reports
+ * that the context pack was empty.
+ *
+ * It reached production. A declared HTTP connector was registered, visible and
+ * undropped, while the planner in the same run happily called `docdex_search`
+ * — a name short enough to reproduce exactly. The connector was never called
+ * once.
+ *
+ * Only unambiguous matches are accepted. Two tools ending in the same segment
+ * resolve to neither, because guessing between them would call the wrong
+ * system, and that is worse than reporting the tool as unavailable.
+ */
+export declare const resolveToolNameAgainst: (candidate: string, available: readonly string[]) => string | undefined;
 export declare const buildCodaliGatewayClassifierMessages: (input: GatewayPlannerInput) => ProviderMessage[];
 export declare const buildCodaliGatewayPlannerMessages: (input: GatewayPlannerInput, classifier: CodaliGatewayClassifierOutput) => ProviderMessage[];
+export declare const sanitizePlannerOutput: (planner: CodaliGatewayPlannerOutput, input: GatewayPlannerInput) => {
+    planner: CodaliGatewayPlannerOutput;
+    warnings: string[];
+};
 export declare class CodaliGatewayPlanner {
     private readonly provider;
     private readonly options;

package/dist/gateway/GatewayPlanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GatewayPlanner.d.ts","sourceRoot":"","sources":["../../src/gateway/GatewayPlanner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GatewayPlanner.d.ts","sourceRoot":"","sources":["../../src/gateway/GatewayPlanner.ts"],"names":[],"mappings":"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"}

package/dist/gateway/GatewayPlanner.js

@@ -377,6 +377,46 @@ const validateClassifierOutput = (value, input, policyCompilation) => {
         },
     };
 };
+/**
+ * Matches a tool name the planner wrote against the tools that actually exist.
+ *
+ * Registered names are namespaced — `http:logmira_tenant_records:daily_logs`,
+ * `mcp:github:list_issues` — and a model asked to repeat one routinely writes
+ * the last segment instead, or drops the transport prefix. Compared exactly,
+ * that name matches nothing, and a task whose tools do not resolve is rejected
+ * whole: the run then calls no tools at all, returns no sources, and reports
+ * that the context pack was empty.
+ *
+ * It reached production. A declared HTTP connector was registered, visible and
+ * undropped, while the planner in the same run happily called `docdex_search`
+ * — a name short enough to reproduce exactly. The connector was never called
+ * once.
+ *
+ * Only unambiguous matches are accepted. Two tools ending in the same segment
+ * resolve to neither, because guessing between them would call the wrong
+ * system, and that is worse than reporting the tool as unavailable.
+ */
+export const resolveToolNameAgainst = (candidate, available) => {
+    const wanted = candidate.trim();
+    if (!wanted)
+        return undefined;
+    if (available.includes(wanted))
+        return wanted;
+    const lower = wanted.toLowerCase();
+    const caseless = available.filter((tool) => tool.toLowerCase() === lower);
+    if (caseless.length === 1)
+        return caseless[0];
+    const lastSegment = (value) => {
+        const parts = value.split(":");
+        return (parts[parts.length - 1] ?? value).toLowerCase();
+    };
+    const bySegment = available.filter((tool) => lastSegment(tool) === lastSegment(wanted));
+    if (bySegment.length === 1)
+        return bySegment[0];
+    // `logmira_tenant_records:daily_logs` for `http:logmira_tenant_records:daily_logs`.
+    const bySuffix = available.filter((tool) => tool.toLowerCase().endsWith(`:${lower}`));
+    return bySuffix.length === 1 ? bySuffix[0] : undefined;
+};
 const allowedToolNames = (compilation) => [...compilation.effectiveAllowedTools].sort();
 /**
  * Capability names the classifier selected for stage-2 tool expansion. Absent
@@ -729,7 +769,7 @@ const normalizePlannerOutput = (value, input, classifier, policyCompilation) =>
     };
     return normalized;
 };
-const sanitizePlannerOutput = (planner, input) => {
+export const sanitizePlannerOutput = (planner, input) => {
     const policy = input.policyCompilation ?? compileCodaliGatewayPolicy({ request: input.request });
     const allowed = new Set(allowedToolNames(policy));
     const warnings = [];
@@ -739,8 +779,22 @@ const sanitizePlannerOutput = (planner, input) => {
             warnings.push(`planner_task_removed_image_worker_disabled:${task.id}`);
             continue;
         }
-        const filteredTools = task.toolsAllowed.filter((tool) => allowed.has(tool));
-        const removed = task.toolsAllowed.filter((tool) => !allowed.has(tool));
+        const allowedList = [...allowed];
+        const resolved = task.toolsAllowed.map((tool) => ({
+            requested: tool,
+            canonical: resolveToolNameAgainst(tool, allowedList),
+        }));
+        const filteredTools = [
+            ...new Set(resolved
+                .map((entry) => entry.canonical)
+                .filter((tool) => Boolean(tool))),
+        ];
+        const repaired = resolved.filter((entry) => entry.canonical && entry.canonical !== entry.requested);
+        if (repaired.length > 0) {
+            warnings.push(`planner_task_tools_resolved:${task.id}:` +
+                repaired.map((entry) => `${entry.requested}->${entry.canonical}`).join(","));
+        }
+        const removed = resolved.filter((entry) => !entry.canonical).map((entry) => entry.requested);
         if (removed.length > 0) {
             warnings.push(`planner_task_tools_removed:${task.id}:${removed.join(",")}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/codali",
-  "version": "0.1.117",
+  "version": "0.1.118",
   "description": "Standalone tool-runner adapter for mcoda.",
   "type": "module",
   "main": "dist/index.js",
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "1.30.0",
-    "@mcoda/db": "0.1.117",
-    "@mcoda/shared": "0.1.117"
+    "@mcoda/db": "0.1.118",
+    "@mcoda/shared": "0.1.118"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",