@sassoftware/sas-score-mcp-serverjs 1.0.1-2 → 1.0.1-21

package/src/setupSkills.js

@@ -4,7 +4,7 @@ import path from 'path';
 import os from 'os';
 import { fileURLToPath } from 'url';
 
-function setupSkills(clientName) {
+function setupSkills(clientName,agentFolder) {
     const __dirname = path.dirname(fileURLToPath(import.meta.url));
     // Paths
     let destination;
@@ -13,10 +13,13 @@ function setupSkills(clientName) {
         destination = path.join(process.cwd(), clientName);
         clientName = clientName.slice(1);
     } else {
-        destination = path.join(os.homedir(), '.' + clientName);
+        destination = path.join(os.homedir(), '.' + clientName );
     }
     
-    const source = path.join(__dirname, `../.skills` + '_' + clientName.toLowerCase());
+    if (agentFolder) {
+        destination = path.join(destination, agentFolder);
+    }
+    const source = path.join(__dirname, `../.skills`);
     console.error("==================================================================");
     console.error(`           Copying ${source} to ${destination}...`);
 
@@ -25,22 +28,24 @@ function setupSkills(clientName) {
         if (!fs.existsSync(to)) fs.mkdirSync(to, { recursive: true });;
         fs.readdirSync(from).forEach(element => {
             const fromPath = path.join(from, element);
-            const toPath = path.join(to, element);
+            let  toPath = path.join(to, element);
+            if (clientName === 'claude' && element === 'copilot-instructions.md') {
+                toPath = path.join(to, 'CLAUDE.md');
+            }
             if (fs.lstatSync(fromPath).isFile()) {
                 console.error(`       📄 Copying file: ${element}`);
                 fs.copyFileSync(fromPath, toPath);
             } else if (fs.lstatSync(fromPath).isDirectory()) {
                 console.error(`📂 Copying folder: ${element}`);
-                copyFolderSync(fromPath, toPath) ;
+                copyFolderSync(fromPath, toPath);
             }
         });
     }
-
     function listExpandedFolder(dir, indent = "") {
         const entries = fs.readdirSync(dir, { withFileTypes: true });
 
         for (const entry of entries) {
-            console.log(indent + entry.name);
+            console.error(indent + entry.name);
 
             if (entry.isDirectory()) {
                 listExpandedFolder(path.join(dir, entry.name), indent + "  ");

package/src/setupSkills.v1.js

@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { fileURLToPath } from 'url';
+
+function setupSkills(clientName,agentFolder) {
+    const __dirname = path.dirname(fileURLToPath(import.meta.url));
+    // Paths
+    let destination;
+    if (clientName.startsWith('.')) {
+        console.error('-----------------------',process.cwd());
+        destination = path.join(process.cwd(), clientName);
+        clientName = clientName.slice(1);
+    } else {
+        destination = path.join(os.homedir(), '.' + clientName );
+    }
+    
+    if (agentFolder) {
+        destination = path.join(destination, agentFolder);
+    }
+    const source = path.join(__dirname, `../.skills` + '_' + clientName.toLowerCase());
+    console.error("==================================================================");
+    console.error(`           Copying ${source} to ${destination}...`);
+
+
+
+    // Copy agents folder if it exists
+     let agentsFromPath = path.join(__dirname, `../.agents`);
+     let agentsToPath = path.join(destination, 'agents');
+     copyFolderSync(agentsFromPath, agentsToPath);
+
+    // now  copy the skills folder to the destination
+    let toPath = path.join(destination, 'skills');
+    let fromPath = path.join(__dirname, `../.skills`);
+    copyFolderSync(fromPath, toPath);
+    
+    // Now copy instructions 
+    let instructionsFromPath = path.join(__dirname, `../.instructions`);
+    let instructionsToPath = destination;
+    copyFolderSync(instructionsFromPath, instructionsToPath);
+
+    function copyFolderSync(from, to) {
+        if (!fs.existsSync(from)) return [];
+        if (!fs.existsSync(to)) fs.mkdirSync(to, { recursive: true });;
+        fs.readdirSync(from).forEach(element => {
+            const fromPath = path.join(from, element);
+            let  toPath = path.join(to, element);
+            if (clientName === 'claude' && element === 'copilot-instructions.md') {
+                toPath = path.join(to, 'CLAUDE.md');
+            }
+            if (fs.lstatSync(fromPath).isFile()) {
+                console.error(`       📄 Copying file: ${element}`);
+                fs.copyFileSync(fromPath, toPath);
+            } else if (fs.lstatSync(fromPath).isDirectory()) {
+                console.error(`📂 Copying folder: ${element}`);
+                copyFolderSync(fromPath, toPath);
+            }
+        });
+    }
+    function listExpandedFolder(dir, indent = "") {
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+        for (const entry of entries) {
+            console.error(indent + entry.name);
+
+            if (entry.isDirectory()) {
+                listExpandedFolder(path.join(dir, entry.name), indent + "  ");
+            }
+        }
+    }
+    try {
+        copyFolderSync(source, destination);
+        //listExpandedFolder(destination);
+    } catch (err) {
+        console.error('❌ Error copying files:', err.message);
+    }
+}
+export default setupSkills;

package/src/toolHelpers/_listLibrary.js

@@ -54,7 +54,7 @@ async function _listLibrary(params) {
       if (appControl != null) {
         await deleteSession(appControl);
       }
-      return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] };
+      return { isError: true, content: [{ type: 'text', text: (typeof err === 'string') ? err :  JSON.stringify(err) }] };
     }
   }
 

package/src/toolHelpers/_listTables.js

@@ -44,7 +44,7 @@ async function _listTables(params) {
       structuredContent: response};
   } catch (err) {
     console.error(JSON.stringify(err));
-    return {isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] }
+    return {isError: true, content: [{ type: 'text', text: (typeof err === 'string') ? err : JSON.stringify(err) }] }
   }
 
 };

