@sassoftware/sas-score-mcp-serverjs 1.0.1-12 → 1.0.1-13

package/.skills/sas-find-resource-strategy/SKILL.md

@@ -2,7 +2,8 @@
 name: sas-find-resource-strategy
 description: >
   Unified strategy for finding SAS Viya resources using find tools only. Supports library, table,
-  model, job, and jobdef lookup with server-aware behavior for CAS/SAS resources. Use this skill
+  mas, job, and jobdef lookup with server-aware behavior for CAS/SAS resources. Treat the generic
+  term "model" as an alias that may refer to mas, job, or jobdef resources. Use this skill
   whenever the task is to verify whether a resource exists.
 ---
 
@@ -15,10 +16,16 @@ Use this skill to verify resource existence without using list tools.
 Supported resource types:
 - library
 - table
-- model
+- mas
 - job
 - jobdef
 
+Generic model aliases:
+- `model` with no type defaults to `mas`
+- `model mas` or `mas model` -> `mas`
+- `model job` or `job model` -> `job`
+- `model jobdef` or `jobdef model` -> `jobdef`
+
 ## Mandatory rule
 
 - Use the sas-find-resource strategy to check for the existence of a resource before attempting to read or use it. This ensures that follow-up actions are based on accurate information about resource availability.
@@ -28,7 +35,7 @@ Supported resource types:
 
 - Library -> `sas-score-find-library`
 - Table -> `sas-score-find-table`
-- Model -> `sas-score-find-model`
+- MAS -> `sas-score-find-model`
 - Job -> `sas-score-find-job`
 - Jobdef -> `sas-score-find-jobdef`
 
@@ -60,14 +67,23 @@ If server is not provided:
 2. If not found, check SAS (uppercase library) - `sas-score-find-table({ lib: "<LIB>", name: "<table>", server: "sas" })`
 3. If found in both, report both and ask user which server to use for follow-up reads.
 
-### Find model
+### Find models by type
 
-Use:
-- `sas-score-find-model({ name: "<model>" })`
+Support requests in either form:
+- `find model <name>`
+- `find model <type> <name>`
+- `find <type> model <name>`
+
+Type routing rules:
+- If type is omitted, assume `mas`
+- `mas` -> use `sas-score-find-model({ name: "<name>" })`
+- `job` -> use `sas-score-find-job({ name: "<name>" })`
+- `jobdef` -> use `sas-score-find-jobdef({ name: "<name>" })`
 
 If a model type suffix is provided (for example `.mas`, `.job`, `.jobdef`, `.scr`):
 - For MAS model discovery, strip suffix and look up base name with `sas-score-find-model`.
-- For `.job` and `.jobdef`, use job and jobdef find tools instead of model find.
+- For `.job` and `.jobdef`, use job and jobdef find tools instead of MAS find.
+- For `.scr`, do not use this strategy; route to SCR-specific model handling.
 
 ### Find job
 
@@ -84,7 +100,7 @@ Use:
 Ask one focused question if required fields are missing:
 - Library missing for table lookup: "Which library contains the table?"
 - Table name missing: "Which table name should I check?"
-- Resource type ambiguous: "Do you want me to find a library, table, model, job, or jobdef?"
+- Resource type ambiguous: "Do you want me to find a library, table, mas, job, or jobdef resource?"
 
 ## Output format
 
@@ -101,5 +117,10 @@ For not found resources:
 - "find library Samples" -> CAS first, then SAS fallback using uppercase.
 - "find table costchange in Samples" -> CAS first, then SAS fallback using uppercase library.
 - "find model breastcancer" -> `sas-score-find-model`.
+- "find model mas breastcancer" -> `sas-score-find-model`.
+- "find mas model breastcancer" -> `sas-score-find-model`.
+- "find model job simplejob" -> `sas-score-find-job`.
+- "find job model simplejob" -> `sas-score-find-job`.
+- "find model jobdef daily_run" -> `sas-score-find-jobdef`.
 - "find job simplejob" -> `sas-score-find-job`.
 - "find jobdef daily_run" -> `sas-score-find-jobdef`.

package/.skills/sas-list-resource-strategy/SKILL.md

@@ -2,7 +2,8 @@
 name: sas-list-resource-strategy
 description: >
   Unified strategy for listing SAS Viya resources using list tools. Supports libraries,
