@sassoftware/sas-score-mcp-serverjs 0.4.0 → 0.4.1-15

package/src/toolSet/runJobdef.js

@@ -1,83 +1,82 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _jobSubmit from '../toolHelpers/_jobSubmit.js';
-
-function runJobdef(_appContext) {
-  // JSON object for LLM/tooling
- 
-  let description = `
-run-jobdef — execute a SAS Viya job definition.
-
-USE when: run jobdef, execute jobdef, run with parameters
-DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro), list/find jobdefs
-
-PARAMETERS
-- name: string — jobdef name (required)
-- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
-
-ROUTING RULES
-- "run jobdef xyz" → { name: "xyz" }
-- "run jobdef xyz with param1=10, param2=val2" → { name: "xyz", scenario: {param1:10, param2:"val2"} }
-
-EXAMPLES
-- "run jobdef xyz" → { name: "xyz" }
-- "run jobdef monthly_report with month=10, year=2025" → { name: "monthly_report", scenario: {month:10, year:2025} }
-
-NEGATIVE EXAMPLES (do not route here)
-- "run SAS code" (use run-sas-program)
-- "run macro X" (use run-macro)
-- "list jobdefs" (use list-jobdefs)
-- "find jobdef X" (use find-jobdef)
-
-ERRORS
-Returns log output, listings, tables from jobdef. Error if jobdef not found.
-  `;
- 
-  let spec = {
-      name: 'run-jobdef',
-      aliases: ['jobDef','jobdef','jobdef'],
-    description: description,
-    schema: {
-      name: z.string(),
-      scenario: z.any().default(''),
-    },
-    required: ['name'],
-    handler: async (params) => {
-      let scenario = params.scenario;
-      let scenarioObj = {};
-      let count = 0;
-      // 
-      if (scenario == null) {
-        scenarioObj = {};
-      } else if (typeof scenario === 'object') {
-        scenarioObj = scenario;
-      } else if (Array.isArray(scenario)) {
-        scenarioObj = scenario[0];
-      } else if (typeof scenario === 'string') {
-        if (scenario.trim() === '') {
-          scenarioObj = {};
-        } 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.type = 'def';
-      params.scenario = scenarioObj;
-      // Provide runtime context for auth and server settings
-      let r = await _jobSubmit(params);
-      return r;
-    }
-  };
-  return spec;
-}
-
-export default runJobdef;
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _jobSubmit from '../toolHelpers/_jobSubmit.js';
+
+function runJobdef(_appContext) {
+  // JSON object for LLM/tooling
+ 
+  let description = `
+run-jobdef — execute a SAS Viya job definition.
+
+USE when: run jobdef, execute jobdef, run with parameters
+DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro), list/find jobdefs
+
+PARAMETERS
+- name: string — jobdef name (required)
+- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
+
+ROUTING RULES
+- "run jobdef xyz" → { name: "xyz" }
+- "run jobdef xyz with param1=10, param2=val2" → { name: "xyz", scenario: {param1:10, param2:"val2"} }
+
+EXAMPLES
+- "run jobdef xyz" → { name: "xyz" }
+- "run jobdef monthly_report with month=10, year=2025" → { name: "monthly_report", scenario: {month:10, year:2025} }
+
+NEGATIVE EXAMPLES (do not route here)
+- "run SAS code" (use run-sas-program)
+- "run macro X" (use run-macro)
+- "list jobdefs" (use list-jobdefs)
+- "find jobdef X" (use find-jobdef)
+
+ERRORS
+Returns log output, listings, tables from jobdef. Error if jobdef not found.
+  `;
+ 
+  let spec = {
+    name: 'run-jobdef',
+    description: description,
+    inputSchema: z.object({
+      name: z.string(),
+      scenario: z.string().optional()
+    }),
+    handler: async (params) => {
+      let scenario = params.scenario;
+      let scenarioObj = {};
+      let count = 0;
+      // 
+      if (scenario == null) {
+        scenarioObj = {};
+      } else if (typeof scenario === 'object') {
+        scenarioObj = scenario;
+      } else if (Array.isArray(scenario)) {
+        scenarioObj = scenario[0];
+      } else if (typeof scenario === 'string') {
+        if (scenario.trim() === '') {
+          scenarioObj = {};
+        } 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.type = 'def';
+      params.scenario = scenarioObj;
+      // Provide runtime context for auth and server settings
+      let r = await _jobSubmit(params);
+      return r;
+    }
+  };
+  return spec;
+}
+
+export default runJobdef;
+

package/src/toolSet/runMacro.js

@@ -1,82 +1,82 @@
-/*
- * 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',
-    aliases: ['runMacro','run macro','run_macro'],
-    description: description,
-    
-     schema: {
-      macro: z.string(),
-      scenario: z.string()
-    },
-    required: ['macro'],
-    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 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;
+

package/src/toolSet/runProgram.js

@@ -41,21 +41,15 @@ Returns log, ods, tables array, data (if output specified). Error if execution f
   `;
 
   let spec = {
-    name: 'run-sas-program',
-    aliases: ['Program','run program'],
+    name: 'run-program',
     description: description,
-    schema: {
+    inputSchema: z.object({
       src: z.string(),
-      scenario: z.any().default(''),
-      output: z.string().default(''),
-      folder: z.string().default(''),
-      limit: z.number().default(100)
-    },
-  // NOTE: Previously 'required' incorrectly listed 'program' which does not
-  // exist in the schema. This prevented execution in some orchestrators that
-  // enforce required parameter presence, causing only descriptions to appear.
-  // Corrected to 'src'.
-  required: ['src'],
+      scenario: z.string().optional(),
+      output: z.string().optional(),
+      folder: z.string().optional(),
+      limit: z.number().optional()
+    }),
     handler: async (params) => {
       let {src, folder, scenario, _appContext} = params;
       // figure out src
@@ -96,3 +90,4 @@ Returns log, ods, tables array, data (if output specified). Error if execution f
 }
 
 export default runProgram;
+

package/src/toolSet/sasQuery.js

@@ -1,79 +1,77 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import {z} from 'zod';
-import _jobSubmit from '../toolHelpers/_jobSubmit.js';
-
-function sasQuery() {
- 
-    let description = `
-sas-query — convert natural language questions into SQL queries and execute them.
-
-USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
-DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-info), SAS programs (use run-sas-program), jobs/jobdefs
-
-PARAMETERS
-- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
-- query: string — natural language question (required)
-- sql: string — pre-generated SQL SELECT (optional, LLM generates)
-- job: string (default: 'program') — job name to execute
-
-ROUTING RULES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
-
-EXAMPLES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "read table cars" (use read-table)
-- "show 10 rows" (use read-table)
-- "table structure" (use table-info)
-- "run SAS code" (use run-sas-program)
-- "run job/macro" (use run-job/run-macro)
-
-ERRORS
-Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
-  `;
-
-
-    let spec = {
-        name: 'sas-query',
-        aliases: ['sasQuery','sas query','sas_query'],
-        description: description,
-        schema: {
-            query: z.string(),
-            table: z.string(),
-            sql: z.string().optional(),
-            job: z.string().default('program')
-        },
-        required: ['query', 'table'],
-        handler: async (params) => {
-            let {table,query, sql, job, _appContext} = params;
-            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
-            
-            let iparams = {
-                scenario: {
-                    table: table,
-                    prompt: query,
-                    sql: sqlinput
-                },
-                name: (job == null) ? 'program' : job,
-                type: 'job',
-                query: true,
-                _appContext: _appContext
-            };
-            if (sql == null || sql.trim().length === 0) {
-                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
-            }
-         
-            let r = await _jobSubmit(iparams);
-            return r;
-            
-           }
-        }
-    return spec;
-}
-export default sasQuery;
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {z} from 'zod';
+import _jobSubmit from '../toolHelpers/_jobSubmit.js';
+
+function sasQuery() {
+ 
+    let description = `
+sas-query — convert natural language questions into SQL queries and execute them.
+
+USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
+DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-info), SAS programs (use run-sas-program), jobs/jobdefs
+
+PARAMETERS
+- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
+- query: string — natural language question (required)
+- sql: string — pre-generated SQL SELECT (optional, LLM generates)
+- job: string (default: 'program') — job name to execute
+
+ROUTING RULES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
+
+EXAMPLES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "read table cars" (use read-table)
+- "show 10 rows" (use read-table)
+- "table structure" (use table-info)
+- "run SAS code" (use run-sas-program)
+- "run job/macro" (use run-job/run-macro)
+
+ERRORS
+Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
+  `;
+
+
+    let spec = {
+    name: 'sas-query',
+    description: description,
+        inputSchema: z.object({
+      query: z.string(),
+      table: z.string(),
+      sql: z.string().optional()
+    }),
+    handler: async (params) => {
+            let {table,query, sql, job, _appContext} = params;
+            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
+            
+            let iparams = {
+                scenario: {
+                    table: table,
+                    prompt: query,
+                    sql: sqlinput
+                },
+                name: (job == null) ? 'program' : job,
+                type: 'job',
+                query: true,
+                _appContext: _appContext
+            };
+            if (sql == null || sql.trim().length === 0) {
+                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
+            }
+         
+            let r = await _jobSubmit(iparams);
+            return r;
+            
+           }
+        }
+    return spec;
+}
+export default sasQuery;
+

package/src/toolSet/sasQueryTemplate.js

@@ -108,13 +108,12 @@ async function sasQueryTemplate(uparams) {
         name: toolname,
         description: description,
        
-        schema: {
+        inputSchema: z.object({
             query: z.string(),
             table: z.string().default(uTable),
-            sql: z.string().optional()
-        },
-        required: ['query', 'table'],
-        handler: async (params) => {
+            sql: z.string()
+        }),
+    handler: async (params) => {
             
           
             let { table, query, sql, _appContext} = params;

package/src/toolSet/sasQueryTemplate2.js

@@ -102,14 +102,13 @@ async function sasQueryTemplate2(uparams) {
         name: toolname,
         description: description,
        
-        schema: {
+        inputSchema: z.object({
             query: z.string(),
             table: z.string().default(uTable),
-            sql: z.string().optional(),
+            sql: z.string(),
           
-        },
-        required: ['query', 'table'],
-        handler: async (params) => {
+        }),
+    handler: async (params) => {
             
             let { table, query, sql } = params;
             let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');

package/src/toolSet/scrInfo.js

@@ -33,12 +33,10 @@ Examples
 
   let spec = {
     name: 'scr-info',
-    aliases: ['scrInfo','scr info','scr_info'],
     description: description,
-    schema: {
-      url: z.string(),
-    },
-    required: ['url'],
+    inputSchema: z.object({
+      url: z.string()
+    }),
     handler: async (params) => {
       let {url, _appContext} = params;
       if (url === null) {