package/src/toolSet/findJobdef.js

@@ -18,7 +18,7 @@ function findJobdef(_appContext) {
 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)
+DO NOT USE for: list jobdefs (use sas-score-list-jobdefs), run jobdef (use sas-score-run-jobdef), find job/lib/table/model (use respective tools)
 
 PARAMETERS
 - name: string (required) — jobdef name to locate; if multiple supplied, use first
@@ -38,10 +38,10 @@ EXAMPLES
 - "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)
+- "list jobdefs" (use sas-score-list-jobdefs)
+- "run jobdef cars_job_v4" (use sas-score-run-jobdef)
+- "find job ETL" (use sas-score-find-job)
+- "find table cars" (use sas-score-find-table)
 
 ERRORS
 Returns { jobdefs: [] } if not found; { jobdefs: [name, ...] } if found. Never hallucinate jobdef names.

package/src/toolSet/modelScore.js

@@ -17,16 +17,16 @@ 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
-- uflag: boolean (default: false) — prefix model fields with underscore when true
+- scenario: object — input data as JSON (optional, defaults to {}). Example: {age:45, income:60000}
+
 
 ROUTING RULES
-- "score with model X using a=1, b=2" → { model: "X", scenario: {a:1, b:2}, uflag: false }
-- "predict using model Y with age=45, income=60000" → { model: "Y", scenario: {age:45, income:60000}, uflag: false }
+- "score with model X using a=1, b=2" → { model: "X", scenario: {a:1, b:2} }
+- "predict using model Y with age=45, income=60000" → { model: "Y", scenario: {age:45, income:60000} }
 
 EXAMPLES
-- "score with model churn using age=45, income=60000" → { model: "churn", scenario: {age:45, income:60000}, uflag: false }
-- "predict creditScore for credit=700, debt=20000" → { model: "creditScore", scenario: {credit:700, debt:20000}, uflag: false }
+- "score with model churn using age=45, income=60000" → { model: "churn", scenario: {age:45, income:60000} }
+- "predict 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)
@@ -42,40 +42,38 @@ 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(),
-      uflag: z.boolean().optional()
+      scenario: z.any()
     }),
       
     handler: async (iparams) => {
-      let params = {...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;
+
+      // 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)) { 
+      } 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 [key, value] = pair.split('=');
+          acc[key.trim()] = value;
+          count++;
+          return acc;
+        }, {});
+      }
+      params.scenario = scenarioObj;
       // Drop model extension (e.g., .job, .model)
       if (params.model && params.model.includes('.')) {
         params.model = params.model.substring(0, params.model.lastIndexOf('.'));
       }
-      
+  
       log('modelScore params', params);
       // Check if the params.scenario is a string and parse it
       let r = await _masScoring(params)

package/src/toolSet/runCasProgram.js

@@ -45,10 +45,10 @@ Log output and CAS results. If output table specified, returned as markdown tabl
     description: description,
     inputSchema:z.object({
       src: z.string(),
-      scenario: z.string(),
-      output: z.string().optional,
-      folder: z.string().optional,
-      limit: z.number().optional
+      scenario: z.any(),
+      output: z.string().optional(),
+      folder: z.string().optional(),
+      limit: z.number().optional()
     }),
     
   // NOTE: Previously 'required' incorrectly listed 'program' which does not
@@ -70,15 +70,26 @@ Log output and CAS results. If output table specified, returned as markdown tabl
         `;
       }
       // figure out macros
-  
-      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();
+
+      // 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 iparms = {
         args: scenario,
         output: params.output,

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,30 @@ 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.any()
     }),
     handler: async (params) => {
       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 (scenario == null) {
-        scenarioObj = {};
-      } else if (typeof scenario === 'object') {
+      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;
-          }, {});
-        }
+      } 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; 
       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,30 @@ 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.any()
     }),
     handler: async (params) => {
       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 (scenario == null) {
-        scenarioObj = {};
-      } else if (typeof scenario === 'object') {
+      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;
-          }, {});
-        }
+      } 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;      
       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;

package/src/toolSet/.claude/settings.local.json

@@ -1,13 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "mcp__sasmcp__sas-score-deva-score",
-      "mcp__sasmcp__sas-score-find-model",
-      "mcp__sasmcp__sas-score-model-info",
-      "Bash(cp \"C:/dev/github/7-skill-integration/.claude/skills/sas-read-and-score/SKILL.md\" \"C:/dev/github/7-skill-integration/skills/sas-read-and-score/SKILL.md\")",
-      "Bash(cp \"C:/dev/github/7-skill-integration/.claude/skills/sas-read-strategy/SKILL.md\" \"C:/dev/github/7-skill-integration/skills/sas-read-strategy/SKILL.md\")",
-      "Bash(cp \"C:/dev/github/7-skill-integration/.claude/skills/sas-score-workflow/SKILL.md\" \"C:/dev/github/7-skill-integration/skills/sas-score-workflow/SKILL.md\")",
-      "WebSearch"
-    ]
-  }
-}