-  tables, models, jobs, and jobdefs. Always normalize pagination so start and limit are
+  tables, mas resources, jobs, and jobdefs. Treat the generic term "model" as an alias that may
+  refer to mas, job, or jobdef resources. Always normalize pagination so start and limit are
   never null: default start=1 and limit=10 when not provided.
 ---
 
@@ -15,10 +16,17 @@ Use this skill to list resources with consistent pagination defaults.
 Supported resource types:
 - library
 - table
-- model
+- mas
 - job
 - jobdef
 
+Generic model aliases:
+- `model` with no type defaults to `mas`
+- `model mas` or `mas model` -> `mas`
+- `model job` or `job model` -> `job`
+- `model jobdef` or `jobdef model` -> `jobdef`
+
+
 ## Mandatory pagination rule
 
 For every list operation:
@@ -37,7 +45,7 @@ limit = (limit == null) ? 10 : limit
 
 - Library -> `sas-score-list-libraries`
 - Table -> `sas-score-list-table`
-- Model -> `sas-score-list-models`
+- MAS -> `sas-score-list-models`
 - Job -> `sas-score-list-jobs`
 - Jobdef -> `sas-score-list-jobdefs`
 
@@ -75,7 +83,19 @@ If `lib` is missing, ask: "Which library should I list tables from?"
 
 ### List models
 
-Use:
+Support requests in either form:
+- `list model`
+- `list models`
+- `list model <type>`
+- `list <type> model`
+
+Type routing rules:
+- If type is omitted, assume `mas`
+- `mas` -> use `sas-score-list-models`
+- `job` -> use `sas-score-list-jobs`
+- `jobdef` -> use `sas-score-list-jobdefs`
+
+Use for `mas`:
 ```
 sas-score-list-models({
   start: 1,
@@ -83,6 +103,22 @@ sas-score-list-models({
 })
 ```
 
+Use for `job`:
+```
+sas-score-list-jobs({
+  start: 1,
+  limit: 10
+})
+```
+
+Use for `jobdef`:
+```
+sas-score-list-jobdefs({
+  start: 1,
+  limit: 10
+})
+```
+
 ### List jobs
 
 Use:
