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

package/src/toolHelpers/_submitCasl.js

@@ -2,33 +2,35 @@
  * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import restaf from '@sassoftware/restaf';
 import restaflib from '@sassoftware/restaflib';
 
 async function _submitCasl(params) {
   let { src, args, _appContext } = params;
+  let { casSetup, caslRun } = restaflib;
+  console.error(_appContext);
+  let store = restaf.initStore(_appContext.storeConfig);
 
-   let store = restaf.initStore(_appContext.storeConfig);
-  
-  let session = await restaflib.casSetup(store, _appContext.logonPayload, null, _appContext.cas);
+  let { session } = await casSetup(store, _appContext.logonPayload, null, _appContext.cas);
   if (session == null) {
-    return {content: [{ type: 'text', text: 'Could not create a cas session' }]};
+    return { content: [{ type: 'text', text: 'Could not create a cas session' }] };
   }
 
   try {
-    try {
-      let r = await caslRun(store, session, src, (args == null) ? {} : args, true);
-      await store.apiCall( session.links( 'delete' ) );
-    
-      return {content: [{ type: 'text', text: JSON.stringify(r.items()) }], structuredContent: r.items() };
-    } catch (err) {
-      console.error(err);
-      return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] }; 
-    }
-  }
-  catch (err) {
+    console.error(caslRun);
+    debugger;
+    let r = await caslRun(store, session, src, (args == null) ? {} : args);
+    console.error(r.results);
+    let response = (r.results == null) ? r : r.results; 
+    await store.apiCall(session.links('delete'));
+    return { content: [{ type: 'text', text: JSON.stringify(response) }], structuredContent: response };
+  } catch (err) {
     console.error(err);
-    await store.apiCall( session.links( 'delete' ) );
-    return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] }; 
+    if (session != null) {
+      await store.apiCall(session.links('delete'));
+    } 
+    return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] };
   }
 }
+
 export default _submitCasl;

package/src/toolHelpers/{_tableInfo.js → _tableDescribe.js}

@@ -5,7 +5,7 @@
 import restafedit from '@sassoftware/restafedit';
 import deleteSession from './deleteSession.js';
 
-async function _tableInfo(params) {
+async function _tableDescribe(params) {
   let { table, lib, server, _appContext } = params;
   
 
@@ -69,4 +69,4 @@ async function _tableInfo(params) {
     return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] };
   }
 }
-export default _tableInfo;
+export default _tableDescribe;

package/src/toolHelpers/getLogonPayload.js

