@sassoftware/sas-score-mcp-serverjs 0.4.1-1 → 0.4.1-5

package/src/toolSet/runJob.js

@@ -1,81 +1,81 @@
-/*
- * 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 runJob(_appContext) {
- 
-  let description = `
-run-job — execute a deployed SAS Viya job.
-
-USE when: run job, execute job, run with parameters
-DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro), list/find jobs
-
-PARAMETERS
-- name: string — job name (required)
-- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
-
-ROUTING RULES
-- "run job xyz" → { name: "xyz" }
-- "run job xyz with param1=10, param2=val2" → { name: "xyz", scenario: {param1:10, param2:"val2"} }
-
-EXAMPLES
-- "run job xyz" → { name: "xyz" }
-- "run job monthly_etl with month=10, year=2025" → { name: "monthly_etl", 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 jobs" (use list-jobs)
-- "find job X" (use find-job)
-
-ERRORS
-Returns log output, listings, tables from job. Error if job not found.
-`;
-
-  let spec = {
-    name: 'run-job',
-    description: description,
-    inputSchema: z.object({
-      name: z.string(),
-      scenario: z.any(),
-    }),
-    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 = 'job';
-      params.scenario = scenarioObj;
-      // Provide runtime context for auth and server settings
-      let r = await _jobSubmit(params);
-      return r;
-    }
-  };
-  return spec;
-}
-
-export default runJob;
-
+/*
+ * 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 runJob(_appContext) {
+ 
+  let description = `
+run-job — execute a deployed SAS Viya job.
+
+USE when: run job, execute job, run with parameters
+DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro), list/find jobs
+
+PARAMETERS
+- name: string — job name (required)
+- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
+
+ROUTING RULES
+- "run job xyz" → { name: "xyz" }
+- "run job xyz with param1=10, param2=val2" → { name: "xyz", scenario: {param1:10, param2:"val2"} }
+
+EXAMPLES
+- "run job xyz" → { name: "xyz" }
+- "run job monthly_etl with month=10, year=2025" → { name: "monthly_etl", 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 jobs" (use list-jobs)
+- "find job X" (use find-job)
+
+ERRORS
+Returns log output, listings, tables from job. Error if job not found.
+`;
+
+  let spec = {
+    name: 'run-job',
+    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 = 'job';
+      params.scenario = scenarioObj;
+      // Provide runtime context for auth and server settings
+      let r = await _jobSubmit(params);
+      return r;
+    }
+  };
+  return spec;
+}
+
+export default runJob;
+

package/src/toolSet/runJobdef.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 _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.any()
-    }),
-    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,81 +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',
-    description: description,
-    
-     inputSchema: z.object({
-      macro: z.string(),
-      scenario: z.string()
-    }),
-    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

@@ -45,15 +45,11 @@ Returns log, ods, tables array, data (if output specified). Error if execution f
     description: description,
     inputSchema: z.object({
       src: z.string(),
-      scenario: z.any(),
-      output: z.string(),
-      folder: z.string(),
-      limit: z.number()
+      scenario: z.string().optional(),
+      output: z.string().optional(),
+      folder: z.string().optional(),
+      limit: z.number().optional()
     }),
-  // 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'.
     handler: async (params) => {
       let {src, folder, scenario, _appContext} = params;
       // figure out src