@sassoftware/sas-score-mcp-serverjs 1.0.1-9 → 1.1.1

package/src/toolSet/listScr.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _listScr from '../toolHelpers/_listScr.js';
+
+function listScr(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+list-scr — list available SCR models.
+PARAMS: start (number, default 1), limit (number, default 10)
+RETURNS: array of SCR model names and metadata
+` : `
+list-scr — enumerate models published to scr.
+
+USE when:  list scr, show scr next page
+DO NOT USE for: ${_appContext.brand}-find model, ${_appContext.brand}-find scr, ${_appContext.brand}-model metadata, ${_appContext.brand}-score model, ${_appContext.brand}-list jobs/tables/libraries
+
+PARAMETERS
+- limit: number (default: 10) — page size
+- start: number (default: 1) — 1-based offset
+
+ROUTING RULES
+- "list scr" → { start:1, limit:10 }
+- "list 25 scr" → { start:1, limit:25 }
+- "next scr" → { start: start+limit, limit:10 }
+
+EXAMPLES
+- "list scr" → { start:1, limit:10 }
+- "list 25 scr" → { start:1, limit:25 }
+
+NEGATIVE EXAMPLES (do not route here)
+- "find scr X" (use ${_appContext.brand}-find-scr)
+- "describe scr X" (use ${_appContext.brand}-scr-describe)
+- "score scr X" (use ${_appContext.brand}-scr-score)
+- "list jobs" (use ${_appContext.brand}-list-jobs)
+
+ERRORS
+Returns empty array if no scrs found.
+  `;
+
+  let spec = {
+    name: 'list-scr',
+    description: description,
+    inputSchema: z.object({
+      limit: z.number().optional(),
+      start: z.number().optional()
+    }),
+    handler: async (params) => { 
+      let r  = await _listScr(params);
+      return r;
+    }
+  }
+  
+  return spec;
+}
+
+export default listScr;
+
+

package/src/toolSet/listTables.js

@@ -1,66 +1,78 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import debug from 'debug';
-import _listTables from '../toolHelpers/_listTables.js';
-
-
-function listTables(_appContext) {
-  const log = debug('tools');
-
-    let description = `
-list-tables — enumerate tables within a library.
-
-USE when: list tables in <lib>, show tables in <lib>, next page
-DO NOT USE for: find table, list libraries, get table structure (use table-info), read data (use read-table)
-
-PARAMETERS
-- lib: string — library to inspect (required)
-- server: string (default: 'cas') — 'cas' or 'sas'
-- limit: number (default: 10) — page size
-- start: number (default: 1) — 1-based offset
-- where: string — optional filter expression
-
-ROUTING RULES
-- "list tables in Samples" → { lib: "Samples", start: 1, limit: 10 }
-- "list 25 tables in sashelp" → { lib: "sashelp", limit: 25, start: 1 }
-- "list cas tables in Public" → { lib: "Public", server: "cas", start: 1, limit: 10 }
-
-EXAMPLES
-- "list tables in Samples" → { lib: "Samples", start: 1, limit: 10 }
-- "show 25 tables in sashelp" → { lib: "sashelp", limit: 25, start: 1 }
-
-NEGATIVE EXAMPLES (do not route here)
-- "list libs" (use list-libraries)
-- "find lib Public" (use find-library)
-- "describe table cars" (use table-info)
-- "read table cars" (use read-table)
-
-ERRORS
-Returns empty array if no tables found.
-  `;
-    
-  let spec = {
-    name: 'list-tables',
-    description: description,
-
-    inputSchema: z.object({
-      lib: z.string(),
-      server: z.string().optional(),
-      limit: z.number().optional(),
-      start: z.number().optional(),
-      where: z.string().optional()
-    }),
-    handler: async (params) => { 
-      let r = await _listTables(params);
-      return r;
-    }
-  }
-  return spec;
-}
-
-export default listTables;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import debug from 'debug';
+import _listTables from '../toolHelpers/_listTables.js';
+
+
+function listTables(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  const log = debug('tools');
+
+    let description = isAgent ? `
+list-tables — list tables in a library.
+PARAMS: intent ('list', required), lib (string, required), server ('cas'|'sas', optional), start (number, default 1), limit (number, default 10)
+RETURNS: array of table names and metadata
+` : `
+list-tables — enumerate tables within a library.
+
+USE when: list tables in <lib>, show tables in <lib>, next page
+DO NOT USE for: find table, list libraries, get table structure (use ${_appContext.brand}-table-describe), read data (use ${_appContext.brand}-read-table)
+
+PARAMETERS
+- intent: must be 'list' — only pass if user explicitly asked to list/enumerate tables. Do NOT use for read, find, or verify.
+- lib: string — library to inspect (required)
+- server: string (default: 'cas') — 'cas' or 'sas'
+- limit: number (default: 10) — page size
+- start: number (default: 1) — 1-based offset
+- where: string — optional filter expression
+
+ROUTING RULES
+- "list tables in Samples" → { lib: "Samples", start: 1, limit: 10 }
+- "list 25 tables in sashelp" → { lib: "sashelp", limit: 25, start: 1 }
+- "list cas tables in Public" → { lib: "Public", server: "cas", start: 1, limit: 10 }
+
+EXAMPLES
+- "list tables in Samples" → { lib: "Samples", start: 1, limit: 10 }
+- "show 25 tables in sashelp" → { lib: "sashelp", limit: 25, start: 1 }
+
+NEGATIVE EXAMPLES (do not route here)
+-- "list libs" (use ${_appContext.brand}-list-libraries)
+-- "find lib Public" (use ${_appContext.brand}-find-library)
+-- "describe table cars" (use ${_appContext.brand}-table-describe)
+-- "read table cars" (use ${_appContext.brand}-read-table)
+-- "does table cars exist in Samples" (use ${_appContext.brand}-find-table)
+-- "is table iris in Public" (use ${_appContext.brand}-find-table)
+-- "verify table orders in mylib" (use ${_appContext.brand}-find-table)
+
+ERRORS
+Returns empty array if no tables found.
+  `;
+    
+  let spec = {
+    name: 'list-tables',
+    description: description,
+
+    inputSchema: z.object({
+      intent: z.literal('list'),
+      lib: z.string(),
+      server: z.string().optional(),
+      limit: z.number().optional(),
+      start: z.number().optional(),
+      where: z.string().optional()
+    }),
+    handler: async (params) => {
+      const { intent, ...rest } = params;
+      let r = await _listTables(rest);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default listTables;
+
+

package/src/toolSet/{runMacro.js → macroScore.js}

@@ -1,82 +1,86 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _submitCode from '../toolHelpers/_submitCode.js';
-
-
-function runMacro(_appContext) {
-  let description = `
-run-macro — submit and execute a SAS macro on SAS Viya server.
-
-USE when: run macro, execute macro with parameters
-DO NOT USE for: arbitrary SAS code (use run-sas-program), jobs, jobdefs
-
-PARAMETERS
-- macro: string — macro name without "%" (required)
-- scenario: string — parameters or setup code (optional). Accepts: "x=1, y=abc" or "%let x=1; %let y=abc;"
-
-ROUTING RULES
-- "run macro abc" → { macro: "abc", scenario: "" }
-- "run macro abc with x=1, y=2" → { macro: "abc", scenario: "x=1, y=2" }
-- "run macro xyz with %let a=1; %let b=2;" → { macro: "xyz", scenario: "%let a=1; %let b=2;" }
-
-EXAMPLES
-- "run macro abc" → { macro: "abc", scenario: "" }
-- "run macro summarize with x=1, y=2" → { macro: "summarize", scenario: "x=1, y=2" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "run SAS code" (use run-sas-program)
-- "run job X" (use run-job)
-- "run jobdef X" (use run-jobdef)
-
-ERRORS
-Returns log, ods, tables created by macro. Auto-converts "x=1, y=2" to "%let x=1; %let y=2;" format.
-  `;
-
-  let spec = {
-    name: 'run-macro',
-    description: description,
-    
-    inputSchema: z.object({
-      macro: z.string(),
-      scenario: z.string().optional()
-    }),
-     
-    handler: async (params) => {
-      const scenarioRaw = (params.scenario || '').trim();
-      let setup = '';
-      if (scenarioRaw) {
-        // If the scenario already contains macro syntax, send it through unchanged
-        const hasMacroSyntax = /%let\b|%[a-zA-Z_]\w*\s*\(|%[a-zA-Z_]\w*\s*;/.test(scenarioRaw) || scenarioRaw.includes('%');
-        if (hasMacroSyntax) {
-          setup = scenarioRaw;
-        } else {
-          // Convert "x=1,y=abc" -> "%let x=1; %let y=abc;"
-          setup = scenarioRaw.split(',')
-            .map(p => p.trim())
-            .filter(Boolean)
-            .map(p => {
-              const [k, ...rest] = p.split('=');
-              if (!k) return '';
-              const key = k.trim();
-              const val = rest.join('=').trim();
-              return `%let ${key}=${val};`;
-            })
-            .filter(Boolean)
-            .join(' ');
-        }
-      }
-      const src = `${setup} %${params.macro};`;
-      params.src = src;
-      let r = await _submitCode(params);
-      return r;
-    }
-  }
-  return spec;
-}
-
-export default runMacro;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _submitCode from '../toolHelpers/_submitCode.js';
+
+
+function macroScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+macro-score — execute a SAS macro model.
+PARAMS: macro (string, required — name without %), scenario (string, optional — "x=1,y=2" or %let syntax)
+RETURNS: log, ODS output, and tables created by macro
+` : `
+macro-score — submit and execute a SAS macro model on SAS Viya server.
+
+USE when: score macro, execute macro with parameters
+DO NOT USE for: arbitrary SAS code (use program-score), jobs (use job-score), jobdefs (use jobdef-score)
+
+PARAMETERS
+- macro: string — macro name without "%" (required)
+- scenario: string — parameters or setup code (optional). Accepts: "x=1, y=abc" or "%let x=1; %let y=abc;"
+
+ROUTING RULES
+- "score macro abc" → { macro: "abc", scenario: "" }
+- "score macro abc with x=1, y=2" → { macro: "abc", scenario: "x=1, y=2" }
+- "score macro xyz with %let a=1; %let b=2;" → { macro: "xyz", scenario: "%let a=1; %let b=2;" }
+
+EXAMPLES
+- "score macro abc" → { macro: "abc", scenario: "" }
+- "score macro summarize with x=1, y=2" → { macro: "summarize", scenario: "x=1, y=2" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "score SAS code" (use program-score)
+- "score job X" (use job-score)
+- "score jobdef X" (use jobdef-score)
+
+ERRORS
+Returns log, ods, tables created by macro. Auto-converts "x=1, y=2" to "%let x=1; %let y=2;" format.
+  `;
+
+  let spec = {
+    name: 'macro-score',
+    description: description,
+
+    inputSchema: z.object({
+      macro: z.string(),
+      scenario: z.string().optional()
+    }),
+
+    handler: async (params) => {
+      const scenarioRaw = (params.scenario || '').trim();
+      let setup = '';
+      if (scenarioRaw) {
+        // If the scenario already contains macro syntax, send it through unchanged
+        const hasMacroSyntax = /%let\b|%[a-zA-Z_]\w*\s*\(|%[a-zA-Z_]\w*\s*;/.test(scenarioRaw) || scenarioRaw.includes('%');
+        if (hasMacroSyntax) {
+          setup = scenarioRaw;
+        } else {
+          // Convert "x=1,y=abc" -> "%let x=1; %let y=abc;"
+          setup = scenarioRaw.split(',')
+            .map(p => p.trim())
+            .filter(Boolean)
+            .map(p => {
+              const [k, ...rest] = p.split('=');
+              if (!k) return '';
+              const key = k.trim();
+              const val = rest.join('=').trim();
+              return `%let ${key}=${val};`;
+            })
+            .filter(Boolean)
+            .join(' ');
+        }
+      }
+      const src = `${setup} %${params.macro};`;
+      params.src = src;
+      let r = await _submitCode(params);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default macroScore;

package/src/toolSet/makeTools.js

@@ -3,67 +3,81 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import listModels from './listModels.js';
-import listTables from './listTables.js';
-import modelScore from './modelScore.js';
-import modelInfo from './modelInfo.js';
+import listMas from './listMas.js';
+
+
+import masScore from './masScore.js';
+import masDescribe from './masDescribe.js';
+import findMas from './findMas.js';
+
 import findLibrary from './findLibrary.js';
-import readTable from './readTable.js';
-import tableInfo from './tableInfo.js';
 import listLibraries from './listLibraries.js';
 
-import scrInfo from './scrInfo.js';
+import listTables from './listTables.js';
+import findTable from './findTable.js';
+import tableDescribe from './tableDescribe.js';
+import readTable from './readTable.js';
+
+import findScr from './findScr.js';
+import listScr from './listScr.js';
+import scrDescribe from './scrDescribe.js';
 import scrScore from './scrScore.js';
 
 import devaScore from './devaScore.js';
 
-import findTable from './findTable.js';
-import findModel from './findModel.js';
-import runProgram from './runProgram.js';
-import runMacro from './runMacro.js';
-import runJob from './runJob.js';
+import programScore from './programScore.js';
+import casProgramScore from './casProgramScore.js';
+import casModelScore from './casModelScore.js';
+import macroScore from './macroScore.js';
+import jobScore from './jobScore.js';
 import listJobs from './listJobs.js';
-import runJobdef from './runJobdef.js';
+import jobdefScore from './jobdefScore.js';
 import findJob from './findJob.js';
 import listJobdefs from './listJobdefs.js';
 import findJobdef from './findJobdef.js';
+import jobDescribe from './jobDescribe.js';
+import jobdefDescribe from './jobdefDescribe.js';
 
 import sasQuery from './sasQuery.js';
 import setContext from './setContext.js';
 
-
 function makeTools(_appContext) {
   // wrap all tools with 
   let customTools = [];
 
   // get the tool definitions and handler 
   let list = [
-    listModels(_appContext),
-    
-    findModel(_appContext),
-    modelInfo(_appContext),
-    modelScore(_appContext),
+    listMas(_appContext),
+    listScr(_appContext),
+    findMas(_appContext),
+    masDescribe(_appContext),
+    masScore(_appContext),
 
-    scrInfo(_appContext),
+    scrDescribe(_appContext),
     scrScore(_appContext),
+    findScr(_appContext),
 
     findLibrary(_appContext),
     listLibraries(_appContext),
     findTable(_appContext),
-    tableInfo(_appContext),
+    tableDescribe(_appContext),
     listTables(_appContext),
     readTable(_appContext),
     sasQuery(_appContext),
 
-    runProgram(_appContext),
-    runMacro(_appContext),
+    programScore(_appContext),
+    casProgramScore(_appContext),
+    casModelScore(_appContext),
+    macroScore(_appContext),
 
     findJob(_appContext),
     listJobs(_appContext),
-    runJob(_appContext),
+    jobScore(_appContext),
     listJobdefs(_appContext),
     findJobdef(_appContext),
-    runJobdef(_appContext),
+    jobDescribe(_appContext),
+    jobdefDescribe(_appContext),
+    jobdefScore(_appContext),
 
     devaScore(_appContext),
     setContext(_appContext)

package/src/toolSet/masDescribe.js

@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import debug from 'debug';
+import _masDescribe from '../toolHelpers/_masDescribe.js';
+const log = debug('tools');
+
+function masDescribe(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+mas-describe — return input/output schema for a MAS model.
+PARAMS: intent ('describe', required), name (string, required)
+RETURNS: input variables, output variables, model type, description
+` : `
+mas-describe — return detailed information about a specific MAS model, including its inputs, outputs, and metadata.
+
+USE when: what inputs does model need, describe model, show variables for model, model inputs/outputs
+DO NOT USE for: find model, list models, score model, table/job operations
+
+PARAMETERS
+- intent: must be 'describe' — only pass if user explicitly asked to describe/inspect a MAS model. Do NOT use for find or verify existence.
+- model: string — model name (required, exact match)
+
+ROUTING RULES
+- "what inputs does mas X need?" → { model: "X" }
+- "describe mas Y" → { model: "Y" }
+- "describe mas Y.mas" → { model: "Y" }
+- "show variables for mas Z" → { model: "Z" }
+
+EXAMPLES
+- "What inputs does mas churnRisk need?" → { model: "churnRisk" }
+- "Describe mas creditScore" → { model: "creditScore" }
+- "Show variables for myModel" → { model: "myModel" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "list mas" (use list-models)
+- "find mas X" (use find-model)
+- "score with mas X" (use model-score)
+
+ERRORS
+Returns model metadata: inputs (name, type, role), outputs (name, type, possible_values), model_type, description.
+  `;
+
+  let spec = {
+    name: 'mas-describe',
+    description: description,
+    inputSchema: z.object({
+      intent: z.literal('describe'),
+      model: z.string()
+    }),
+    handler: async (params) => {
+      const { intent, ...rest } = params;
+      if (rest.model != null && rest.model.endsWith('.mas')) {
+        rest.model = rest.model.slice(0, -4);
+      }
+      let r = await _masDescribe(rest);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default masDescribe;
+

package/src/toolSet/masScore.js

@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import debug from 'debug';
+import _masScoring from '../toolHelpers/_masScoring.js';
+const log = debug('tools');
+
+function masScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+mas-score — score data using a deployed MAS model.
+PARAMS: model (string, required), scenario (object, optional key=value pairs)
+RETURNS: predictions merged with input values
+` : `
+mas-score — score data using a deployed model on MAS.
+
+USE when: score with model, predict using model, batch scoring, model predictions
+DO NOT USE for: find model, model metadata, list models, run programs/jobs, query tables
+
+PARAMETERS
+- model: string — model name (required, exact match)
+- scenario: object — input data as JSON (optional, defaults to {}). Example: {age:45, income:60000}
+
+
+ROUTING RULES
+- "score with mas model X using a=1, b=2" → { model: "X", scenario: {a:1, b:2} }
+- "score Y.mas for a=1, b=2" → { model: "Y", scenario: {a:1, b:2} }
+- "predict using mas model Y with age=45, income=60000" → { model: "Y", scenario: {age:45, income:60000} }
+
+EXAMPLES
+- "score with mas model churn using age=45, income=60000" → { model: "churn", scenario: {age:45, income:60000} }
+- "predict mas model creditScore for credit=700, debt=20000" → { model: "creditScore", scenario: {credit:700, debt:20000} }
+
+NEGATIVE EXAMPLES (do not route here)
+- "find model X" (use find-model)
+- "what inputs does model need" (use model-info)
+- "list models" (use list-models)
+- "score job X" (use job-score)
+
+ERRORS
+Returns predictions, probabilities, scores merged with input data. Returns error if model not found or scoring fails.
+  `;
+
+ 
+  let spec = {
+    name: 'mas-score',
+    description: description,
+    inputSchema: z.object({
+      model: z.string(),
+      scenario: z.any()
+    }),
+      
+    handler: async (iparams) => {
+      let params = {...iparams};
+      let scenario = params.scenario;
+
+      // Convert the scenario string to an object
+      // Example: "x=1, y=2, z=3" to { x: 1, y: 2, z: 3 }
+      let scenarioObj = {};
+      let count = 0;
+      if (typeof scenario === 'object') {
+        scenarioObj = scenario;
+      } else if (Array.isArray(scenario)) {
+        scenarioObj = scenario[0];
+      } else {
+        //console.error('Incoming scenario', scenario);
+        scenarioObj = scenario.split(',').reduce((acc, pair) => {
+          let [key, value] = pair.split('=');
+          acc[key.trim()] = value;
+          count++;
+          return acc;
+        }, {});
+      }
+      params.scenario = scenarioObj;
+      // Drop model extension (e.g., .job, .model)
+     if (params.model != null) {    
+        if (params.model.endsWith('.mas'))   {
+          params.model = params.model.slice(0, -4);
+        }
+      }
+  
+      log('masScore params', params);
+      // Check if the params.scenario is a string and parse it
+      let r = await _masScoring(params)
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default masScore;
+