@@ -58,7 +58,7 @@ async function igetLogonPayload(_appContext) {
 
   // Use user supplied refresh token-
   if (_appContext.AUTHFLOW === "refresh") {
-    console.error("[Note] Using user supplied refresh token", _appContext.REFRESH_TOKEN); 
+    console.error("[Note] Using user supplied refresh token", _appContext.REFRESH_TOKEN.substring(0,20) + "..."); 
     let token = await refreshToken(_appContext,{token: _appContext.REFRESH_TOKEN, host: _appContext.VIYA_SERVER});
     let logonPayload = {
       host: _appContext.VIYA_SERVER,
@@ -71,7 +71,7 @@ async function igetLogonPayload(_appContext) {
   }
   
   if (_appContext.AUTHFLOW === "token") {
-    console.error("[Note] Using token supplied by user");
+    console.error("[Note] Using token supplied by user");  
     let logonPayload = {
       host: _appContext.VIYA_SERVER,
       authType: "server",

package/src/toolSet/casModelScore.js

@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _casScore from '../toolHelpers/_casScore.js';
+
+function casModelScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+  let description = isAgent ? `
+cas-model-score — score with a model persisted as a CAS table in a CAS server.
+PARAMS:  name(string, required), model(string, optional),scenario (string|object, optional)
+RETURNS: returns the score for the specified scenario
+Notes: name is specified as a.b.cas where a is the library, b is the CAS table name, and .cas is the suffix. Model parameter is optional and can be used to specify a different model name if it is not the same as the table name.
+` : `
+cas-model-score — execute a CAS model on SAS Viya  cas server.
+
+USE when:  score cas model with scenario
+DO NOT USE for: macros (use ${_appContext.brand}-macro-score), SAS code (use ${_appContext.brand}-program-score), jobs (use ${_appContext.brand}-job-score), jobdefs (use ${_appContext.brand}-jobdef-score), scr(use ${_appContext.brand}-scr-score)
+
+PARAMETERS
+
+- name: string (optional) — CAS model table to use for scoring
+- model: string (optional) — name of the model to use for scoring, if different from the table name
+- scenario: string or object (optional) — input parameters
+
+
+ROUTING RULES
+- "score "mymodel.abc.cas" with scenario "x=1, y=2" → { name: "mymodel.abc", scenario: "x=1, y=2" }
+ 
+
+EXAMPLES
+- "score "mymodel.abc.cas" with scenario "x=1, y=2" → { name: "mymodel.abc", scenario: "x=1, y=2" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "score sas macro" (use ${_appContext.brand}-macro-score)
+- "submit sas code" (use ${_appContext.brand}-program-score)
+- "score job X" (use ${_appContext.brand}-job-score)
+- "score jobdef X" (use ${_appContext.brand}-jobdef-score)
+- "score scr X" (use ${_appContext.brand}-scr-score)
+
+
+
+
+RESPONSE
+Log output and CAS results. If output table is specified, that table's rows up to the limit.
+`;
+
+  let spec = {
+    name: 'cas-model-score',
+    description: description,
+    inputSchema: z.object({
+      scenario: z.any().optional(),
+      model: z.string().optional(),
+      name: z.string()
+    }),
+    handler: async (params) => {
+      let {name, model, scenario, _appContext} = params;
+      // figure out src
+  
+
+      // Convert the scenario string to an object
+      // Example: "x=1, y=2, z=3" to { x: 1, y: 2, z: 3 }
+      let scenarioObj = {};
+      if (typeof scenario === 'object' && scenario !== null) {
+        scenarioObj = scenario;
+      } else if (Array.isArray(scenario)) {
+        scenarioObj = scenario[0];
+      } else if (typeof scenario === 'string' && scenario.includes('=')) {
+        scenarioObj = scenario.split(',').reduce((acc, pair) => {
+          let [key, value] = pair.split('=');
+          acc[key.trim()] = value;
+          return acc;
+        }, {});
+      }
+      params.scenario = scenarioObj;
+
+      let iparms = {
+        args: scenarioObj,
+        model: params.model,
+        name: params.name,
+        _appContext: _appContext
+      }
+      let r =  await _casScore(iparms); 
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default casModelScore;

package/src/toolSet/casProgramScore.js

@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _submitCasl from '../toolHelpers/_submitCasl.js';
+import _casScore from '../toolHelpers/_casScore.js';
+
+function casProgramScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+  let description = isAgent ? `
+cas-program-score — execute a CAS program src code or score a persisted CAS model on SAS Viya server.
+PARAMS: src (string, required), model(string,optional), name(string, optional),scenario (string|object, optional), output (string, optional), limit (number, optional)
+RETURNS: log output and CAS results, optional output table rows
+` : `
+cas-program-score — execute a CAS program model on SAS Viya server.
+
+USE when: score cas program, run cas program,  submit CASL, score cas model with scenario
+DO NOT USE for: macros (use ${_appContext.brand}-macro-score), SAS code (use ${_appContext.brand}-program-score), jobs (use ${_appContext.brand}-job-score), jobdefs (use ${_appContext.brand}-jobdef-score), scr(use ${_appContext.brand}-scr-score)
+
+PARAMETERS
+- src: string (required) — CAS program or CASL code to execute verbatim
+- casmodel: string (optional) — CAS model table to use for scoring
+- name: string (optional) — name of the model to use for scoring, if different from the table name
+- scenario: string or object (optional) — input parameters
+- output: string — table name to return in response
+- limit: number (default: 100) — max rows to return
+
+**NOTE** if both src and casmodel are specified, the casmodel will take precedence
+ROUTING RULES
+- "run cas program "action echo" → { src: "action echo" }
+- "execute cas "action simple.summary" with table=a.b → { src: "action simple.summary",scenario: {
+table: "a.b"} }
+- "score casmodel "mymodel.abc" with scenario "x=1, y=2" → { casmodel: "mymodel.abc", scenario: "x=1, y=2" }
+ 
+
+EXAMPLES
+- "run cas program "action echo" → { src: "action echo" }
+- "score casmodel "mymodel.abc" with scenario "x=1, y=2" → { casmodel: "mymodel.abc", scenario: "x=1, y=2" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "score sas macro" (use ${_appContext.brand}-macro-score)
+- "submit sas code" (use ${_appContext.brand}-program-score)
+- "score job X" (use ${_appContext.brand}-job-score)
+- "score jobdef X" (use ${_appContext.brand}-jobdef-score)
+- "score scr X" (use ${_appContext.brand}-scr-score)
+
+NOTES
+Sends src verbatim without validation. Use parameter scenario to pass arguments. For arbitrary SAS code use ${_appContext.brand}-program-score.
+
+RESPONSE
+Log output and CAS results. If output table is specified, that table's rows up to the limit.
+`;
+
+  let spec = {
+    name: 'cas-program-score',
+    description: description,
+    inputSchema: z.object({
+      src: z.string(),
+      scenario: z.any().optional(),
+      output: z.string().optional(),
+      casmodel: z.string().optional(),
+      name: z.string().optional(),  
+      limit: z.number().optional()
+    }),
+    handler: async (params) => {
+      let {src, scenario, _appContext} = params;
+      // figure out src
+      let isrc = src;
+
+      // Convert the scenario string to an object
+      // Example: "x=1, y=2, z=3" to { x: 1, y: 2, z: 3 }
+      let scenarioObj = {};
+      if (typeof scenario === 'object' && scenario !== null) {
+        scenarioObj = scenario;
+      } else if (Array.isArray(scenario)) {
+        scenarioObj = scenario[0];
+      } else if (typeof scenario === 'string' && scenario.includes('=')) {
+        scenarioObj = scenario.split(',').reduce((acc, pair) => {
+          let [key, value] = pair.split('=');
+          acc[key.trim()] = value;
+          return acc;
+        }, {});
+      }
+      params.scenario = scenarioObj;
+
+      let iparms = {
+        args: scenarioObj,
+        output: params.output,
+        limit: params.limit,
+        src: isrc,
+        model: params.casmodel,
+        name: params.name,
+        _appContext: _appContext
+      }
+      let r = (params.casmodel == null) ? await _submitCasl(iparms) : await _casScore(iparms);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default casProgramScore;

package/src/toolSet/devaScore.js

@@ -5,12 +5,17 @@
 import { z } from 'zod';
 
 function devaScore(_appContext) {
-
-    let description = `
+  const isAgent = _appContext && _appContext.agent;
+let brand = _appContext.brand + '-';
+    let description = isAgent ? `
+deva-score — run a demonstration scoring calculation.
+PARAMS: a (number, required), b (number, required)
+RETURNS: computed result for a and b
+` : `
 deva-score — compute a numeric score based on two input values.
 
 USE when: calculate deva score, score these values, compute score for numbers
-DO NOT USE for: model scoring (use model-score), statistical calculations, data lookup
+DO NOT USE for: model scoring (use ${brand}model-score), statistical calculations, data lookup
 
 PARAMETERS
 - a: number (required) — first input value
@@ -30,9 +35,9 @@ EXAMPLES
 - "Deva score 20 and 30" → { a: 20, b: 30 } returns 2100
 
 NEGATIVE EXAMPLES (do not route here)
-- "Score this customer with credit model" (use model-score)
-- "Calculate the mean of these values" (use run-sas-program or sas-query)
-- "Statistical analysis of numbers" (use sas-query)
+- "Score this customer with credit model" (use ${brand}model-score)
+- "Calculate the mean of these values" (use ${brand}program-score or ${brand}sas-query)
+- "Statistical analysis of numbers" (use ${brand}sas-query)
 
 RESPONSE
 Returns { score: (a + b) * 42 }

package/src/toolSet/findJob.js

@@ -1,59 +1,74 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { z } from 'zod';
-import _listJobs from '../toolHelpers/_listJobs.js';
-function findJob(_appContext) {
-  
-  let description = `
-find-job — locate a specific SAS Viya job.
-
-USE when: find job, does job exist, is there a job named, lookup job, verify job exists
-DO NOT USE for: list jobs (use list-jobs), run job (use run-job), execute jobdef (use run-jobdef), find lib/table/model (use respective tools)
-
-PARAMETERS
-- name: string (required) — job name to locate; if multiple supplied, use first
-
-ROUTING RULES
-- "find job <name>" → { name: "<name>" }
-- "does job <name> exist" → { name: "<name>" }
-- "is there a job named <name>" → { name: "<name>" }
-- "lookup/verify job <name>" → { name: "<name>" }
-- "find job" with no name → ask "Which job name would you like to find?"
-- "find all jobs / list jobs" → use list-jobs instead
-- "run job <name>" → use run-job instead
-
-EXAMPLES
-- "find job cars_job_v4" → { name: "cars_job_v4" }
-- "does job ETL exist" → { name: "ETL" }
-- "is there a job named metricsRefresh" → { name: "metricsRefresh" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "list jobs" (use list-jobs)
-- "run job cars_job_v4" (use run-job)
-- "execute jobdef cars_job_v4" (use run-jobdef)
-
-ERRORS
-Returns { jobs: [] } if not found; { jobs: [name, ...] } if found. Never hallucinate job names.
-  `;
-
-  let spec = {
-    name: 'find-job',
-    description: description,
-    inputSchema: z.object({
-      name: z.string()
-    }),
-    handler: async (params) => {
-      let r = await _listJobs(params);
-      return r;
-    }
-  }
-    
-
-  /* correct spec for registerTool with inputSchema */
-  
-  return spec;
-}
-export default findJob;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import _listJobs from '../toolHelpers/_listJobs.js';
+import _findJob from '../toolHelpers/_findJob.js';
+function findJob(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+find-job — verify a Job model exists.
+PARAMS: name (string, required)
+RETURNS: job metadata if found, error if not found
+` : `
+find-job — locate a specific SAS Viya job.
+
+USE when: find job, does job exist, is there a job named, lookup job, verify job exists
+DO NOT USE for: list jobs (use ${_appContext.brand}-list-jobs), score job (use ${_appContext.brand}-job-score), score jobdef (use ${_appContext.brand}-jobdef-score), find lib/table/model (use respective tools)
+
+PARAMETERS
+- name: string (required) — job name to locate; if multiple supplied, use first
+
+Naming Rules: 
+- If user provides name with "job" suffix ".job", strip the suffix (e.g., "cars_job_v4.job"), and look for "cars_job_v4".
+
+ROUTING RULES
+- "find job <name>" → { name: "<name>" }
+- "find name.job" → { name: "<name>" } 
+- "does job <name> exist" → { name: "<name>" }
+- "is there a job named <name>" → { name: "<name>" }
+- "lookup/verify job <name>" → { name: "<name>" }
+- "find job" with no name → ask "Which job name would you like to find?"
+- "find all jobs / list jobs" → use ${_appContext.brand}-list-jobs instead
+- "score job <name>" → use ${_appContext.brand}-job-score instead
+
+EXAMPLES
+- "find job cars_job_v4" → { name: "cars_job_v4" }
+- "does job ETL exist" → { name: "ETL" }
+- "is there a job named metricsRefresh" → { name: "metricsRefresh" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "list jobs" (use ${_appContext.brand}-list-jobs)
+- "score job cars_job_v4" (use ${_appContext.brand}-job-score)
+- "score jobdef cars_job_v4" (use ${_appContext.brand}-jobdef-score)
+
+ERRORS
+Returns { jobs: [] } if not found; { jobs: [name, ...] } if found. Never hallucinate job names.
+  `;
+
+  let spec = {
+    name: 'find-job',
+    description: description,
+    inputSchema: z.object({
+      name: z.string()
+    }),
+    handler: async (params) => {
+      if (params.name != null) {
+        if (params.name.endsWith('.job'))   {
+          params.name = params.name.slice(0, -4);
+        }
+      }
+      params.tool = 'find';
+      let r = await _findJob(params);
+      return r;
+    }
+  }
+    
+
+  /* correct spec for registerTool with inputSchema */
+  
+  return spec;
+}
+export default findJob;
+

package/src/toolSet/findJobdef.js

@@ -1,64 +1,67 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { z } from 'zod';
-import _listJobdefs from '../toolHelpers/_listJobdefs.js';
-function findJobdef(_appContext) {
-  let llmDescription= {
-  "purpose": "Map natural language requests to find a jobdef (job definition) in SAS Viya and return structured results.",
-  "param_mapping": {
-    "name": "required - single name. If missing, ask 'Which jobdef name would you like to find?'.",
-
-  },
-  "response_schema": "{ jobs: Array<string|object> }",
-  "behavior": "Return only JSON matching response_schema when invoked by an LLM. If no matches, return { jobs: [] }"
-};
-  let description = `
-find-jobdef — locate a specific SAS Viya job definition.
-
-USE when: find jobdef, does jobdef exist, is there a jobdef named, lookup jobdef, verify jobdef exists
-DO NOT USE for: list jobdefs (use list-jobdefs), run jobdef (use run-jobdef), find job/lib/table/model (use respective tools)
-
-PARAMETERS
-- name: string (required) — jobdef name to locate; if multiple supplied, use first
-
-ROUTING RULES
-- "find jobdef <name>" → { name: "<name>" }
-- "does jobdef <name> exist" → { name: "<name>" }
-- "is there a jobdef named <name>" → { name: "<name>" }
-- "lookup/verify jobdef <name>" → { name: "<name>" }
-- "find jobdef" with no name → ask "Which jobdef name would you like to find?"
-- "find all jobdefs / list jobdefs" → use list-jobdefs instead
-- "run jobdef <name>" → use run-jobdef instead
-
-EXAMPLES
-- "find jobdef cars_job_v4" → { name: "cars_job_v4" }
-- "does jobdef ETL exist" → { name: "ETL" }
-- "is there a jobdef named metricsRefresh" → { name: "metricsRefresh" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "list jobdefs" (use list-jobdefs)
-- "run jobdef cars_job_v4" (use run-jobdef)
-- "find job ETL" (use find-job)
-- "find table cars" (use find-table)
-
-ERRORS
-Returns { jobdefs: [] } if not found; { jobdefs: [name, ...] } if found. Never hallucinate jobdef names.
-  `;
-
-  let spec = {
-    name: 'find-jobdef',
-    description: description,
-    inputSchema: z.object({
-        name: z.string()
-    }),
-    handler: async (params) => {
-      let r = await _listJobdefs(params);
-      return r;
-    }
-  }
-  return spec;
-}
-export default findJobdef;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import _findJobdef from '../toolHelpers/_findJobdef.js';
+function findJobdef(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+find-jobdef — verify a JobDef model exists.
+PARAMS: name (string, required)
+RETURNS: jobdef metadata if found, error if not found
+` : `
+find-jobdef — locate a specific SAS Viya job definition.
+
+USE when: find jobdef, does jobdef exist, is there a jobdef named, lookup jobdef, verify jobdef exists
+DO NOT USE for: list jobdefs (use ${_appContext.brand}-list-jobdefs), score jobdef (use ${_appContext.brand}-jobdef-score), find job/lib/table/model (use respective tools)
+
+PARAMETERS
+- name: string (required) — jobdef name to locate; if multiple supplied, use first
+
+ROUTING RULES
+- "find jobdef <name>" → { name: "<name>" }
+- "find name.jobdef" → { name: "<name>" }
+- "does jobdef <name> exist" → { name: "<name>" }
+- "is there a jobdef named <name>" → { name: "<name>" }
+- "lookup/verify jobdef <name>" → { name: "<name>" }
+- "find jobdef" with no name → ask "Which jobdef name would you like to find?"
+- "find all jobdefs / list jobdefs" → use ${_appContext.brand}-list-jobdefs instead
+- "score jobdef <name>" → use ${_appContext.brand}-jobdef-score instead
+
+EXAMPLES
+- "find jobdef cars_job_v4" → { name: "cars_job_v4" }
+- "does jobdef ETL exist" → { name: "ETL" }
+- "is there a jobdef named metricsRefresh" → { name: "metricsRefresh" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "list jobdefs" (use ${_appContext.brand}-list-jobdefs)
+- "score jobdef cars_job_v4" (use ${_appContext.brand}-jobdef-score)
+- "find job ETL" (use ${_appContext.brand}-find-job)
+- "find table cars" (use ${_appContext.brand}-find-table)
+
+ERRORS
+Returns { jobdefs: [] } if not found; { jobdefs: [name, ...] } if found. Never hallucinate jobdef names.
+  `;
+
+  let spec = {
+    name: 'find-jobdef',
+    description: description,
+    inputSchema: z.object({
+        name: z.string()
+    }),
+    handler: async (params) => {
+      if (params.name != null) {
+        if (params.name.endsWith('.jobdef'))   {
+          params.name = params.name.slice(0, -7);
+        }
+      }
+      params.tool = 'find';
+      let r = await _findJobdef(params);
+      return r;
+    }
+  }
+  return spec;
+}
+export default findJobdef;
+