@@ -106,7 +142,7 @@ sas-score-list-jobdefs({
 ## Clarifying prompts
 
 Ask one focused question if required context is missing:
-- Resource type unclear: "Do you want libraries, tables, models, jobs, or jobdefs?"
+- Resource type unclear: "Do you want libraries, tables, mas resources, jobs, or jobdefs?"
 - Listing tables without library: "Which library should I list tables from?"
 
 ## Output and paging
@@ -118,7 +154,14 @@ Ask one focused question if required context is missing:
 ## Examples
 
 - "list jobs" -> `sas-score-list-jobs({ start: 1, limit: 10 })`
+- "list model" -> `sas-score-list-models({ start: 1, limit: 10 })`
 - "list models" -> `sas-score-list-models({ start: 1, limit: 10 })`
+- "list model mas" -> `sas-score-list-models({ start: 1, limit: 10 })`
+- "list mas model" -> `sas-score-list-models({ start: 1, limit: 10 })`
+- "list model job" -> `sas-score-list-jobs({ start: 1, limit: 10 })`
+- "list job model" -> `sas-score-list-jobs({ start: 1, limit: 10 })`
+- "list model jobdef" -> `sas-score-list-jobdefs({ start: 1, limit: 10 })`
+- "list jobdef model" -> `sas-score-list-jobdefs({ start: 1, limit: 10 })`
 - "list jobdefs" -> `sas-score-list-jobdefs({ start: 1, limit: 10 })`
 - "list tables in Public" -> `sas-score-list-tables({ lib: "Public", start: 1, limit: 10 })`
 - "next jobs" after `{ start: 1, limit: 10 }` -> `sas-score-list-jobs({ start: 11, limit: 10 })`

package/.skills/sas-read-strategy/SKILL.md

@@ -49,6 +49,7 @@ Ask yourself: does the user already have the data in hand?
 - Simple WHERE filtering (e.g., "where status = 'active'")
 - Pagination needed ("first 50 rows", "next 10 rows")
 
+
 **How:**
 ```
 sas-score-read-table({

package/.skills/sas-request-classifier/SKILL.md

@@ -10,6 +10,7 @@ Use this skill to determine what kind of SAS object, workflow, or environment th
 ## When to use
 Use this skill when the request contains ambiguous domain terms such as:
 - model
+- mas
 - score
 - scoring
 - read
@@ -29,8 +30,8 @@ Map the user request to the most likely SAS domain and hand off to the correct d
 
 ## Classification targets
 Classify the request into one or more of these categories:
-- Resource existence lookup (library/table/model/job/jobdef) -> Route to **sas-find-resource-strategy**
-- Resource listing (library/table/model/job/jobdef) -> Route to **sas-list-resource-strategy**
+- Resource existence lookup (library/table/mas/job/jobdef, with generic "model" phrasing allowed) -> Route to **sas-find-resource-strategy**
+- Resource listing (library/table/mas/job/jobdef, with generic "model" phrasing allowed) -> Route to **sas-list-resource-strategy**
 - Reading or querying tables → Route to **sas-read-strategy**
 - CAS resource, SAS resource, caslib, or table discovery → Route to **sas-find-library-smart** 
 - SAS data, libref, or table discovery → Route to **sas-find-library-smart** 
@@ -47,8 +48,8 @@ Classify the request into one or more of these categories:
 3. Decide the most likely SAS domain and matching skill.
 4. If confidence is low, ask one focused clarifying question.
 5. If confidence is high, load and use the relevant skill:
-   - **sas-find-resource-strategy** — Unified find-only strategy for library/table/model/job/jobdef
-   - **sas-list-resource-strategy** — Unified list strategy for library/table/model/job/jobdef with non-null pagination defaults
+   - **sas-find-resource-strategy** — Unified find-only strategy for library/table/mas/job/jobdef, where "model" may mean mas, job, or jobdef
+   - **sas-list-resource-strategy** — Unified list strategy for library/table/mas/job/jobdef, where "model" may mean mas, job, or jobdef, with non-null pagination defaults
    - **sas-find-library-smart** — Find CAS or SAS libraries
    - **sas-list-tables-smart** — Browse tables in a library
    - **sas-read-strategy** — Choose read-table vs. sas-query for data retrieval
@@ -58,7 +59,7 @@ Classify the request into one or more of these categories:
 
 ## Disambiguation hints
 - "Run" often implies job execution, but may also mean scoring or model invocation. Check for "score" or "model" context.
-- "Model" may refer to MAS models, SAS jobs, jobdefs, or SCR models. Look for context or type suffix (e.g., `.job`, `.mas`, `.scr`).
+- "Model" is a generic term that may refer to MAS, job, or jobdef resources in find/list requests. Prefer explicit patterns like `model <type>` or `<type> model`; default bare "model" to MAS unless the surrounding request implies job or jobdef.
 - "Score" may refer to model scoring or job execution. Look for model name or context.
 - "Table" usually suggests CAS or SAS but confirm library name and server context.
 - "Find" — resource lookup. Route to sas-find-resource-strategy.

package/.skills/sas-score-workflow-strategy/SKILL.md

@@ -22,6 +22,7 @@ Users can invoke scoring with a unified syntax that automatically routes to the
 ```
 score with model <name>.<type> [scenario =<key=value pairs>]
 score <name>.<type> [scenario =<key=value pairs>]
+score key=value,... with model <name>.<type>  
 ```
 
 **Type determines the routing:**

package/cli.js

@@ -9,8 +9,6 @@
 
 import coreSSE from './src/coreSSE.js';
 import expressMcpServer from './src/expressMcpServer.js';
-import hapiMcpServer from './src/hapiMcpServer.js';
-
 import createMcpServer from './src/createMcpServer.js';
 // import dotenvExpand from 'dotenv-expand';
 import fs from 'fs';
@@ -468,14 +466,8 @@ if (mcpType === 'stdio') {
 
 } else {
   console.error('[Note] Starting HTTP MCP server...');
-  if (useHapi === true) {
-    process.env.AUTHTYPE = null;
-    await hapiMcpServer(mcpServer, sessionCache, appEnvBase);
-    console.error('[Note] Using HAPI HTTP server...')
-  } else {
-    await expressMcpServer(mcpServer, sessionCache, appEnvBase);
-    console.error('[Note] MCP HTTP express server started on port ' + appEnvBase.PORT);
-  }
+  await expressMcpServer(mcpServer, sessionCache, appEnvBase);
+  console.error('[Note] MCP HTTP express server started on port ' + appEnvBase.PORT);
 }
 
 // custom reader for .env file to avoid dotenv logging to console

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/sas-score-mcp-serverjs",
-  "version": "1.0.1-12",
+  "version": "1.0.1-13",
   "description": "A mcp server for SAS Viya",
   "author": "Deva Kumar <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -51,8 +51,7 @@
     "@sassoftware/restaf": "^5.7.2",
     "@sassoftware/restafedit": "^3.10.5",
     "@sassoftware/restaflib": "^5.7.2",
-    "@sassoftware/viya-serverjs": "^0.6.3-0",
-    "axios": "^1.13.2",
+    "axios": "^1.13.5",
     "body-parser": "^2.2.1",
     "cors": "^2.8.5",
     "cross-env": "^10.1.0",
@@ -64,8 +63,8 @@
     "node-cache": "^5.1.2",
     "open": "^11.0.0",
     "selfsigned": "^5.2.0",
-    "undici": "^7.16.0",
-    "uuid": "^13.0.0",
+    "undici": "^7.24.0",
+    "uuid": "^14.0.0",
     "zod": "^4.2.1"
   },
   "devDependencies": {

package/src/toolSet/modelScore.js

@@ -17,7 +17,7 @@ DO NOT USE for: find model, model metadata, list models, run programs/jobs, quer
 
 PARAMETERS
 - model: string — model name (required, exact match)
-- scenario: string | object | array — input data (required). Accepts: "x=1, y=2", {x:1, y:2}, or array of objects
+- scenario: object — input data as JSON (optional, defaults to {}). Example: {age:45, income:60000}
 - uflag: boolean (default: false) — prefix model fields with underscore when true
 
 ROUTING RULES
@@ -42,34 +42,18 @@ Returns predictions, probabilities, scores merged with input data. Returns error
   let spec = {
     name: 'mas-score',
     description: description,
-    inputSchema:z.object({
+    inputSchema: z.object({
       model: z.string(),
-      scenario: z.string(),
+      scenario: z.union([z.record(z.any()), z.string()]).optional(),
       uflag: z.boolean().optional()
     }),
       
     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;
+      let params = {...iparams};
+      if (typeof params.scenario === 'string') {
+        try { params.scenario = JSON.parse(params.scenario); } catch { params.scenario = {}; }
+      }
+      params.scenario = (params.scenario != null && typeof params.scenario === 'object') ? params.scenario : {};
       
       // Drop model extension (e.g., .job, .model)
       if (params.model && params.model.includes('.')) {

package/src/toolSet/runJob.js

@@ -16,7 +16,7 @@ DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro)
 
 PARAMETERS
 - name: string — job name (required)
-- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
+- scenario: object — input parameters as JSON (optional, defaults to {}). Example: {month:10, year:2025}
 
 ROUTING RULES
 - "run job xyz" → { name: "xyz" }
@@ -41,34 +41,14 @@ Returns log output, listings, tables from job. Error if job not found.
     description: description,
     inputSchema: z.object({
       name: z.string(),
-      scenario: z.string().optional()
+      scenario: z.union([z.record(z.any()), 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;
-          }, {});
-        }
+      if (typeof params.scenario === 'string') {
+        try { params.scenario = JSON.parse(params.scenario); } catch { params.scenario = {}; }
       }
+      params.scenario = (params.scenario != null && typeof params.scenario === 'object') ? params.scenario : {};
       params.type = 'job';
-      params.scenario = scenarioObj;
       // Provide runtime context for auth and server settings
       let r = await _jobSubmit(params);
       return r;

package/src/toolSet/runJobdef.js

@@ -17,7 +17,7 @@ DO NOT USE for: arbitrary SAS code (use run-sas-program), macros (use run-macro)
 
 PARAMETERS
 - name: string — jobdef name (required)
-- scenario: string | object — input parameters. Accepts: "x=1, y=2" or {x:1, y:2}
+- scenario: object — input parameters as JSON (optional, defaults to {}). Example: {month:10, year:2025}
 
 ROUTING RULES
 - "run jobdef xyz" → { name: "xyz" }
@@ -42,34 +42,14 @@ Returns log output, listings, tables from jobdef. Error if jobdef not found.
     description: description,
     inputSchema: z.object({
       name: z.string(),
-      scenario: z.string().optional()
+      scenario: z.union([z.record(z.any()), 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;
-          }, {});
-        }
+      if (typeof params.scenario === 'string') {
+        try { params.scenario = JSON.parse(params.scenario); } catch { params.scenario = {}; }
       }
+      params.scenario = (params.scenario != null && typeof params.scenario === 'object') ? params.scenario : {};
       params.type = 'def';
-      params.scenario = scenarioObj;
       // Provide runtime context for auth and server settings
       let r = await _jobSubmit(params);
       return r;

package/src/toolSet/scrScore.js

@@ -1,70 +1,61 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _scrScore from '../toolHelpers/_scrScore.js';
-
-function scrScore(_appContext) {
-  let description = `
-## scr-score
-
-Purpose
-Score a scenario using a model deployed as a SCR container  in Azure or another host).
-
-Inputs
-- url (string, required): SCR model identifier (URL)
-- scenario (string | object | array, optional): Input values to score. Accepts:
-  - a comma-separated key=value string (e.g. "x=1, y=2"),
-  - a JSON object with field names and values (recommended for typed inputs),
-  - an array of objects for batch scoring. If omitted, the tool will return the model's input variable definitions.
-
-What it returns
-- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
-- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
-
-Usage notes
-- Run \`scr-info\` first to inspect the expected input variables and types.
-- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
-- Ensure network connectivity and any required credentials for the target SCR service.
-
-Examples
-- scrScore with url="loan" and scenario="age=45, income=60000"
-- scrScore with url="https://scr-host/models/loan" and scenario={age:45, income:60000}
-`;
-
-  let spec = {
-    name: 'scr-score',
-    description: description,
-    inputSchema: z.object({
-      url: z.string(),
-      scenario: z.string().optional()
-    }),
-    
-    handler: async (params) => {
-      let {url, scenario,_appContext} = params;
-  
-      if (url === null) {
-        return { status: { statusCode: 2, msg: `SCR model ${url} was not specified` }, results: {} };
-      }
-
-      // Normalize simple string scenarios like "x=1, y=2" into an object
-      if (typeof scenario === 'string' && scenario.includes('=')) {
-        scenario = scenario.split(',').reduce((acc, pair) => {
-          const [k, ...rest] = pair.split('=');
-          if (!k) return acc;
-          acc[k.trim()] = rest.join('=').trim();
-          return acc;
-        }, {});
-      }
-
-      let r = await _scrScore({ url: url, scenario: scenario , _appContext: _appContext});
-      return r;
-    }
-  }
-
-  return spec;
-}
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _scrScore from '../toolHelpers/_scrScore.js';
+
+function scrScore(_appContext) {
+  let description = `
+## scr-score
+
+Purpose
+Score a scenario using a model deployed as a SCR container  in Azure or another host).
+
+Inputs
+- url (string, required): SCR model identifier (URL)
+- scenario (object, optional): Input values to score as a JSON object (e.g. {age:45, income:60000}). If omitted, defaults to {} and the tool will return the model's input variable definitions.
+
+What it returns
+- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
+- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
+
+Usage notes
+- Run \`scr-info\` first to inspect the expected input variables and types.
+- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
+- Ensure network connectivity and any required credentials for the target SCR service.
+
+Examples
+- scrScore with url="loan" and scenario={age:45, income:60000}
+`;
+
+  let spec = {
+    name: 'scr-score',
+    description: description,
+    inputSchema: z.object({
+      url: z.string(),
+      scenario: z.union([z.record(z.any()), z.string()]).optional()
+    }),
+    
+    handler: async (params) => {
+      let {url, _appContext} = params;
+      let scenario = params.scenario;
+      if (typeof scenario === 'string') {
+        try { scenario = JSON.parse(scenario); } catch { scenario = {}; }
+      }
+      if (url === null) {
+        return { status: { statusCode: 2, msg: `SCR model ${url} was not specified` }, results: {} };
+      }
+
+      const scenarioObj = (scenario != null && typeof scenario === 'object') ? scenario : {};
+
+      let r = await _scrScore({ url: url, scenario: scenarioObj, _appContext: _appContext});
+      return r;
+    }
+  }
+
+  return spec;
+}
+
 export default scrScore;