Re-org logic

Author: znorman-harris

libs/mcp/language-server-tools/src/lib/tasks/register-mcp-task-tools.ts

@@ -6,14 +6,9 @@ import {
   RegisterMCPTool_ListENVITools,
   RegisterMCPTool_RunENVITool,
 } from '@idl/mcp/server-tools';
-import { FilterMCPENVITasks, MCPTaskRegistry } from '@idl/mcp/tasks';
+import { MCPTaskRegistry } from '@idl/mcp/tasks';
 import { IDLIndex } from '@idl/parsing/index';
-import {
-  GLOBAL_TOKEN_TYPES,
-  GlobalFunctionToken,
-  GlobalStructureToken,
-  IGlobalIndexedToken,
-} from '@idl/types/idl-data-types';
+import { GLOBAL_TOKEN_TYPES } from '@idl/types/idl-data-types';
 
 /**
  * Registers MCP Task tools from parsed code on IDL's search path
@@ -46,30 +41,11 @@ export async function RegisterMCPTaskTools(server: MCPServer, index: IDLIndex) {
   RegisterMCPTool_RunENVITool(server, registry);
   RegisterMCPTool_CreateENVIModelerWorkflow(server, registry);
 
-  /** Get all functions that we know about */
-  const functions =
-    index.globalIndex.globalTokensByTypeByName[GLOBAL_TOKEN_TYPES.FUNCTION];
-
-  /** Get all structures that we know about */
-  const structures =
-    index.globalIndex.globalTokensByTypeByName[GLOBAL_TOKEN_TYPES.STRUCTURE];
-
-  /** Find names of ENVI Tasks and exclude those we dont need to expose  */
-  const keys = FilterMCPENVITasks(functions, Object.keys(structures)).sort();
-
-  server.logManager.log({
-    log: IDL_MCP_LOG,
-    type: 'info',
-    content: `Attempting to register ${keys.length} ENVI Tools`,
-  });
-
-  // add all ENVI Tasks
-  for (let i = 0; i < keys.length; i++) {
-    registry.registerTask(
-      functions[keys[i]][0] as IGlobalIndexedToken<GlobalFunctionToken>,
-      structures[keys[i]][0] as IGlobalIndexedToken<GlobalStructureToken>,
-    );
-  }
+  /** Register tasks that we have found */
+  registry.registerTasksFromGlobalTokens(
+    index.globalIndex.globalTokensByTypeByName[GLOBAL_TOKEN_TYPES.FUNCTION],
+    index.globalIndex.globalTokensByTypeByName[GLOBAL_TOKEN_TYPES.STRUCTURE],
+  );
 
   // server.logManager.log({
   //   log: IDL_MCP_LOG,

libs/mcp/server-tools/src/lib/tools/envi/register-mcp-tool-create-envi-modeler-workflow.ts

@@ -214,7 +214,7 @@ export function RegisterMCPTool_CreateENVIModelerWorkflow(
         edges as ENVIModelerEdge[],
         registry,
       );
-      const modelContent = JSON.stringify(modelJSON, null, 4);
+      const modelContent = JSON.stringify(modelJSON, null, 2);
 
       // ---- write to disk
       try {

libs/mcp/tasks/src/lib/mcp-task-registry.class.ts

@@ -12,6 +12,7 @@ import Ajv from 'ajv';
 import { z, ZodRawShape } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 
+import { FilterMCPENVITasks } from './helpers/filter-mcp-envi-tasks';
 import { GetCleanDescription } from './helpers/get-clean-description';
 import { StrictCheck } from './helpers/strict-check';
 import {
@@ -104,7 +105,7 @@ export class MCPTaskRegistry {
   /**
    * Gets information about a task
    */
-  getTaskDetail(taskName: string): ITaskInformation {
+  getTaskDetail(taskName: string): ITaskInformation | undefined {
     /** Get lower case name */
     const lc = taskName.toLowerCase();
 
@@ -296,6 +297,32 @@ export class MCPTaskRegistry {
     };
   }
 
+  /**
+   * Loads tasks from global tokens (i.e. after we index a location)
+   */
+  registerTasksFromGlobalTokens(
+    functions: {
+      [key: string]: IGlobalIndexedToken<GlobalFunctionToken>[];
+    },
+    structures: {
+      [key: string]: IGlobalIndexedToken<GlobalStructureToken>[];
+    },
+  ) {
+    /** Find names of ENVI Tasks and exclude those we dont need to expose  */
+    const keys = FilterMCPENVITasks(functions, Object.keys(structures)).sort();
+
+    this.logger.log({
+      log: IDL_MCP_LOG,
+      type: 'info',
+      content: `Attempting to register ${keys.length} ENVI Tools`,
+    });
+
+    // add all ENVI Tasks
+    for (let i = 0; i < keys.length; i++) {
+      this.registerTask(functions[keys[i]][0], structures[keys[i]][0]);
+    }
+  }
+
   /**
    * Remove a task from the registry
    *
@@ -356,7 +383,7 @@ export class MCPTaskRegistry {
       // check if we have JSON schema problems
       if (!valid) {
         // Format validation errors for the response
-        const errors = validate.errors
+        const errors = (validate.errors || [])
           .map(
             (err) =>
               `- ${err.instancePath || 'root'}: ${err.message}${